Merge branch 'fc-0.12.0'

#40

Author: Noah Meyerhans

client/models/device_state.go

@@ -4,7 +4,7 @@ info:
   description: RESTful public-facing API.
                The API is accessible through HTTP calls on specific URLs carrying JSON modeled data.
                The transport medium is a Unix Domain Socket.
-  version: 0.10.1
+  version: 0.12.0
   termsOfService: ""
   contact:
     email: "[email protected]"
@@ -257,10 +257,8 @@ paths:
           schema:
             type: object
       responses:
-        201:
-          description: MMDS data store created
         204:
-          description: MMDS data store updated.
+          description: MMDS data store created/updated.
         400:
           description: MMDS data store cannot be created due to bad input.
           schema:
@@ -359,14 +357,6 @@ definitions:
       - C3
       - T2
 
-  DeviceState:
-    type: string
-    description:
-      The valid states for a Device. So far, a device can only be in the Attached mode.
-      Future valid values will be Detaching and Detached.
-    enum:
-      - Attached
-
   Drive:
     type: object
     required:
@@ -452,6 +442,11 @@ definitions:
       show_log_origin:
         type: boolean
         description: Whether or not to include the file path and line number of the log's origin.
+      options:
+        type: array
+        items:
+          type: string
+        description: Additional logging options. Only "LogDirtyPages" is supported.
 
   MachineConfiguration:
     type: object
@@ -497,8 +492,6 @@ definitions:
         $ref: "#/definitions/RateLimiter"
       tx_rate_limiter:
         $ref: "#/definitions/RateLimiter"
-      state:
-        $ref: "#/definitions/DeviceState"
 
   PartialDrive:
     type: object

client/models/logger.go

@@ -134,7 +134,7 @@ func (f *FirecrackerClient) CreateSyncAction(ctx context.Context, info *models.I
 	return f.client.Operations.CreateSyncAction(params)
 }
 
-func (f *FirecrackerClient) PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsCreated, *ops.PutMmdsNoContent, error) {
+func (f *FirecrackerClient) PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsNoContent, error) {
 	params := ops.NewPutMmdsParams()
 	params.SetContext(ctx)
 	params.SetBody(metadata)

client/models/network_interface.go

@@ -34,7 +34,7 @@ const (
 )
 
 // CPUTemplate defines a set of CPU features that are exposed by Firecracker
-type CPUTemplate = models.CPUTemplate
+type CPUTemplate models.CPUTemplate
 
 // CPUTemplates known by Firecracker. These are passed through directly from the model.
 const (
@@ -52,7 +52,7 @@ type Firecracker interface {
 	PutGuestDriveByID(ctx context.Context, driveID string, drive *models.Drive) (*ops.PutGuestDriveByIDNoContent, error)
 	PutGuestVsockByID(ctx context.Context, vsockID string, vsock *models.Vsock) (*ops.PutGuestVsockByIDCreated, *ops.PutGuestVsockByIDNoContent, error)
 	CreateSyncAction(ctx context.Context, info *models.InstanceActionInfo) (*ops.CreateSyncActionNoContent, error)
-	PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsCreated, *ops.PutMmdsNoContent, error)
+	PutMmds(ctx context.Context, metadata interface{}) (*ops.PutMmdsNoContent, error)
 	GetMachineConfig() (*ops.GetMachineConfigOK, error)
 }
 
@@ -469,7 +469,6 @@ func (m *Machine) createNetworkInterface(ctx context.Context, iface NetworkInter
 		IfaceID:           &ifaceID,
 		GuestMac:          iface.MacAddress,
 		HostDevName:       iface.HostDevName,
-		State:             models.DeviceStateAttached,
 		AllowMmdsRequests: iface.AllowMDDS,
 	}
 
@@ -563,13 +562,10 @@ func (m *Machine) startInstance(ctx context.Context) error {
 
 // SetMetadata sets the machine's metadata for MDDS
 func (m *Machine) SetMetadata(ctx context.Context, metadata interface{}) error {
-	respcreated, respnocontent, err := m.client.PutMmds(ctx, metadata)
+	respnocontent, err := m.client.PutMmds(ctx, metadata)
 
 	if err == nil {
 		var message string
-		if respcreated != nil {
-			message = respcreated.Error()
-		}
 		if respnocontent != nil {
 			message = respnocontent.Error()
 		}