Enhance rbd ls Command to List Images Without Requiring an Image Name

Signed-off-by: Oded Viner <[email protected]>

Author: OdedViner

cmd/odf/ceph/rbd.go

@@ -2,9 +2,7 @@ package ceph
 
 import (
 	"github.com/red-hat-storage/odf-cli/cmd/odf/root"
-	"github.com/rook/kubectl-rook-ceph/pkg/exec"
-	"github.com/rook/kubectl-rook-ceph/pkg/k8sutil"
-	"github.com/rook/kubectl-rook-ceph/pkg/logging"
+	"github.com/rook/kubectl-rook-ceph/pkg/rbd"
 	"github.com/spf13/cobra"
 )
 
@@ -14,17 +12,16 @@ var RbdCmd = &cobra.Command{
 	Short:              "call a 'rbd' CLI command with arbitrary args",
 	DisableFlagParsing: true,
 	Args:               cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		logging.Info("running 'rbd' command with args: %v", args)
-		// verify operator pod is running
-		_, err := k8sutil.WaitForPodToRun(cmd.Context(), root.ClientSets.Kube, root.OperatorNamespace, "app=rook-ceph-operator")
-		if err != nil {
-			logging.Fatal(err)
-		}
+}
 
-		_, err = exec.RunCommandInOperatorPod(cmd.Context(), root.ClientSets, cmd.Use, args, root.OperatorNamespace, root.StorageClusterNamespace, false)
-		if err != nil {
-			logging.Fatal(err)
-		}
+var listCmdRbd = &cobra.Command{
+	Use:   "ls",
+	Short: "Print the list of rbd images.",
+	Run: func(cmd *cobra.Command, args []string) {
+		rbd.ListImages(cmd.Context(), root.ClientSets, root.OperatorNamespace, root.StorageClusterNamespace)
 	},
 }
+
+func init() {
+	RbdCmd.AddCommand(listCmdRbd)
+}