Cleanup unused fields in RemoteCVDLocator

Author: 0405ysj

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.Name, cvd.Host)
+	logger.Printf("Connecting to %s in host %s", cvd.ID, 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

@@ -41,13 +41,9 @@ type RemoteCVDLocator struct {
 	Host string `json:"host"`
 	// Identifier within the whole fleet.
 	ID string `json:"id"`
-	// Identifier within a group.
-	Name string `json:"name"`
-	// Instead of `Name`, `WebRTCDeviceID` is the identifier used for setting up the adb connections. It
+	// `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"`
-	// ADB port of Cuttlefish instance.
-	ADBSerial string `json:"adb_serial"`
 }
 
 func (l *RemoteCVDLocator) Group() string {
@@ -72,9 +68,7 @@ func NewRemoteCVD(host string, cvd *hoapi.CVD) *RemoteCVD {
 		RemoteCVDLocator: RemoteCVDLocator{
 			Host:           host,
 			ID:             cvd.ID(),
-			Name:           cvd.Name,
 			WebRTCDeviceID: cvd.WebRTCDeviceID,
-			ADBSerial:      cvd.ADBSerial,
 		},
 		Status:   cvd.Status,
 		Displays: cvd.Displays,