Turn off machine LED on machine free. (#233)

metal-stack · Nov 18, 2021 · 379c3ca · 379c3ca
1 parent 0873d61
commit 379c3ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/cmd/metal-api/internal/service/machine-service.go b/cmd/metal-api/internal/service/machine-service.go
@@ -1653,6 +1653,11 @@ func (r machineResource) freeMachine(request *restful.Request, response *restful
 	}
 	logger := utils.Logger(request).Sugar()
 
+	err = publishMachineCmd(logger, m, r.Publisher, metal.ChassisIdentifyLEDOffCmd)
+	if err != nil {
+		logger.Error("unable to publish machine command", zap.String("command", string(metal.ChassisIdentifyLEDOffCmd)), zap.String("machineID", m.ID), zap.Error(err))
+	}
+
 	err = r.actor.freeMachine(r.Publisher, m)
 	if checkError(request, response, utils.CurrentFuncName(), err) {
 		return

diff --git a/cmd/metal-api/internal/service/machine-service_test.go b/cmd/metal-api/internal/service/machine-service_test.go
@@ -557,12 +557,12 @@ func TestFreeMachine(t *testing.T) {
 	testdata.InitMockDBData(mock)
 
 	pub := &emptyPublisher{}
-	events := []string{"1-machine", "releaseMachineNetworks", "1-switch"}
+	events := []string{"1-machine", "1-machine", "releaseMachineNetworks", "1-switch"}
 	eventidx := 0
 	pub.doPublish = func(topic string, data interface{}) error {
 		require.Equal(t, events[eventidx], topic)
 		eventidx++
-		if eventidx == 1 {
+		if eventidx == 2 {
 			dv := data.(metal.MachineEvent)
 			require.Equal(t, "1", dv.OldMachineID)
 		}

diff --git a/pkg/api/v1/supwd.pb.go b/pkg/api/v1/supwd.pb.go
diff --git a/pkg/api/v1/wait.pb.go b/pkg/api/v1/wait.pb.go