fixup! Adding machine interface

Signed-off-by: xibz <[email protected]>

Author: xibz

handlers.go

@@ -173,13 +173,7 @@ func NewSetMetadataHandler(metadata interface{}) Handler {
 	return Handler{
 		Name: SetMetadataHandlerName,
 		Fn: func(ctx context.Context, m *Machine) error {
-			if _, err := m.client.PutMmds(ctx, metadata); err != nil {
-				m.logger.Errorf("Setting metadata: %s", err)
-				return err
-			}
-
-			m.logger.Printf("SetMetadata successful")
-			return nil
+			return m.SetMetadata(ctx, metadata)
 		},
 	}
 }

machine.go

@@ -588,10 +588,15 @@ func (m *Machine) sendCtrlAltDel(ctx context.Context) error {
 	return err
 }
 
-// EnableMetadata will append or replace the metadata handler and only will be
-// called when calling the Machine Start operation.
-func (m *Machine) EnableMetadata(metadata interface{}) {
-	m.Handlers.FcInit = m.Handlers.FcInit.Swappend(NewSetMetadataHandler(metadata))
+// SetMetadata sets the machine's metadata for MDDS
+func (m *Machine) SetMetadata(ctx context.Context, metadata interface{}) error {
+	if _, err := m.client.PutMmds(ctx, metadata); err != nil {
+		m.logger.Errorf("Setting metadata: %s", err)
+		return err
+	}
+
+	m.logger.Printf("SetMetadata successful")
+	return nil
 }
 
 // UpdateGuestDrive will modify the current guest drive of ID index with the new

machine_test.go

@@ -637,7 +637,7 @@ func TestWaitForSocket(t *testing.T) {
 
 func testSetMetadata(ctx context.Context, t *testing.T, m *Machine) {
 	metadata := map[string]string{"key": "value"}
-	_, err := m.client.PutMmds(ctx, metadata)
+	err := m.SetMetadata(ctx, metadata)
 	if err != nil {
 		t.Errorf("failed to set metadata: %s", err)
 	}

machineiface.go

@@ -17,13 +17,16 @@ import (
 	"context"
 )
 
+// This ensures the interface method signatures match that of Machine
+var _ MachineIface = (*Machine)(nil)
+
 // MachineIface can be used for mocking and testing of the Machine. The Machine
 // is subject to change, meaning this interface would change.
 type MachineIface interface {
 	Start(context.Context) error
 	StopVMM() error
 	Shutdown(context.Context) error
 	Wait(context.Context) error
-	EnableMetadata(interface{})
+	SetMetadata(context.Context, interface{}) error
 	UpdateGuestDrive(context.Context, string, string, ...PatchGuestDriveByIDOpt) error
 }