Beautify output for dhcpserver commands

Author: kishen-v

cmd/dhcpserver/get.go

@@ -17,12 +17,12 @@ package dhcpserver
 import (
 	"fmt"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
 
 	"github.com/ppc64le-cloud/pvsadm/pkg"
 	"github.com/ppc64le-cloud/pvsadm/pkg/client"
+	"github.com/ppc64le-cloud/pvsadm/pkg/utils"
 )
 
 var (
@@ -47,12 +47,22 @@ var getCmd = &cobra.Command{
 			return err
 		}
 
-		servers, err := pvmclient.DHCPClient.Get(id)
+		server, err := pvmclient.DHCPClient.Get(id)
 		if err != nil {
 			return fmt.Errorf("failed to get a dhcpserver, err: %v", err)
 		}
-
-		spew.Dump(servers)
+		if server.Network.Name == nil {
+			klog.Infof("DHCP client reports status: %s, please retry in sometime.", *server.Status)
+			return nil
+		}
+		var IPandMAC string
+		for _, lease := range server.Leases {
+			IPandMAC += fmt.Sprintf("%s - %s ", *lease.InstanceIP, *lease.InstanceMacAddress)
+		}
+		table := utils.NewTable()
+		table.SetHeader([]string{"Network Name", "IP - MAC", "Status"})
+		table.Append([]string{*server.Network.Name, IPandMAC, *server.Status})
+		table.Table.Render()
 		return nil
 	},
 }

cmd/dhcpserver/list.go

@@ -49,7 +49,21 @@ var listCmd = &cobra.Command{
 		}
 
 		table := utils.NewTable()
-		table.Render(dhcpservers, nil)
+		table.SetHeader([]string{"ID", "Network ID", "Network Name", "Status"})
+		if len(dhcpservers) != 0 {
+			for _, dhcpserver := range dhcpservers {
+				if dhcpserver.Network.ID == nil || dhcpserver.Network.Name == nil {
+					// just in case, if the network is not ready, and the DHCP status reports as BUILD.
+					// printing the available information must suffice.
+					table.Append([]string{*dhcpserver.ID, "", "", *dhcpserver.Status})
+					continue
+				}
+				table.Append([]string{*dhcpserver.ID, *dhcpserver.Network.ID, *dhcpserver.Network.Name, *dhcpserver.Status})
+			}
+			table.Table.Render()
+			return nil
+		}
+		klog.Info("There are no DHCP servers associated with the instance id provided.")
 		return nil
 	},
 }