Use the MmdsAddress of the Config struct instead of the argument of the handler.

Signed-off-by: Yutaka Juba <[email protected]>

Author: yjuba

handlers.go

@@ -16,7 +16,6 @@ package firecracker
 import (
 	"context"
 	"fmt"
-	"net"
 	"os"
 )
 
@@ -260,15 +259,13 @@ func NewSetMetadataHandler(metadata interface{}) Handler {
 	}
 }
 
-// NewConfigMmdsHandler is a named handler that puts the MMDS config into the
+// ConfigMmdsHandler is a named handler that puts the MMDS config into the
 // firecracker process.
-func NewConfigMmdsHandler(address net.IP) Handler {
-	return Handler{
-		Name: ConfigMmdsHandlerName,
-		Fn: func(ctx context.Context, m *Machine) error {
-			return m.setMmdsConfig(ctx, address)
-		},
-	}
+var ConfigMmdsHandler = Handler{
+	Name: ConfigMmdsHandlerName,
+	Fn: func(ctx context.Context, m *Machine) error {
+		return m.setMmdsConfig(ctx, m.Cfg.MmdsAddress)
+	},
 }
 
 var defaultFcInitHandlerList = HandlerList{}.Append(

handlers_test.go

@@ -623,7 +623,7 @@ func TestHandlers(t *testing.T) {
 			Config: Config{},
 		},
 		{
-			Handler: NewConfigMmdsHandler(mmdsAddress),
+			Handler: ConfigMmdsHandler,
 			Client: fctesting.MockClient{
 				PutMmdsConfigFn: func(params *ops.PutMmdsConfigParams) (*ops.PutMmdsConfigNoContent, error) {
 					called = ConfigMmdsHandlerName
@@ -633,7 +633,9 @@ func TestHandlers(t *testing.T) {
 					return &ops.PutMmdsConfigNoContent{}, nil
 				},
 			},
-			Config: Config{},
+			Config: Config{
+				MmdsAddress: mmdsAddress,
+			},
 		},
 	}
 

machine.go

@@ -159,6 +159,11 @@ type Config struct {
 	//	2 : advanced filtering. This adds further checks on some of the
 	//			parameters of the allowed syscalls.
 	SeccompLevel SeccompLevelValue
+
+	// MmdsAddress is IPv4 address used by guest applications when issuing requests to MMDS.
+	// It is possible to use a valid IPv4 link-local address (169.254.0.0/16).
+	// If not provided, the default address (169.254.169.254) will be used.
+	MmdsAddress net.IP
 }
 
 // Validate will ensure that the required fields are set and that