Machine Registration must now contain Partition

metal-stack · Oct 11, 2024 · 94910c3 · 94910c3
1 parent 84cf9d8
commit 94910c3
Show file tree

Hide file tree

Showing 11 changed files with 386 additions and 735 deletions.
diff --git a/cmd/metal-api/internal/datastore/switch.go b/cmd/metal-api/internal/datastore/switch.go
@@ -138,7 +138,8 @@ func (rs *RethinkStore) SetVrfAtSwitches(m *metal.Machine, vrf string) (metal.Sw
 }
 
 func (rs *RethinkStore) ConnectMachineWithSwitches(m *metal.Machine) error {
-	switches, err := rs.ListSwitches()
+	var switches metal.Switches
+	err := rs.SearchSwitches(&SwitchSearchQuery{PartitionID: &m.PartitionID}, &switches)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/metal-api/internal/grpc/boot-service.go b/cmd/metal-api/internal/grpc/boot-service.go
@@ -224,8 +224,9 @@ func (b *BootService) Register(ctx context.Context, req *v1.BootServiceRegisterR
 				Value:       metal.LEDStateOff,
 				Description: "Machine registered",
 			},
-			Tags: req.Tags,
-			IPMI: ipmi,
+			Tags:        req.Tags,
+			IPMI:        ipmi,
+			PartitionID: req.PartitionId,
 		}
 
 		err = b.ds.CreateMachine(m)
@@ -269,7 +270,7 @@ func (b *BootService) Register(ctx context.Context, req *v1.BootServiceRegisterR
 	old := *m
 	err = retry.Do(
 		func() error {
-			// RackID and PartitionID is set
+			// RackID is set here
 			err := b.ds.ConnectMachineWithSwitches(m)
 			if err != nil {
 				return err

diff --git a/cmd/metal-api/internal/service/switch-service_test.go b/cmd/metal-api/internal/service/switch-service_test.go
@@ -271,7 +271,7 @@ func TestConnectMachineWithSwitches(t *testing.T) {
 	for i := range tests {
 		tt := tests[i]
 		ds, mock := datastore.InitMockDB(t)
-		mock.On(r.DB("mockdb").Table("switch")).Return(testSwitches, nil)
+		mock.On(r.DB("mockdb").Table("switch").Filter(r.MockAnything())).Return(testSwitches, nil)
 		mock.On(r.DB("mockdb").Table("switch").Get(r.MockAnything()).Replace(r.MockAnything())).Return(testdata.EmptyResult, nil)
 
 		t.Run(tt.name, func(t *testing.T) {