fix comments and tests

Signed-off-by: Jerome Gravel-Niquet <[email protected]>

Author: jeromegn

firecracker.go

@@ -183,16 +183,16 @@ func (f *Client) PutGuestDriveByID(ctx context.Context, driveID string, drive *m
 	return f.client.Operations.PutGuestDriveByID(params)
 }
 
-// PutGuestVsockOpt is a functional option to be used for the
+// PutGuestVsockByIDOpt is a functional option to be used for the
 // PutGuestVsockByID API in setting any additional optional fields.
 type PutGuestVsockByIDOpt func(*ops.PutGuestVsockByIDParams)
 
-// PutGuestVsock is a wrapper for the swagger generated client to make
+// PutGuestVsockByID is a wrapper for the swagger generated client to make
 // calling of the API easier.
 func (f *Client) PutGuestVsockByID(ctx context.Context, vsock *models.Vsock, opts ...PutGuestVsockByIDOpt) (*ops.PutGuestVsockByIDNoContent, error) {
 	params := ops.NewPutGuestVsockByIDParams()
 	params.SetContext(ctx)
-	params.SetID(*vsock.VsockID)
+	params.ID = *vsock.VsockID
 	params.SetBody(vsock)
 	for _, opt := range opts {
 		opt(params)

handlers_test.go

@@ -592,9 +592,9 @@ func TestHandlers(t *testing.T) {
 		{
 			Handler: AddVsocksHandler,
 			Client: fctesting.MockClient{
-				PutGuestVsockByIDFn: func(params *ops.PutGuestVsockByIDParams) (*ops.PutGuestVsockByIDCreated, *ops.PutGuestVsockByIDNoContent, error) {
+				PutGuestVsockByIDFn: func(params *ops.PutGuestVsockByIDParams) (*ops.PutGuestVsockByIDNoContent, error) {
 					called = AddVsocksHandler.Name
-					return &ops.PutGuestVsockByIDCreated{}, &ops.PutGuestVsockByIDNoContent{}, nil
+					return &ops.PutGuestVsockByIDNoContent{}, nil
 				},
 			},
 			Config: Config{

machine.go

@@ -222,6 +222,8 @@ type RateLimiterSet struct {
 // VsockDevice represents a vsock connection between the host and the guest
 // microVM.
 type VsockDevice struct {
+	// ID defines the vsock's device ID for firecracker.
+	ID string
 	// Path defines the filesystem path of the vsock device on the host.
 	Path string
 	// CID defines the 32-bit Context Identifier for the vsock device.  See
@@ -398,8 +400,8 @@ func (m *Machine) createNetworkInterfaces(ctx context.Context, ifaces ...Network
 }
 
 func (m *Machine) addVsocks(ctx context.Context, vsocks ...VsockDevice) error {
-	for i, dev := range m.Cfg.VsockDevices {
-		if err := m.addVsock(ctx, fmt.Sprintf("%d", i), dev); err != nil {
+	for _, dev := range m.Cfg.VsockDevices {
+		if err := m.addVsock(ctx, dev); err != nil {
 			return err
 		}
 	}
@@ -729,11 +731,11 @@ func (m *Machine) attachDrive(ctx context.Context, dev models.Drive) error {
 }
 
 // addVsock adds a vsock to the instance
-func (m *Machine) addVsock(ctx context.Context, id string, dev VsockDevice) error {
+func (m *Machine) addVsock(ctx context.Context, dev VsockDevice) error {
 	vsockCfg := models.Vsock{
 		GuestCid: Int64(int64(dev.CID)),
 		UdsPath:  &dev.Path,
-		VsockID:  &id,
+		VsockID:  &dev.ID,
 	}
 
 	resp, err := m.client.PutGuestVsockByID(ctx, &vsockCfg)

machine_test.go

@@ -562,6 +562,7 @@ func testAttachSecondaryDrive(ctx context.Context, t *testing.T, m *Machine) {
 
 func testAttachVsock(ctx context.Context, t *testing.T, m *Machine) {
 	dev := VsockDevice{
+		ID:   "1",
 		CID:  3,
 		Path: "foo",
 	}