add instancename to the APIs response

Author: bernardodemarco

api/src/main/java/org/apache/cloudstack/api/response/ConsoleSessionResponse.java

@@ -70,6 +70,10 @@ public class ConsoleSessionResponse extends BaseResponse {
     @Param(description = "ID of the instance.")
     private String instanceId;
 
+    @SerializedName(ApiConstants.INSTANCE_NAME)
+    @Param(description = "Name of the instance.")
+    private String instanceName;
+
     @SerializedName(ApiConstants.HOST_ID)
     @Param(description = "ID of the host.")
     private String hostId;
@@ -134,6 +138,10 @@ public void setInstanceId(String instanceId) {
         this.instanceId = instanceId;
     }
 
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
     public void setHostId(String hostId) {
         this.hostId = hostId;
     }
@@ -198,6 +206,10 @@ public String getInstanceId() {
         return instanceId;
     }
 
+    public String getInstanceName() {
+        return instanceName;
+    }
+
     public String getHostId() {
         return hostId;
     }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5610,6 +5610,7 @@ private void populateInstanceFieldsOnConsoleSessionResponse(ConsoleSession conso
         VMInstanceVO instance = ApiDBUtils.findVMInstanceById(consoleSession.getInstanceId());
         if (instance != null) {
             consoleSessionResponse.setInstanceId(instance.getUuid());
+            consoleSessionResponse.setInstanceName(instance.getInstanceName());
         }
     }
 

server/src/test/java/com/cloud/api/ApiResponseHelperTest.java

@@ -670,6 +670,7 @@ private ConsoleSessionResponse getExpectedConsoleSessionResponseForTests(boolean
             expected.setHostName("host");
             expected.setHostId("hostUuid");
             expected.setInstanceId("vmUuid");
+            expected.setInstanceName("vmName");
         }
 
         return expected;
@@ -735,6 +736,7 @@ public void createConsoleSessionResponseTestShouldReturnFullResponse() {
 
             apiDBUtilsStaticMock.when(() -> ApiDBUtils.findVMInstanceById(2L)).thenReturn(vmInstanceVOMock);
             Mockito.when(vmInstanceVOMock.getUuid()).thenReturn(expected.getInstanceId());
+            Mockito.when(vmInstanceVOMock.getInstanceName()).thenReturn(expected.getInstanceName());
 
             ConsoleSessionResponse response = apiResponseHelper.createConsoleSessionResponse(consoleSessionMock, ResponseObject.ResponseView.Full);
 
@@ -754,6 +756,7 @@ public void createConsoleSessionResponseTestShouldReturnFullResponse() {
             Assert.assertEquals(expected.getHostId(), response.getHostId());
             Assert.assertEquals(expected.getHostName(), response.getHostName());
             Assert.assertEquals(expected.getInstanceId(), response.getInstanceId());
+            Assert.assertEquals(expected.getInstanceName(), response.getInstanceName());
         }
     }
 }