Merge branch 'master' into parse-public-key

metal-stack · Nov 13, 2024 · d55f805 · d55f805
2 parents 832d5b7 + 0d83e33
commit d55f805
Show file tree

Hide file tree

Showing 7 changed files with 221 additions and 203 deletions.
diff --git a/cmd/metal-api/internal/datastore/switch.go b/cmd/metal-api/internal/datastore/switch.go
@@ -138,7 +138,11 @@ func (rs *RethinkStore) SetVrfAtSwitches(m *metal.Machine, vrf string) (metal.Sw
 }
 
 func (rs *RethinkStore) ConnectMachineWithSwitches(m *metal.Machine) error {
-	switches, err := rs.ListSwitches()
+	if m.PartitionID == "" {
+		return fmt.Errorf("partitionID is empty in machine:%s", m.ID)
+	}
+	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/grpc/boot-service_test.go b/cmd/metal-api/internal/grpc/boot-service_test.go
@@ -119,7 +119,8 @@ func TestBootService_Register(t *testing.T) {
 			testdata.InitMockDBData(mock)
 
 			req := &v1.BootServiceRegisterRequest{
-				Uuid: tt.uuid,
+				Uuid:        tt.uuid,
+				PartitionId: "1",
 				Hardware: &v1.MachineHardware{
 					Memory: tt.memory,
 					Disks: []*v1.MachineBlockDevice{

diff --git a/cmd/metal-api/internal/service/machine-service_integration_test.go b/cmd/metal-api/internal/service/machine-service_integration_test.go
@@ -47,7 +47,8 @@ func TestMachineAllocationIntegrationFullCycle(t *testing.T) {
 
 	// Register a machine
 	mrr := &grpcv1.BootServiceRegisterRequest{
-		Uuid: "test-uuid",
+		Uuid:        "test-uuid",
+		PartitionId: "test-partition",
 		Bios: &grpcv1.MachineBIOS{
 			Version: "a",
 			Vendor:  "metal",

diff --git a/cmd/metal-api/internal/service/switch-service_test.go b/cmd/metal-api/internal/service/switch-service_test.go
@@ -339,7 +339,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) {

diff --git a/pkg/api/v1/boot.pb.go b/pkg/api/v1/boot.pb.go
diff --git a/proto/api/v1/boot.proto b/proto/api/v1/boot.proto
@@ -45,6 +45,7 @@ message BootServiceRegisterRequest {
   MachineIPMI ipmi = 4;
   repeated string tags = 5;
   string metal_hammer_version = 6;
+  string partition_id = 7;
 }
 
 message BootServiceRegisterResponse {