Skip to content

Commit

Permalink
Merge pull request #18 from davidallendj/tidy-code
Browse files Browse the repository at this point in the history 
Rename `Query*` functions in `internal/collect.go` to `Collect*`
  • Loading branch information
@davidallendj
davidallendj authored Oct 19, 2023
2 parents af2ebec + d7d1265 commit 1db4349
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion cmd/collect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var collectCmd = &cobra.Command{
OutputPath: outputPath,
ForceUpdate: forceUpdate,
}
magellan.CollectInfo(&probeStates, l, q)
magellan.CollectAll(&probeStates, l, q)

// confirm the inventories were added
err = smd.GetRedfishEndpoints()
Expand Down
32 changes: 16 additions & 16 deletions internal/collect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func NewClient(l *log.Logger, q *QueryParams) (*bmclib.Client, error) {
return client, nil
}

func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) error {
func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) error {
// check for available probe states
if probeStates == nil {
return fmt.Errorf("no probe states found")
Expand Down Expand Up @@ -168,15 +168,15 @@ func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) er
var rm map[string]json.RawMessage

// inventories
inventory, err := QueryInventory(client, q)
inventory, err := CollectInventory(client, 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 := QueryChassis(q)
chassis, err := CollectChassis(q)
if err != nil {
l.Log.Errorf("could not query chassis: %v", err)
continue
Expand Down Expand Up @@ -212,7 +212,7 @@ func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) er
// data["Processors"] = rm["Processors"]

// systems
systems, err := QuerySystems(client, q)
systems, err := CollectSystems(client, q)
if err != nil {
l.Log.Errorf("could not query systems: %v", err)
}
Expand Down Expand Up @@ -297,7 +297,7 @@ func CollectInfo(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) er
return nil
}

func QueryMetadata(client *bmclib.Client, q *QueryParams) ([]byte, error) {
func CollectMetadata(client *bmclib.Client, q *QueryParams) ([]byte, error) {
// client, err := NewClient(l, q)

// open BMC session and update driver registry
Expand Down Expand Up @@ -331,7 +331,7 @@ func QueryMetadata(client *bmclib.Client, q *QueryParams) ([]byte, error) {
return b, nil
}

func QueryInventory(client *bmclib.Client, q *QueryParams) ([]byte, error) {
func CollectInventory(client *bmclib.Client, q *QueryParams) ([]byte, error) {
// open BMC session and update driver registry
ctx, ctxCancel := context.WithTimeout(context.Background(), time.Second*time.Duration(q.Timeout))
client.Registry.FilterForCompatible(ctx)
Expand Down Expand Up @@ -364,7 +364,7 @@ func QueryInventory(client *bmclib.Client, q *QueryParams) ([]byte, error) {
return b, nil
}

func QueryPowerState(client *bmclib.Client, q *QueryParams) ([]byte, error) {
func CollectPowerState(client *bmclib.Client, q *QueryParams) ([]byte, error) {
ctx, ctxCancel := context.WithTimeout(context.Background(), time.Second*time.Duration(q.Timeout))
client.Registry.FilterForCompatible(ctx)
err := client.PreferProvider(q.Preferred).Open(ctx)
Expand Down Expand Up @@ -396,7 +396,7 @@ func QueryPowerState(client *bmclib.Client, q *QueryParams) ([]byte, error) {

}

func QueryUsers(client *bmclib.Client, q *QueryParams) ([]byte, error) {
func CollectUsers(client *bmclib.Client, q *QueryParams) ([]byte, error) {
// open BMC session and update driver registry
ctx, ctxCancel := context.WithTimeout(context.Background(), time.Second*time.Duration(q.Timeout))
client.Registry.FilterForCompatible(ctx)
Expand Down Expand Up @@ -430,7 +430,7 @@ func QueryUsers(client *bmclib.Client, q *QueryParams) ([]byte, error) {
return b, nil
}

func QueryBios(client *bmclib.Client, q *QueryParams) ([]byte, error) {
func CollectBios(client *bmclib.Client, q *QueryParams) ([]byte, error) {
// client, err := NewClient(l, q)
// if err != nil {
// return nil, fmt.Errorf("could not make query: %v", err)
Expand All @@ -442,7 +442,7 @@ func QueryBios(client *bmclib.Client, q *QueryParams) ([]byte, error) {
return b, err
}

func QueryEthernetInterfaces(client *bmclib.Client, q *QueryParams, systemID string) ([]byte, error) {
func CollectEthernetInterfaces(client *bmclib.Client, q *QueryParams, systemID string) ([]byte, error) {
c, err := connectGofish(q)
if err != nil {
return nil, fmt.Errorf("could not connect to bmc: %v", err)
Expand Down Expand Up @@ -478,7 +478,7 @@ func QueryEthernetInterfaces(client *bmclib.Client, q *QueryParams, systemID str
return b, nil
}

func QueryChassis(q *QueryParams) ([]byte, error) {
func CollectChassis(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)
Expand All @@ -500,7 +500,7 @@ func QueryChassis(q *QueryParams) ([]byte, error) {
return b, nil
}

func QueryStorage(q *QueryParams) ([]byte, error) {
func CollectStorage(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)
Expand Down Expand Up @@ -533,7 +533,7 @@ func QueryStorage(q *QueryParams) ([]byte, error) {
return b, nil
}

func QuerySystems(client *bmclib.Client, q *QueryParams) ([]byte, error) {
func CollectSystems(client *bmclib.Client, 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)
Expand All @@ -547,7 +547,7 @@ func QuerySystems(client *bmclib.Client, q *QueryParams) ([]byte, error) {
// query the system's ethernet interfaces
var temp []map[string]any
for _, system := range systems {
interfaces, err := QueryEthernetInterfaces(client, q, system.ID)
interfaces, err := CollectEthernetInterfaces(client, q, system.ID)
if err != nil {
continue
}
Expand All @@ -571,7 +571,7 @@ func QuerySystems(client *bmclib.Client, q *QueryParams) ([]byte, error) {
return b, nil
}

func QueryRegisteries(q *QueryParams) ([]byte, error) {
func CollectRegisteries(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)
Expand All @@ -594,7 +594,7 @@ func QueryRegisteries(q *QueryParams) ([]byte, error) {
return b, nil
}

func QueryProcessors(q *QueryParams) ([]byte, error) {
func CollectProcessors(q *QueryParams) ([]byte, error) {
url := baseRedfishUrl(q) + "/Systems"
res, body, err := util.MakeRequest(url, "GET", nil, nil)
if err != nil {
Expand Down

0 comments on commit 1db4349

Please sign in to comment.