Merge pull request #19 from davidallendj/optimization

Refactor code to reuse clients for each BMC

bin/magellan.sh

@@ -7,9 +7,10 @@ USER=""
 PASS=""
 SMD_HOST=""
 SMD_PORT=""
-THREADS="-1"
+THREADS="1"
 TIMEOUT="30"
 ARGS=""
+FORCE_UPDATE=false
 
 
 function build(){
@@ -18,7 +19,11 @@ function build(){
 
 function scan() {
 	# ./magellan scan --subnet 172.16.0.0 --port 443
-	${EXE} scan --subnet ${SUBNETS} --port ${PORTS} --timeout ${TIMEOUT} --threads ${THREADS}
+	${EXE} scan \
+		--subnet ${SUBNETS} \
+		--port ${PORTS} \
+		--timeout ${TIMEOUT} \
+		--threads ${THREADS}
 }
 
 function list(){
@@ -28,7 +33,14 @@ function list(){
 
 function collect() {
 	# ./magellan collect --user admin --pass password
-	${EXE} collect --user ${USER} --pass ${PASS} --timeout ${TIMEOUT} --threads ${THREADS} --host ${SMD_HOST} --port ${SMD_PORT}
+	${EXE} collect \
+		--user ${USER} \
+		--pass ${PASS} \
+		--timeout ${TIMEOUT} \
+		--threads ${THREADS} \
+		--host ${SMD_HOST} \
+		--port ${SMD_PORT} \
+		--force-update ${FORCE_UPDATE}
 }
 
 
@@ -93,6 +105,8 @@ echo "SMD port	= ${SMD_PORT}"
 echo "subnets 	= ${SUBNETS}"
 echo "ports	 	= ${PORTS}"
 echo "user 		= ${USER}"
+echo "threads	= ${THREADS}"
+echo "timeout	= ${TIMEOUT}"
 echo "pass 		= ..."
 
 if [[ -n $1 ]]; then

internal/api/smd/smd.go

@@ -5,7 +5,6 @@ package smd
 //	https://github.com/alexlovelltroy/hms-smd
 import (
 	"fmt"
-	"net/http"
 
 	"github.com/bikeshack/magellan/internal/util"
 	// hms "github.com/alexlovelltroy/hms-smd"
@@ -52,7 +51,8 @@ func AddRedfishEndpoint(data []byte, headers map[string]string) error {
 	url := makeEndpointUrl("/Inventory/RedfishEndpoints")
 	res, body, err := util.MakeRequest(url, "POST", data, headers)
 	if res != nil {
-		if res.StatusCode != http.StatusOK {
+		statusOk := res.StatusCode >= 200 && res.StatusCode < 300
+		if !statusOk {
 			return fmt.Errorf("could not add redfish endpoint")
 		}
 		fmt.Printf("%v (%v)\n%s\n", url, res.Status, string(body))
@@ -69,7 +69,8 @@ func UpdateRedfishEndpoint(xname string, data []byte, headers map[string]string)
 	res, body, err := util.MakeRequest(url, "PUT", data, headers)
 	fmt.Printf("%v (%v)\n%s\n", url, res.Status, string(body))
 	if res != nil {
-		if res.StatusCode != http.StatusOK {
+		statusOk := res.StatusCode >= 200 && res.StatusCode < 300
+		if !statusOk {
 			return fmt.Errorf("could not update redfish endpoint")
 		}
 	}

internal/collect.go

@@ -130,6 +130,7 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
 		NodeBMC:       -1,
 	}
 
+
 	// collect bmc information asynchronously
 	var wg sync.WaitGroup
 	wg.Add(q.Threads)
@@ -144,13 +145,17 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
 				q.Host = ps.Host
 				q.Port = ps.Port
 
-				client, err := NewClient(l, q)
+				node.NodeBMC += 1
+
+				bmclibClient, err := NewClient(l, q)
 				if err != nil {
 					l.Log.Errorf("could not make client: %v", err)
-					continue
 				}
 
-				node.NodeBMC += 1
+				gofishClient, err := connectGofish(q)
+				if err != nil {
+					l.Log.Errorf("could not connect to bmc (%v:%v): %v", q.Host, q.Port, err)
+				}
 
 				// data to be sent to smd
 				data := map[string]any{
@@ -168,15 +173,18 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
 				var rm map[string]json.RawMessage
 
 				// inventories
-				inventory, err := CollectInventory(client, q)
+				if bmclibClient != nil {
+					inventory, err := CollectInventory(bmclibClient, q)
 					if err != nil {
 						l.Log.Errorf("could not query inventory (%v:%v): %v", q.Host, q.Port, err)
 					}
 					json.Unmarshal(inventory, &rm)
 					data["Inventory"] = rm["Inventory"]
+				}
 
 				// chassis
-				chassis, err := CollectChassis(q)
+				if gofishClient != nil {
+					chassis, err := CollectChassis(gofishClient, q)
 					if err != nil {
 						l.Log.Errorf("could not query chassis: %v", err)
 						continue
@@ -184,35 +192,8 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
 					json.Unmarshal(chassis, &rm)
 					data["Chassis"] = rm["Chassis"]
 
-				// ethernet interfaces
-				// interfaces, err := QueryEthernetInterfaces(client, q)
-				// if err != nil {
-				// 	l.Log.Errorf("could not query ethernet interfaces: %v", err)
-				// 	continue
-				// }
-				// json.Unmarshal(interfaces, &rm)
-				// data["Interfaces"] = rm["Interfaces"]
-
-				// storage
-				// storage, err := QueryStorage(q)
-				// if err != nil {
-				// 	l.Log.Errorf("could not query storage: %v", err)
-				// 	continue
-				// }
-				// json.Unmarshal(storage, &rm)
-				// data["Storage"] = rm["Storage"]
-
-				// get specific processor info
-				// procs, err := QueryProcessors(q)
-				// if err != nil {
-				// 	l.Log.Errorf("could not query processors: %v", err)
-				// }
-				// var p map[string]interface{}
-				// json.Unmarshal(procs, &p)
-				// data["Processors"] = rm["Processors"]
-
 					// systems
-				systems, err := CollectSystems(client, q)
+					systems, err := CollectSystems(gofishClient, q)
 					if err != nil {
 						l.Log.Errorf("could not query systems: %v", err)
 					}
@@ -225,16 +206,7 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
 						json.Unmarshal(rm["Systems"], &s)
 						data["Name"] = s["Name"]
 					}
-
+				}
-				// data["Type"] = rm[""]
-
-				// registries
-				// registries, err := QueryRegisteries(q)
-				// if err != nil {
-				// 	l.Log.Errorf("could not query registries: %v", err)
-				// }
-				// json.Unmarshal(registries, &rm)
-				// data["Registries"] = rm["Registries"]
 
 				headers := make(map[string]string)
 				headers["Content-Type"] = "application/json"
@@ -340,7 +312,6 @@ func CollectInventory(client *bmclib.Client, q *QueryParams) ([]byte, error) {
 		ctxCancel()
 		return nil, fmt.Errorf("could not open client: %v", err)
 	}
-	defer client.Close(ctx)
 
 	inventory, err := client.Inventory(ctx)
 	if err != nil {
@@ -372,7 +343,6 @@ func CollectPowerState(client *bmclib.Client, q *QueryParams) ([]byte, error) {
 		ctxCancel()
 		return nil, fmt.Errorf("could not open client: %v", err)
 	}
-	defer client.Close(ctx)
 
 	powerState, err := client.GetPowerState(ctx)
 	if err != nil {
@@ -442,12 +412,7 @@ func CollectBios(client *bmclib.Client, q *QueryParams) ([]byte, error) {
 	return b, err
 }
 
-func CollectEthernetInterfaces(client *bmclib.Client, q *QueryParams, systemID string) ([]byte, error) {
+func CollectEthernetInterfaces(c *gofish.APIClient, q *QueryParams, systemID string) ([]byte, error) {
-	c, err := connectGofish(q)
-	if err != nil {
-		return nil, fmt.Errorf("could not connect to bmc: %v", err)
-	}
-
 	systems, err := c.Service.Systems()
 	if err != nil {
 		return nil, fmt.Errorf("could not query storage systems (%v:%v): %v", q.Host, q.Port, err)
@@ -478,11 +443,7 @@ func CollectEthernetInterfaces(client *bmclib.Client, q *QueryParams, systemID s
 	return b, nil
 }
 
-func CollectChassis(q *QueryParams) ([]byte, error) {
+func CollectChassis(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
-	c, err := connectGofish(q)
-	if err != nil {
-		return nil, fmt.Errorf("could not connect to bmc (%v:%v): %v", q.Host, q.Port, err)
-	}
 	chassis, err := c.Service.Chassis()
 	if err != nil {
 		return nil, fmt.Errorf("could not query chassis (%v:%v): %v", q.Host, q.Port, err)
@@ -500,12 +461,7 @@ func CollectChassis(q *QueryParams) ([]byte, error) {
 	return b, nil
 }
 
-func CollectStorage(q *QueryParams) ([]byte, error) {
+func CollectStorage(c *gofish.APIClient, q *QueryParams) ([]byte, error) {	
-	c, err := connectGofish(q)
-	if err != nil {
-		return nil, fmt.Errorf("could not connect to bmc (%v:%v): %v", q.Host, q.Port, err)
-	}
-
 	systems, err := c.Service.StorageSystems()
 	if err != nil {
 		return nil, fmt.Errorf("could not query storage systems (%v:%v): %v", q.Host, q.Port, err)
@@ -533,12 +489,7 @@ func CollectStorage(q *QueryParams) ([]byte, error) {
 	return b, nil
 }
 
-func CollectSystems(client *bmclib.Client, q *QueryParams) ([]byte, error) {
+func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
-	c, err := connectGofish(q)
-	if err != nil {
-		return nil, fmt.Errorf("could not connect to bmc (%v:%v): %v", q.Host, q.Port, err)
-	}
-
 	systems, err := c.Service.Systems()
 	if err != nil {
 		return nil, fmt.Errorf("could not query systems (%v:%v): %v", q.Host, q.Port, err)
@@ -547,7 +498,7 @@ func CollectSystems(client *bmclib.Client, q *QueryParams) ([]byte, error) {
 	// query the system's ethernet interfaces
 	var temp []map[string]any
 	for _, system := range systems {
-		interfaces, err := CollectEthernetInterfaces(client, q, system.ID)
+		interfaces, err := CollectEthernetInterfaces(c, q, system.ID)
 		if err != nil {
 			continue
 		}
@@ -559,7 +510,7 @@ func CollectSystems(client *bmclib.Client, q *QueryParams) ([]byte, error) {
 		})
 	}
 
-	data := map[string]any{"Systems": temp }
+	data := map[string]any{"Systems": temp}
 	b, err := json.MarshalIndent(data, "", "    ")
 	if err != nil {
 		return nil, fmt.Errorf("could not marshal JSON: %v", err)
@@ -571,12 +522,7 @@ func CollectSystems(client *bmclib.Client, q *QueryParams) ([]byte, error) {
 	return b, nil
 }
 
-func CollectRegisteries(q *QueryParams) ([]byte, error) {
+func CollectRegisteries(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
-	c, err := connectGofish(q)
-	if err != nil {
-		return nil, fmt.Errorf("could not connect to bmc (%v:%v): %v", q.Host, q.Port, err)
-	}
-
 	registries, err := c.Service.Registries()
 	if err != nil {
 		return nil, fmt.Errorf("could not query storage systems (%v:%v): %v", q.Host, q.Port, err)