Merge pull request #156 from Cray-HPE/settled-dark-phoenix

remove empty tests and continuity to error on commands that are not implemented

cmd/cdu/add_cdu.go

@@ -26,36 +26,21 @@
 package cdu
 
 import (
-	root "github.com/Cray-HPE/cani/cmd"
-	"github.com/Cray-HPE/cani/internal/domain"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
 // AddCduCmd represents the cdu add command
 var AddCduCmd = &cobra.Command{
-	Use:               "cdu",
-	Short:             "Add cdus to the inventory.",
-	Long:              `Add cdus to the inventory.`,
-	PersistentPreRunE: root.DatastoreExists, // A session must be active to write to a datastore
-	Args:              validHardware,        // Hardware can only be valid if defined in the hardware library
-	RunE:              addCdu,               // Add a cdu when this sub-command is called
+	Use:     "cdu",
+	Short:   "Add cdus to the inventory.",
+	Long:    `Add cdus to the inventory.`,
+	PreRunE: validHardware, // Hardware can only be valid if defined in the hardware library
+	RunE:    addCdu,        // Add a cdu when this sub-command is called
 }
 
 // addCdu adds a cdu to the inventory
 func addCdu(cmd *cobra.Command, args []string) error {
-	// Create a domain object to interact with the datastore
-	_, err := domain.New(root.Conf.Session.DomainOptions)
-	if err != nil {
-		return err
-	}
 	log.Info().Msgf("Not yet implemented")
-	// Remove the cdu from the inventory using domain methods
-	// TODO:
-	// err = d.AddCdu()
-	// if err != nil {
-	// 	return err
-	// }
-	// log.Info().Msgf("Added cdu %s", args[0])
 	return nil
 }

cmd/cdu/list_cdu.go

@@ -26,15 +26,7 @@
 package cdu
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	root "github.com/Cray-HPE/cani/cmd"
-	"github.com/Cray-HPE/cani/internal/domain"
-	"github.com/Cray-HPE/cani/internal/inventory"
-	"github.com/Cray-HPE/cani/pkg/hardwaretypes"
-	"github.com/google/uuid"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -49,31 +41,6 @@ var ListCduCmd = &cobra.Command{
 
 // listCdu lists cdus in the inventory
 func listCdu(cmd *cobra.Command, args []string) error {
-	// Create a domain object to interact with the datastore
-	d, err := domain.New(root.Conf.Session.DomainOptions)
-	if err != nil {
-		return err
-	}
-
-	// Get the entire inventory
-	inv, err := d.List()
-	if err != nil {
-		return err
-	}
-	// Filter the inventory to only cdus
-	filtered := make(map[uuid.UUID]inventory.Hardware, 0)
-	for key, hw := range inv.Hardware {
-		if hw.Type == hardwaretypes.CoolingDistributionUnit {
-			filtered[key] = hw
-		}
-	}
-	// Convert the filtered inventory into a formatted JSON string
-	inventoryJSON, err := json.MarshalIndent(filtered, "", "  ")
-	if err != nil {
-		return errors.New(fmt.Sprintf("Error marshaling inventory to JSON: %v", err))
-	}
-
-	// Print the inventory
-	fmt.Println(string(inventoryJSON))
+	log.Info().Msgf("Not yet implemented")
 	return nil
 }