moving ansible host to a new systems_info object array

internal/api/controllers/private/highlevelConnectionStatus.go

@@ -115,7 +115,9 @@ func formatConnectionResponse(satID *string, satOrgID *string, rhcClientID *stri
 	var formatedSatID SatelliteId
 	var formatedSatOrgID SatelliteOrgId
 	var formatedRHCClientID public.RunRecipient
-	var formatedAnsibleHost AnsibleHost
+
+	var formattedAnsibleHost AnsibleHost
+	formattedHostWithAnsibleHost := make([]HostIdWithAnsibleHost, len(hosts))
 
 	if satID != nil {
 		formatedSatID = SatelliteId(*satID)
@@ -130,11 +132,12 @@ func formatConnectionResponse(satID *string, satOrgID *string, rhcClientID *stri
 	}
 
 	if ansibleHost != nil {
-		formatedAnsibleHost = AnsibleHost(*ansibleHost)
+		formattedAnsibleHost = AnsibleHost(*ansibleHost)
 	}
 
 	for i, host := range hosts {
 		formatedHosts[i] = HostId(host)
+		formattedHostWithAnsibleHost[i] = HostIdWithAnsibleHost{HostId: HostId(host), AnsibleHost: formattedAnsibleHost}
 	}
 
 	connectionInfo := RecipientWithConnectionInfo{
@@ -145,7 +148,7 @@ func formatConnectionResponse(satID *string, satOrgID *string, rhcClientID *stri
 		SatOrgId:      formatedSatOrgID,
 		Status:        status,
 		Systems:       formatedHosts,
-		AnsibleHost:   formatedAnsibleHost,
+		SystemsInfo:   formattedHostWithAnsibleHost,
 	}
 
 	return connectionInfo

internal/api/tests/private/highLevelConnectionStatus_test.go

@@ -34,7 +34,9 @@ var _ = Describe("high level connection status", func() {
 		satOrgID := SatelliteOrgId("5")
 		satelliteHost := []HostId{"c484f980-ab8d-401b-90e7-aa1d4ccf8c0e"}
 		directConnectHost := []HostId{"fe30b997-c15a-44a9-89df-c236c3b5c540"}
-		ansibleHost := AnsibleHost("test-ansible-host")
+
+		satelliteHostWithAnsibleHost := []HostIdWithAnsibleHost{{HostId: "c484f980-ab8d-401b-90e7-aa1d4ccf8c0e", AnsibleHost: ""}}
+		directConnectHostWithAnsibleHost := []HostIdWithAnsibleHost{{HostId: "fe30b997-c15a-44a9-89df-c236c3b5c540", AnsibleHost: "test-ansible-host"}}
 
 		payload := ApiInternalHighlevelConnectionStatusJSONRequestBody{
 			Hosts: []string{"c484f980-ab8d-401b-90e7-aa1d4ccf8c0e"},
@@ -52,7 +54,7 @@ var _ = Describe("high level connection status", func() {
 		Expect((*result)[0].SatOrgId).To(Equal(satOrgID))
 		Expect((*result)[0].Status).To(Equal("connected"))
 		Expect((*result)[0].Systems).To(Equal(satelliteHost))
-		Expect((*result)[0].AnsibleHost).To(BeEmpty())
+		Expect((*result)[0].SystemsInfo).To(Equal(satelliteHostWithAnsibleHost))
 
 		Expect((*result)[1].Recipient).To(Equal(public.RunRecipient("32af5948-301f-449a-a25b-ff34c83264a2")))
 		Expect((*result)[1].RecipientType).To(Equal(RecipientType_directConnect))
@@ -61,6 +63,6 @@ var _ = Describe("high level connection status", func() {
 		Expect((*result)[1].SatOrgId).To(BeEmpty())
 		Expect((*result)[1].Status).To(Equal("connected"))
 		Expect((*result)[1].Systems).To(Equal(directConnectHost))
-		Expect((*result)[1].AnsibleHost).To(Equal(ansibleHost))
+		Expect((*result)[1].SystemsInfo).To(Equal(directConnectHostWithAnsibleHost))
 	})
 })

schema/private.openapi.yaml

@@ -331,8 +331,10 @@ components:
           description: Indicates the current run status of the recipient
           type: string
           enum: [connected, disconnected, rhc_not_configured]
-        ansible_host:
-          $ref: '#/components/schemas/AnsibleHost'
+        systems_info:
+          type: array
+          items:
+            $ref: '#/components/schemas/HostIdWithAnsibleHost'
       required:
       - recipient
       - org_id
@@ -341,7 +343,7 @@ components:
       - sat_org_id
       - systems
       - status
-      - ansible_host
+      - systems_info
 
 
     HighLevelRecipientStatus:
@@ -354,6 +356,18 @@ components:
       type: string
       minLength: 1
 
+    HostIdWithAnsibleHost:
+      description: An object containing the host id and the ansible host name
+      type: object
+      properties:
+        host_id:
+          $ref: '#/components/schemas/HostId'
+        ansible_host:
+          $ref: '#/components/schemas/AnsibleHost'
+      required:
+      - host_id
+      - ansible_host
+
     SatelliteId:
       description: Identifier of the Satellite instance in the uuid v4/v5 format
       type: string