Output of cvdr list is clear to know the name of host, group, instance.

Author: 0405ysj

e2etests/cvdr/cvdr_create_with_branch_test.sh

@@ -18,12 +18,14 @@ cvdr create \
 # Check the output of cvdr list
 # TODO(b/448209030): cvdr list should print proper ADB connection status.
 ACTUAL_OUTPUT=$(cvdr list --host ${HOSTNAME})
-EXPECTED_OUTPUT="${HOSTNAME} (http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/)
-  cvd/1
-  Status: Running
-  ADB: not connected
-  Displays: [720 x 1280 ( 320 )]
-  Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd/1/logs/"
+EXPECTED_OUTPUT="Host: ${HOSTNAME}
+  WebUI: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/
+  Group: cvd
+    Instance: 1
+      Status: Running
+      ADB: not connected
+      Displays: [720 x 1280 ( 320 )]
+      Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd/1/logs/"
 diff <(echo ${EXPECTED_OUTPUT}) <(echo ${ACTUAL_OUTPUT})
 
 # Check ADB connection

e2etests/cvdr/cvdr_create_with_local_srcs_test.sh

@@ -29,12 +29,14 @@ cvdr create \
 # Check the output of cvdr list
 # TODO(b/448209030): cvdr list should print proper ADB connection status.
 ACTUAL_OUTPUT=$(cvdr list --host ${HOSTNAME})
-EXPECTED_OUTPUT="${HOSTNAME} (http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/)
-  cvd_1/1
-  Status: Running
-  ADB: not connected
-  Displays: [720 x 1280 ( 320 )]
-  Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd_1/1/logs/"
+EXPECTED_OUTPUT="Host: ${HOSTNAME}
+  WebUI: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/
+  Group: cvd_1
+    Instance: 1
+      Status: Running
+      ADB: not connected
+      Displays: [720 x 1280 ( 320 )]
+      Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd_1/1/logs/"
 diff <(echo ${EXPECTED_OUTPUT}) <(echo ${ACTUAL_OUTPUT})
 
 # Check ADB connection

pkg/cli/cli.go

@@ -313,34 +313,35 @@ func (c *command) Parent() *command {
 
 func WriteListCVDsOutput(w io.Writer, hosts []*RemoteHost) {
 	for _, host := range hosts {
-		fmt.Fprintln(w, hostOutput(host))
-		if len(host.CVDs) == 0 {
-			fmt.Fprintln(w, " ~~Empty~~ ")
-			fmt.Fprintln(w, "")
-			continue
-		}
+		hostOutput(w, host)
+		cvdMap := make(map[string][]*RemoteCVD)
 		for _, cvd := range host.CVDs {
-			lines := cvdOutput(host, cvd)
-			for _, l := range lines {
-				fmt.Fprintln(w, "  "+l)
+			cvdMap[cvd.Group] = append(cvdMap[cvd.Group], cvd)
+		}
+		for group, cvds := range cvdMap {
+			groupOutput(w, group)
+			for _, cvd := range cvds {
+				cvdOutput(w, host, cvd)
 			}
-			fmt.Fprintln(w)
 		}
 	}
 }
 
-func hostOutput(h *RemoteHost) string {
-	return fmt.Sprintf("%s (%s/)", h.Name, h.ServiceURL)
+func hostOutput(w io.Writer, h *RemoteHost) {
+	fmt.Fprintf(w, "Host: %s\n", h.Name)
+	fmt.Fprintf(w, "  WebUI: %s/\n", h.ServiceURL)
 }
 
-func cvdOutput(h *RemoteHost, c *RemoteCVD) []string {
-	return []string{
-		fmt.Sprintf("%s/%s", c.Group, c.Name),
-		"Status: " + c.Status,
-		"ADB: " + adbStateStr(c),
-		"Displays: " + fmt.Sprintf("%v", c.Displays),
-		"Logs: " + fmt.Sprintf("%s/cvds/%s/%s/logs/", h.ServiceURL, c.Group, c.Name),
-	}
+func groupOutput(w io.Writer, group string) {
+	fmt.Fprintf(w, "  Group: %s\n", group)
+}
+
+func cvdOutput(w io.Writer, h *RemoteHost, c *RemoteCVD) {
+	fmt.Fprintf(w, "    Instance: %s\n", c.Name)
+	fmt.Fprintf(w, "      Status: %s\n", c.Status)
+	fmt.Fprintf(w, "      ADB: %s\n", adbStateStr(c))
+	fmt.Fprintf(w, "      Displays: %v\n", c.Displays)
+	fmt.Fprintf(w, "      Logs: %s/cvds/%s/%s/logs/\n", h.ServiceURL, c.Group, c.Name)
 }
 
 func adbStateStr(c *RemoteCVD) string {