towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 11:37:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes and fixes

Browse source
This commit is contained in:
David J. Allen 2023-10-11 15:00:13 -06:00
parent 174e2084fc
commit b76d5e61ff
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/api/smd/smd.go
View file

@ -51,11 +51,11 @@ func AddRedfishEndpoint(data []byte, headers map[string]string) error {
// Add redfish endpoint via POST `/hsm/v2/Inventory/RedfishEndpoints` endpoint // Add redfish endpoint via POST `/hsm/v2/Inventory/RedfishEndpoints` endpoint
url := makeEndpointUrl("/Inventory/RedfishEndpoints") url := makeEndpointUrl("/Inventory/RedfishEndpoints")
res, body, err := util.MakeRequest(url, "POST", data, headers) res, body, err := util.MakeRequest(url, "POST", data, headers)
fmt.Printf("%v (%v)\n%s\n", url, res.Status, string(body))
if res != nil { if res != nil {
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
return fmt.Errorf("could not add redfish endpoint") return fmt.Errorf("could not add redfish endpoint")
} }
fmt.Printf("%v (%v)\n%s\n", url, res.Status, string(body))
} }
return err return err
} }

28
internal/collect.go
View file

@ -153,16 +153,16 @@ func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) er
node.NodeBMC += 1 node.NodeBMC += 1
// data to be sent to smd // data to be sent to smd
data := make(map[string]any) data := map[string]any{
data["ID"] = fmt.Sprintf("%v", node.String()[:len(node.String())-2]) "ID": fmt.Sprintf("%v", node.String()[:len(node.String())-2]),
data["Type"] = "" "Type": "",
data["Name"] = "" "Name": "",
data["FQDN"] = ps.Host "FQDN": ps.Host,
data["User"] = q.User "User": q.User,
data["Password"] = q.Pass "Password": q.Pass,
data["IPAddr"] = "" "MACRequired": true,
data["MACAddr"] = "" "RediscoverOnUpdate": false,
data["RediscoverOnUpdate"] = false }
// unmarshal json to send in correct format // unmarshal json to send in correct format
var rm map[string]json.RawMessage var rm map[string]json.RawMessage
@ -191,14 +191,14 @@ func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) er
continue continue
} }
json.Unmarshal(interfaces, &rm) json.Unmarshal(interfaces, &rm)
data["Interface"] = rm["Interface"] data["Interfaces"] = rm["Interfaces"]
// get MAC address of first interface (for now...) // get MAC address of first interface (for now...)
if len(rm["Interface"]) > 0 { if len(rm["Interfaces"]) > 0 {
var i map[string]interface{} var i map[string]interface{}
json.Unmarshal(rm["Interface"], &i) json.Unmarshal(rm["Interfaces"], &i)
data["MACAddr"] = i["MACAddress"] data["MACAddr"] = i["MACAddress"]
data["IPAddr"] = i["IPAddress"] data["IPAddress"] = i["IPAddress"]
if i["FQDN"] != "" { if i["FQDN"] != "" {
data["FQDN"] = rm["FQDN"] data["FQDN"] = rm["FQDN"]
} }

4
internal/db/sqlite/sqlite.go
View file

@ -26,7 +26,7 @@ func CreateProbeResultsIfNotExists(path string) (*sqlx.DB, error) {
return db, nil return db, nil
} }
func InsertProbeResults(path string, states *[]magellan.BMCProbeResult) error { func InsertProbeResults(path string, states *[]magellan.ScannedResult) error {
if states == nil { if states == nil {
return fmt.Errorf("states == nil") return fmt.Errorf("states == nil")
} }
@ -54,7 +54,7 @@ func InsertProbeResults(path string, states *[]magellan.BMCProbeResult) error {
return nil return nil
} }
func DeleteProbeResults(path string, results *[]magellan.BMCProbeResult) error { func DeleteProbeResults(path string, results *[]magellan.ScannedResult) error {
if results == nil { if results == nil {
return fmt.Errorf("no probe results found") return fmt.Errorf("no probe results found")
} }