Introduce IPMI power state field (#218)

metal-stack · Aug 24, 2021 · 1308e1c · 1308e1c
1 parent 3e12ffc
commit 1308e1c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/cmd/metal-api/internal/metal/machine.go b/cmd/metal-api/internal/metal/machine.go
@@ -345,6 +345,7 @@ type IPMI struct {
 	Interface  string `rethinkdb:"interface" json:"interface"`
 	Fru        Fru    `rethinkdb:"fru" json:"fru"`
 	BMCVersion string `rethinkdb:"bmcversion" json:"bmcversion"`
+	PowerState string `rethinkdb:"powerstate" json:"powerstate"`
 }
 
 // BIOS contains machine bios information

diff --git a/cmd/metal-api/internal/service/machine-service.go b/cmd/metal-api/internal/service/machine-service.go
@@ -882,6 +882,10 @@ func (r machineResource) ipmiReport(request *restful.Request, response *restful.
 			newMachine.IPMI.BMCVersion = report.BMCVersion
 		}
 
+		if report.PowerState != "" {
+			newMachine.IPMI.PowerState = report.PowerState
+		}
+
 		err = r.ds.UpdateMachine(&oldMachine, &newMachine)
 		if err != nil {
 			logger.Errorf("could not update machine", "id", uuid, "ip", report.BMCIp, "machine", newMachine, "err", err)

diff --git a/cmd/metal-api/internal/service/v1/machine.go b/cmd/metal-api/internal/service/v1/machine.go
@@ -143,6 +143,7 @@ type MachineIPMI struct {
 	Interface  string     `json:"interface"`
 	Fru        MachineFru `json:"fru"`
 	BMCVersion string     `json:"bmcversion"`
+	PowerState string     `json:"powerstate"`
 }
 
 type MachineFru struct {
@@ -230,6 +231,7 @@ type MachineIpmiReport struct {
 	FRU         *MachineFru
 	BIOSVersion string
 	BMCVersion  string
+	PowerState  string
 }
 
 type MachineIpmiReports struct {
@@ -336,6 +338,7 @@ func NewMetalIPMI(r *MachineIPMI) metal.IPMI {
 			ProductPartNumber:   productPartNumber,
 			ProductSerial:       productSerial,
 		},
+		PowerState: r.PowerState,
 	}
 }
 
@@ -351,6 +354,7 @@ func NewMachineIPMIResponse(m *metal.Machine, s *metal.Size, p *metal.Partition,
 			Password:   m.IPMI.Password,
 			Interface:  m.IPMI.Interface,
 			BMCVersion: m.IPMI.BMCVersion,
+			PowerState: m.IPMI.PowerState,
 			Fru: MachineFru{
 				ChassisPartNumber:   &m.IPMI.Fru.ChassisPartNumber,
 				ChassisPartSerial:   &m.IPMI.Fru.ChassisPartSerial,

diff --git a/spec/metal-api.json b/spec/metal-api.json
@@ -2400,6 +2400,9 @@
         "password": {
           "type": "string"
         },
+        "powerstate": {
+          "type": "string"
+        },
         "user": {
           "type": "string"
         }
@@ -2411,6 +2414,7 @@
         "interface",
         "mac",
         "password",
+        "powerstate",
         "user"
       ]
     },
@@ -2521,13 +2525,17 @@
         },
         "FRU": {
           "$ref": "#/definitions/v1.MachineFru"
+        },
+        "PowerState": {
+          "type": "string"
         }
       },
       "required": [
         "BIOSVersion",
         "BMCIp",
         "BMCVersion",
-        "FRU"
+        "FRU",
+        "PowerState"
       ]
     },
     "v1.MachineIpmiReportResponse": {