virtcontainers: use new firecracker API

Support new firecracker API 0.19.0: * remove vsock ID from http request fixes #2183 Signed-off-by: Julio Montes <[email protected]>
kata-containers · Nov 11, 2019 · 77b0dfb · 77b0dfb
1 parent 0def9b0
commit 77b0dfb
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/virtcontainers/fc.go b/virtcontainers/fc.go
@@ -299,7 +299,7 @@ func (fc *firecracker) vmRunning() bool {
 		return false
 	case models.InstanceInfoStateRunning:
 		return true
-	case models.InstanceInfoStateUninitialized, models.InstanceInfoStateHalting, models.InstanceInfoStateHalted:
+	case models.InstanceInfoStateUninitialized:
 		return false
 	default:
 		return false
@@ -784,18 +784,17 @@ func (fc *firecracker) fcAddVsock(hvs types.HybridVSock) error {
 		udsPath = filepath.Join("/", defaultHybridVSocketName)
 	}
 
-	vsockParams := ops.NewPutGuestVsockByIDParams()
+	vsockParams := ops.NewPutGuestVsockParams()
 	vsockID := "root"
 	ctxID := defaultGuestVSockCID
 	vsock := &models.Vsock{
 		GuestCid: &ctxID,
 		UdsPath:  &udsPath,
 		VsockID:  &vsockID,
 	}
-	vsockParams.SetID(vsockID)
 	vsockParams.SetBody(vsock)
 
-	_, err := fc.client().Operations.PutGuestVsockByID(vsockParams)
+	_, err := fc.client().Operations.PutGuestVsock(vsockParams)
 	if err != nil {
 		return err
 	}