Skip to content

Commit 25878e7

Browse files
author
Noah Meyerhans
committed
Update for Firecracker 0.12.0 API changes
PUT /mmds responses have changed NetworkInterface object no longer includes a DeviceState Signed-off-by: Noah Meyerhans <[email protected]>
1 parent ea93f77 commit 25878e7

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

fctesting/machine_mock.go

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

firecracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (f *FirecrackerClient) CreateSyncAction(ctx context.Context, info *models.I
134134
return f.client.Operations.CreateSyncAction(params)
135135
}
136136

137-
func (f *FirecrackerClient) PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsCreated, *ops.PutMmdsNoContent, error) {
137+
func (f *FirecrackerClient) PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsNoContent, error) {
138138
params := ops.NewPutMmdsParams()
139139
params.SetContext(ctx)
140140
params.SetBody(metadata)

machine.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const (
3434
)
3535

3636
// CPUTemplate defines a set of CPU features that are exposed by Firecracker
37-
type CPUTemplate = models.CPUTemplate
37+
type CPUTemplate models.CPUTemplate
3838

3939
// CPUTemplates known by Firecracker. These are passed through directly from the model.
4040
const (
@@ -52,7 +52,7 @@ type Firecracker interface {
5252
PutGuestDriveByID(ctx context.Context, driveID string, drive *models.Drive) (*ops.PutGuestDriveByIDNoContent, error)
5353
PutGuestVsockByID(ctx context.Context, vsockID string, vsock *models.Vsock) (*ops.PutGuestVsockByIDCreated, *ops.PutGuestVsockByIDNoContent, error)
5454
CreateSyncAction(ctx context.Context, info *models.InstanceActionInfo) (*ops.CreateSyncActionNoContent, error)
55-
PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsCreated, *ops.PutMmdsNoContent, error)
55+
PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsNoContent, error)
5656
GetMachineConfig() (*ops.GetMachineConfigOK, error)
5757
}
5858

@@ -469,7 +469,6 @@ func (m *Machine) createNetworkInterface(ctx context.Context, iface NetworkInter
469469
IfaceID: &ifaceID,
470470
GuestMac: iface.MacAddress,
471471
HostDevName: iface.HostDevName,
472-
State: models.DeviceStateAttached,
473472
AllowMmdsRequests: iface.AllowMDDS,
474473
}
475474

@@ -563,13 +562,10 @@ func (m *Machine) startInstance(ctx context.Context) error {
563562

564563
// SetMetadata sets the machine's metadata for MDDS
565564
func (m *Machine) SetMetadata(ctx context.Context, metadata interface{}) error {
566-
respcreated, respnocontent, err := m.client.PutMmds(ctx, metadata)
565+
respnocontent, err := m.client.PutMmds(ctx, metadata)
567566

568567
if err == nil {
569568
var message string
570-
if respcreated != nil {
571-
message = respcreated.Error()
572-
}
573569
if respnocontent != nil {
574570
message = respnocontent.Error()
575571
}

0 commit comments

Comments
 (0)