Return "adb_port".

Bug: b/504700123

Author: ser-io

e2etests/orchestration/create_from_images_zip_test/main_test.go

@@ -94,6 +94,7 @@ func TestCreateInstance(t *testing.T) {
 				Displays:       []string{"720 x 1280 ( 320 )"},
 				WebRTCDeviceID: "cvd-1",
 				ADBSerial:      "0.0.0.0:6520",
+				ADBPort:        6520,
 			},
 		},
 	}

e2etests/orchestration/create_local_image_test/main_test.go

@@ -102,6 +102,7 @@ func TestInstance(t *testing.T) {
 				Displays:       []string{"720 x 1280 ( 320 )"},
 				WebRTCDeviceID: "cvd-1",
 				ADBSerial:      "0.0.0.0:6520",
+				ADBPort:        6520,
 			},
 		},
 	}

e2etests/orchestration/create_single_instance_test/main_test.go

@@ -84,6 +84,7 @@ func TestCreateSingleInstance(t *testing.T) {
 				Displays:       []string{"720 x 1280 ( 320 )"},
 				WebRTCDeviceID: "cvd-1-1",
 				ADBSerial:      "0.0.0.0:6520",
+				ADBPort:        6520,
 			},
 		},
 	}

frontend/src/host_orchestrator/api/v1/messages.go

@@ -116,6 +116,8 @@ type CVD struct {
 	WebRTCDeviceID string `json:"webrtc_device_id"`
 	// [Output Only]
 	ADBSerial string `json:"adb_serial"`
+	// [Output Only]
+	ADBPort uint32 `json:"adb_port"`
 }
 
 // Identifier within the whole fleet. Format: "{group}/{name}".

frontend/src/host_orchestrator/docs/swagger.yaml

@@ -69,6 +69,9 @@ definitions:
     type: object
   v1.CVD:
     properties:
+      adb_port:
+        description: '[Output Only]'
+        type: integer
       adb_serial:
         description: '[Output Only]'
         type: string

frontend/src/host_orchestrator/orchestrator/cvd/cvd.go

@@ -376,6 +376,13 @@ func (i *Instance) ADBSerial() string {
 	return i.instance.ADBSerial
 }
 
+func (i *Instance) ADBPort() uint32 {
+	if i.instance == nil {
+		panic("Lazy loaded instance is not yet initialized")
+	}
+	return i.instance.ADBPort
+}
+
 type DisplayAddOpts struct {
 	Width         int
 	Height        int

frontend/src/host_orchestrator/orchestrator/cvd/output/output.go

@@ -30,6 +30,7 @@ type Instance struct {
 	InstanceDir    string   `json:"instance_dir"`
 	WebRTCDeviceID string   `json:"webrtc_device_id"`
 	ADBSerial      string   `json:"adb_serial"`
+	ADBPort        uint32   `json:"adb_port"`
 }
 
 // The output of the cvd fleet command

frontend/src/host_orchestrator/orchestrator/instancemanager.go

@@ -65,6 +65,7 @@ func CvdInstanceToAPIObject(instance *cvd.Instance, group string) *apiv1.CVD {
 		Displays:       instance.Displays(),
 		WebRTCDeviceID: instance.WebRTCDeviceID(),
 		ADBSerial:      instance.ADBSerial(),
+		ADBPort:        instance.ADBPort(),
 	}
 }
 

frontend/src/host_orchestrator/orchestrator/listcvdsaction_test.go

@@ -37,6 +37,7 @@ func TestListCVDsSucceeds(t *testing.T) {
                       "group_name": "foo",
                       "instances": [
                         {
+                          "adb_port": 6520,
                           "adb_serial": "0.0.0.0:6520",
                           "assembly_dir": "/var/lib/cuttlefish-common/runtimes/cuttlefish/assembly",
                           "displays": [
@@ -55,6 +56,7 @@ func TestListCVDsSucceeds(t *testing.T) {
                       "group_name": "bar",
                       "instances": [
                         {
+                          "adb_port": 6520,
                           "adb_serial": "0.0.0.0:6520",
                           "assembly_dir": "/var/lib/cuttlefish-common/runtimes/cuttlefish/assembly",
                           "displays": [
@@ -89,6 +91,7 @@ func TestListCVDsSucceeds(t *testing.T) {
 			Displays:       []string{"720 x 1280 ( 320 )"},
 			WebRTCDeviceID: "cvd-1",
 			ADBSerial:      "0.0.0.0:6520",
+			ADBPort:        6520,
 		},
 		{
 			Group:          "bar",
@@ -98,6 +101,7 @@ func TestListCVDsSucceeds(t *testing.T) {
 			Displays:       []string{"720 x 1280 ( 320 )"},
 			WebRTCDeviceID: "cvd-1",
 			ADBSerial:      "0.0.0.0:6520",
+			ADBPort:        6520,
 		},
 	}
 	var tests = []struct {