Drop ID from RemoteCVDLocator, and use group and instance name

Author: 0405ysj

pkg/cli/cli.go

@@ -335,11 +335,11 @@ func hostOutput(h *RemoteHost) string {
 
 func cvdOutput(h *RemoteHost, c *RemoteCVD) []string {
 	return []string{
-		c.ID,
+		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/logs/", h.ServiceURL, c.ID),
+		"Logs: " + fmt.Sprintf("%s/cvds/%s/%s/logs/", h.ServiceURL, c.Group, c.Name),
 	}
 }
 
@@ -1190,7 +1190,7 @@ func promptSingleGroupNameSelection(c *command, srvClient client.Client, control
 	cvds := flattenCVDs(hosts)
 	names := []string{}
 	for _, e := range cvds {
-		names = append(names, e.Group())
+		names = append(names, e.Group)
 	}
 	sel, err := PromptSelectionFromSliceString(c, names, Single)
 	if err != nil {

pkg/cli/conn.go

@@ -377,7 +377,7 @@ func NewConnController(
 	if err != nil {
 		return nil, err
 	}
-	logger.Printf("Connecting to %s in host %s", cvd.ID, cvd.Host)
+	logger.Printf("Connecting to instance %s of group %s in host %s", cvd.Name, cvd.Group, cvd.Host)
 	f, err := NewForwarder(logger)
 	if err != nil {
 		return nil, fmt.Errorf("failed to instantiate ADB forwarder for %q: %w", cvd.WebRTCDeviceID, err)

pkg/cli/cvd.go

@@ -38,18 +38,14 @@ import (
 )
 
 type RemoteCVDLocator struct {
-	Host string `json:"host"`
-	// Identifier within the whole fleet.
-	ID string `json:"id"`
+	Host  string `json:"host"`
+	Group string `json:"group"`
+	Name  string `json:"name"`
 	// `WebRTCDeviceID` is the identifier used for setting up the adb connections. It
 	// contains the group name and the device name, eg: "cvd-1_1".
 	WebRTCDeviceID string `json:"webrtc_device_id"`
 }
 
-func (l *RemoteCVDLocator) Group() string {
-	return strings.Split(l.ID, "/")[0]
-}
-
 type RemoteCVD struct {
 	RemoteCVDLocator
 	Status     string
@@ -67,7 +63,8 @@ func NewRemoteCVD(host string, cvd *hoapi.CVD) *RemoteCVD {
 	return &RemoteCVD{
 		RemoteCVDLocator: RemoteCVDLocator{
 			Host:           host,
-			ID:             cvd.ID(),
+			Group:          cvd.Group,
+			Name:           cvd.Name,
 			WebRTCDeviceID: cvd.WebRTCDeviceID,
 		},
 		Status:   cvd.Status,