From b76d5e61ffd12907710f1ddcd4a5487ed6dd038c Mon Sep 17 00:00:00 2001
From: "David J. Allen" <allend@lanl.gov>
Date: Wed, 11 Oct 2023 15:00:13 -0600
Subject: [PATCH] Minor changes and fixes

---
 internal/api/smd/smd.go      |  2 +-
 internal/collect.go          | 28 ++++++++++++++--------------
 internal/db/sqlite/sqlite.go |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/internal/api/smd/smd.go b/internal/api/smd/smd.go
index 67a56d1..f257ad2 100644
--- a/internal/api/smd/smd.go
+++ b/internal/api/smd/smd.go
@@ -51,11 +51,11 @@ func AddRedfishEndpoint(data []byte, headers map[string]string) error {
 	// Add redfish endpoint via POST `/hsm/v2/Inventory/RedfishEndpoints` endpoint
 	url := makeEndpointUrl("/Inventory/RedfishEndpoints")
 	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.StatusCode != http.StatusOK {
 			return fmt.Errorf("could not add redfish endpoint")
 		}
+		fmt.Printf("%v (%v)\n%s\n", url, res.Status, string(body))
 	}
 	return err
 }
diff --git a/internal/collect.go b/internal/collect.go
index 28af60f..ca0d431 100644
--- a/internal/collect.go
+++ b/internal/collect.go
@@ -153,16 +153,16 @@ func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) er
 				node.NodeBMC += 1
 
 				// data to be sent to smd
-				data := make(map[string]any)
-				data["ID"] = fmt.Sprintf("%v", node.String()[:len(node.String())-2])
-				data["Type"] = ""
-				data["Name"] = ""
-				data["FQDN"] = ps.Host
-				data["User"] = q.User
-				data["Password"] = q.Pass
-				data["IPAddr"] = ""
-				data["MACAddr"] = ""
-				data["RediscoverOnUpdate"] = false
+				data := map[string]any{
+					"ID": fmt.Sprintf("%v", node.String()[:len(node.String())-2]),
+					"Type": "",
+					"Name": "",
+					"FQDN": ps.Host,
+					"User": q.User,
+					"Password": q.Pass,
+					"MACRequired": true,
+					"RediscoverOnUpdate": false,
+				}
 
 				// unmarshal json to send in correct format
 				var rm map[string]json.RawMessage
@@ -191,14 +191,14 @@ func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) er
 					continue
 				}
 				json.Unmarshal(interfaces, &rm)
-				data["Interface"] = rm["Interface"]
+				data["Interfaces"] = rm["Interfaces"]
 
 				// get MAC address of first interface (for now...)
-				if len(rm["Interface"]) > 0 {
+				if len(rm["Interfaces"]) > 0 {
 					var i map[string]interface{}
-					json.Unmarshal(rm["Interface"], &i)
+					json.Unmarshal(rm["Interfaces"], &i)
 					data["MACAddr"] = i["MACAddress"]
-					data["IPAddr"] = i["IPAddress"]
+					data["IPAddress"] = i["IPAddress"]
 					if i["FQDN"] != "" {
 						data["FQDN"] = rm["FQDN"]
 					}
diff --git a/internal/db/sqlite/sqlite.go b/internal/db/sqlite/sqlite.go
index 586a73d..7665f71 100644
--- a/internal/db/sqlite/sqlite.go
+++ b/internal/db/sqlite/sqlite.go
@@ -26,7 +26,7 @@ func CreateProbeResultsIfNotExists(path string) (*sqlx.DB, error) {
 	return db, nil
 }
 
-func InsertProbeResults(path string, states *[]magellan.BMCProbeResult) error {
+func InsertProbeResults(path string, states *[]magellan.ScannedResult) error {
 	if states == nil {
 		return fmt.Errorf("states == nil")
 	}
@@ -54,7 +54,7 @@ func InsertProbeResults(path string, states *[]magellan.BMCProbeResult) error {
 	return nil
 }
 
-func DeleteProbeResults(path string, results *[]magellan.BMCProbeResult) error {
+func DeleteProbeResults(path string, results *[]magellan.ScannedResult) error {
 	if results == nil {
 		return fmt.Errorf("no probe results found")
 	}