cvdr list --host ${HOST} prints valid service URL

Author: 0405ysj

e2etests/cvdr/cvdr_create_with_branch_test.sh

@@ -16,17 +16,16 @@ cvdr create \
     --build_target=aosp_cf_x86_64_only_phone-userdebug
 
 # Check the output of cvdr list
-# TODO(b/448007486): cvdr list should print proper URL instead of showing <nil>.
-# TODO(b/448007486): cvdr list should print proper ADB connection status.
+# TODO(b/448209030): cvdr list should print proper ADB connection status.
 ACTUAL_OUTPUT=$(cvdr list --host ${HOSTNAME})
-EXPECTED_OUTPUT="${HOSTNAME} (<nil>/)
+EXPECTED_OUTPUT="${HOSTNAME} (http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/)
   cvd/1
   Status: Running
   ADB: not connected
   Displays: [720 x 1280 ( 320 )]
-  Logs: <nil>/cvds/cvd/1/logs/"
+  Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd/1/logs/"
 diff <(echo ${EXPECTED_OUTPUT}) <(echo ${ACTUAL_OUTPUT})
 
 # Check ADB connection
-# TODO(b/448007486): Retrieve serial of the device from the output of cvdr list.
+# TODO(b/448209030): Retrieve serial of the device from the output of cvdr list.
 adb shell uptime

e2etests/cvdr/cvdr_create_with_local_srcs_test.sh

@@ -27,17 +27,16 @@ cvdr create \
     --local_images_zip_src=${IMAGE_ZIP}
 
 # Check the output of cvdr list
-# TODO(b/448007486): cvdr list should print proper URL instead of showing <nil>.
-# TODO(b/448007486): cvdr list should print proper ADB connection status.
+# TODO(b/448209030): cvdr list should print proper ADB connection status.
 ACTUAL_OUTPUT=$(cvdr list --host ${HOSTNAME})
-EXPECTED_OUTPUT="${HOSTNAME} (<nil>/)
+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: <nil>/cvds/cvd_1/1/logs/"
+  Logs: http://localhost:8080/v1/zones/local/hosts/${HOSTNAME}/cvds/cvd_1/1/logs/"
 diff <(echo ${EXPECTED_OUTPUT}) <(echo ${ACTUAL_OUTPUT})
 
 # Check ADB connection
-# TODO(b/448007486): Retrieve serial of the device from the output of cvdr list.
+# TODO(b/448209030): Retrieve serial of the device from the output of cvdr list.
 adb shell uptime

pkg/cli/cvd.go

@@ -553,7 +553,15 @@ func listCVDsSingleHost(srvClient client.Client, controlDir, host string) ([]*Re
 	if err != nil {
 		merr = multierror.Append(merr, err)
 	}
-	result := []*RemoteHost{{Name: host, CVDs: cvds}}
+	srvURL, err := srvClient.HostServiceURL(host)
+	if err != nil {
+		merr = multierror.Append(merr, fmt.Errorf("failed getting host service url: %w", err))
+	}
+	result := []*RemoteHost{{
+		ServiceURL: srvURL,
+		Name:       host,
+		CVDs:       cvds,
+	}}
 	return result, merr
 }