Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions internal/controller/pod/mocks/mock_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion internal/controller/pod/pod_lcow.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,17 @@ func (c *Controller) NewContainer(ctx context.Context, containerID string) (*lin
return nil, fmt.Errorf("container %q already exists in pod %q", containerID, c.podID)
}

scsiCtrl, err := c.vm.SCSIController(ctx)
if err != nil {
return nil, fmt.Errorf("get SCSI controller for pod %s: %w", c.podID, err)
}

containerCtrl := linuxcontainer.New(
c.vm.RuntimeID(),
c.gcsPodID,
containerID,
c.vm.Guest(),
c.vm.SCSIController(),
scsiCtrl,
c.vm.Plan9Controller(),
c.vm.VPCIController(),
)
Expand Down
14 changes: 13 additions & 1 deletion internal/controller/pod/pod_lcow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func newSetup(t *testing.T) (*mocks.MockvmController, *mocks.MocknetworkControll
func expectVMCallsForNewContainer(vm *mocks.MockvmController) {
vm.EXPECT().RuntimeID().Return("vm-runtime-1")
vm.EXPECT().Guest().Return(nil)
vm.EXPECT().SCSIController().Return(nil)
vm.EXPECT().SCSIController(gomock.Any()).Return(nil, nil)
vm.EXPECT().Plan9Controller().Return(nil)
vm.EXPECT().VPCIController().Return(nil)
}
Expand Down Expand Up @@ -191,6 +191,18 @@ func TestNewContainer(t *testing.T) {
}
}
})

t.Run("scsi controller error", func(t *testing.T) {
vm, _, c := newSetup(t)
vm.EXPECT().SCSIController(gomock.Any()).Return(nil, errTest)

if _, err := c.NewContainer(t.Context(), "container-scsi-fail"); !errors.Is(err, errTest) {
t.Fatalf("NewContainer error = %v, want %v", err, errTest)
}
if _, ok := c.containers["container-scsi-fail"]; ok {
t.Error("container should not be registered when SCSIController fails")
}
})
}

// TestListContainers verifies snapshots of the live container map.
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/pod/types_lcow.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type vmController interface {
Guest() *guestmanager.Guest

// SCSIController returns the SCSI device controller for the VM.
SCSIController() *scsi.Controller
SCSIController(ctx context.Context) (*scsi.Controller, error)

// VPCIController returns the vPCI device controller for the VM.
VPCIController() *vpci.Controller
Expand Down
Loading
Loading