rename instanceid parameter

Author: bernardodemarco

api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/ListConsoleSessionsCmd.java

@@ -76,8 +76,8 @@ public class ListConsoleSessionsCmd extends BaseListCmd {
             ApiConstants.PARAMETER_DESCRIPTION_END_DATE_POSSIBLE_FORMATS)
     private Date endDate;
 
-    @Parameter(name = ApiConstants.INSTANCE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, description = "The ID of the instance.")
-    private Long instanceId;
+    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, description = "The ID of the virtual machine.")
+    private Long vmId;
 
     @Parameter(name = ApiConstants.CONSOLE_ENDPOINT_CREATOR_ADDRESS, type = CommandType.STRING, description = "IP address of the creator of the console endpoint.")
     private String consoleEndpointCreatorAddress;
@@ -126,8 +126,8 @@ public Date getEndDate() {
         return endDate;
     }
 
-    public Long getInstanceId() {
-        return instanceId;
+    public Long getVmId() {
+        return vmId;
     }
 
     public String getConsoleEndpointCreatorAddress() {

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

@@ -66,13 +66,13 @@ public class ConsoleSessionResponse extends BaseResponse {
     @Param(description = "ID of the user that created the console endpoint.")
     private String userId;
 
-    @SerializedName(ApiConstants.INSTANCE_ID)
-    @Param(description = "ID of the instance.")
-    private String instanceId;
+    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
+    @Param(description = "ID of the virtual machine.")
+    private String vmId;
 
-    @SerializedName(ApiConstants.INSTANCE_NAME)
-    @Param(description = "Name of the instance.")
-    private String instanceName;
+    @SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)
+    @Param(description = "Name of the virtual machine.")
+    private String vmName;
 
     @SerializedName(ApiConstants.HOST_ID)
     @Param(description = "ID of the host.")
@@ -134,12 +134,12 @@ public void setUserId(String userId) {
         this.userId = userId;
     }
 
-    public void setInstanceId(String instanceId) {
-        this.instanceId = instanceId;
+    public void setVmId(String vmId) {
+        this.vmId = vmId;
     }
 
-    public void setInstanceName(String instanceName) {
-        this.instanceName = instanceName;
+    public void setVmName(String vmName) {
+        this.vmName = vmName;
     }
 
     public void setHostId(String hostId) {
@@ -202,12 +202,12 @@ public String getUserId() {
         return userId;
     }
 
-    public String getInstanceId() {
-        return instanceId;
+    public String getVmId() {
+        return vmId;
     }
 
-    public String getInstanceName() {
-        return instanceName;
+    public String getVmName() {
+        return vmName;
     }
 
     public String getHostId() {

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

@@ -5654,8 +5654,8 @@ private void populateHostFieldsOnConsoleSessionResponse(ConsoleSession consoleSe
     private void populateInstanceFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
         VMInstanceVO instance = ApiDBUtils.findVMInstanceById(consoleSession.getInstanceId());
         if (instance != null) {
-            consoleSessionResponse.setInstanceId(instance.getUuid());
-            consoleSessionResponse.setInstanceName(instance.getInstanceName());
+            consoleSessionResponse.setVmId(instance.getUuid());
+            consoleSessionResponse.setVmName(instance.getInstanceName());
         }
     }
 

server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java

@@ -231,7 +231,7 @@ protected Pair<List<ConsoleSessionVO>, Integer> listConsoleSessionsInternal(List
         List<Long> domainIds = isRecursive ? domainDao.getDomainAndChildrenIds(domainId) : List.of(domainId);
 
         return consoleSessionDao.listConsoleSessions(cmd.getId(), domainIds, accountId, userId,
-                cmd.getHostId(), cmd.getStartDate(), cmd.getEndDate(), cmd.getInstanceId(),
+                cmd.getHostId(), cmd.getStartDate(), cmd.getEndDate(), cmd.getVmId(),
                 cmd.getConsoleEndpointCreatorAddress(), cmd.getClientAddress(), cmd.isActiveOnly(),
                 cmd.getAcquired(), cmd.getPageSizeVal(), cmd.getStartIndex());
     }

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

@@ -669,8 +669,8 @@ private ConsoleSessionResponse getExpectedConsoleSessionResponseForTests(boolean
             expected.setAccountId("accountUuid");
             expected.setHostName("host");
             expected.setHostId("hostUuid");
-            expected.setInstanceId("vmUuid");
-            expected.setInstanceName("vmName");
+            expected.setVmId("vmUuid");
+            expected.setVmName("vmName");
         }
 
         return expected;
@@ -735,8 +735,8 @@ public void createConsoleSessionResponseTestShouldReturnFullResponse() {
             Mockito.when(hostVOMock.getName()).thenReturn(expected.getHostName());
 
             apiDBUtilsStaticMock.when(() -> ApiDBUtils.findVMInstanceById(2L)).thenReturn(vmInstanceVOMock);
-            Mockito.when(vmInstanceVOMock.getUuid()).thenReturn(expected.getInstanceId());
-            Mockito.when(vmInstanceVOMock.getInstanceName()).thenReturn(expected.getInstanceName());
+            Mockito.when(vmInstanceVOMock.getUuid()).thenReturn(expected.getVmId());
+            Mockito.when(vmInstanceVOMock.getInstanceName()).thenReturn(expected.getVmName());
 
             ConsoleSessionResponse response = apiResponseHelper.createConsoleSessionResponse(consoleSessionMock, ResponseObject.ResponseView.Full);
 
@@ -755,8 +755,8 @@ public void createConsoleSessionResponseTestShouldReturnFullResponse() {
             Assert.assertEquals(expected.getAccountId(), response.getAccountId());
             Assert.assertEquals(expected.getHostId(), response.getHostId());
             Assert.assertEquals(expected.getHostName(), response.getHostName());
-            Assert.assertEquals(expected.getInstanceId(), response.getInstanceId());
-            Assert.assertEquals(expected.getInstanceName(), response.getInstanceName());
+            Assert.assertEquals(expected.getVmId(), response.getVmId());
+            Assert.assertEquals(expected.getVmName(), response.getVmName());
         }
     }
 }