Adding missing fields

davidjumani · davidjumani · commit 71615914a5d8 · 2020-06-23T16:05:23.000+05:30
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -326,6 +326,7 @@ public class ApiConstants {
     public static final String TARGET_IQN = "targetiqn";
     public static final String TEMPLATE_FILTER = "templatefilter";
     public static final String TEMPLATE_ID = "templateid";
+    public static final String TEMPLATE_NAME = "templatename";
     public static final String ISO_ID = "isoid";
     public static final String TIMEOUT = "timeout";
     public static final String TIMEZONE = "timezone";
@@ -566,8 +567,10 @@ public class ApiConstants {
     public static final String END_POINT = "endpoint";
     public static final String REGION_ID = "regionid";
     public static final String VPC_OFF_ID = "vpcofferingid";
+    public static final String VPC_OFF_NAME = "vpcofferingname";
     public static final String NETWORK = "network";
     public static final String VPC_ID = "vpcid";
+    public static final String VPC_NAME = "vpcname";
     public static final String GATEWAY_ID = "gatewayid";
     public static final String CAN_USE_FOR_DEPLOY = "canusefordeploy";
     public static final String RESOURCE_IDS = "resourceids";
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java
@@ -77,6 +77,10 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
     @Param(description = "the Pod ID for the router")
     private String podId;
 
+    @SerializedName(ApiConstants.POD_NAME)
+    @Param(description = "the Pod name for the router")
+    private String podName;
+
     @SerializedName(ApiConstants.HOST_ID)
     @Param(description = "the host ID for the router")
     private String hostId;
@@ -145,6 +149,10 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
     @Param(description = "the template ID for the router")
     private String templateId;
 
+    @SerializedName(ApiConstants.TEMPLATE_NAME)
+    @Param(description = "the template name for the router")
+    private String templateName;
+
     @SerializedName(ApiConstants.CREATED)
     @Param(description = "the date and time the router was created")
     private Date created;
@@ -266,6 +274,10 @@ public void setPodId(String podId) {
         this.podId = podId;
     }
 
+    public void setPodName(String podName) {
+        this.podName = podName;
+    }
+
     public void setHostId(String hostId) {
         this.hostId = hostId;
     }
@@ -310,6 +322,10 @@ public void setTemplateId(String templateId) {
         this.templateId = templateId;
     }
 
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
     public void setCreated(Date created) {
         this.created = created;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
@@ -136,8 +136,13 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
     private String purpose;
 
     @SerializedName(ApiConstants.VPC_ID)
-    @Param(description = "VPC the ip belongs to")
+    @Param(description = "VPC id the ip belongs to")
     private String vpcId;
+
+    @SerializedName(ApiConstants.VPC_NAME)
+    @Param(description = "VPC name the ip belongs to")
+    private String vpcName;
+
     @SerializedName(ApiConstants.TAGS)
     @Param(description = "the list of resource tags associated with ip address", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
@@ -273,6 +278,10 @@ public void setVpcId(String vpcId) {
         this.vpcId = vpcId;
     }
 
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
@@ -58,9 +58,13 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     private String broadcastUri;
 
     @SerializedName(ApiConstants.VPC_ID)
-    @Param(description = "VPC the private gateaway belongs to")
+    @Param(description = "VPC id the private gateway belongs to")
     private String vpcId;
 
+    @SerializedName(ApiConstants.VPC_NAME)
+    @Param(description = "VPC name the private gateway belongs to")
+    private String vpcName;
+
     @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID)
     @Param(description = "the physical network id")
     private String physicalNetworkId;
@@ -130,6 +134,10 @@ public void setVpcId(String vpcId) {
         this.vpcId = vpcId;
     }
 
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
     public void setAddress(String address) {
         this.address = address;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
@@ -42,6 +42,10 @@ public class Site2SiteVpnGatewayResponse extends BaseResponse implements Control
     @Param(description = "the vpc id of this gateway")
     private String vpcId;
 
+    @SerializedName(ApiConstants.VPC_NAME)
+    @Param(description = "the vpc name of this gateway")
+    private String vpcName;
+
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "the owner")
     private String accountName;
@@ -82,6 +86,10 @@ public void setVpcId(String vpcId) {
         this.vpcId = vpcId;
     }
 
+    public void setVpcName(String vpcName) {
+        this.vpcName = vpcName;
+    }
+
     public void setRemoved(Date removed) {
         this.removed = removed;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -290,6 +290,10 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "OS type id of the vm", since = "4.4")
     private String osTypeId;
 
+    @SerializedName(ApiConstants.OS_DISPLAY_NAME)
+    @Param(description = "OS name of the vm", since = "4.13.2")
+    private String osDisplayName;
+
     public UserVmResponse() {
         securityGroupList = new LinkedHashSet<SecurityGroupResponse>();
         nics = new LinkedHashSet<NicResponse>();
@@ -822,6 +826,10 @@ public void setOsTypeId(String osTypeId) {
         this.osTypeId = osTypeId;
     }
 
+    public void setOsDisplayName(String osDisplayName) {
+        this.osDisplayName = osDisplayName;
+    }
+
     public Set<Long> getTagIds() {
         return tagIds;
     }
@@ -849,4 +857,8 @@ public void setDynamicallyScalable(Boolean dynamicallyScalable) {
     public String getOsTypeId() {
         return osTypeId;
     }
+
+    public String getOsDisplayName() {
+        return osDisplayName;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java
@@ -67,6 +67,10 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
     @Param(description = "vpc offering id the VPC is created from")
     private String vpcOfferingId;
 
+    @SerializedName(ApiConstants.VPC_OFF_NAME)
+    @Param(description = "vpc offering name the VPC is created from")
+    private String vpcOfferingName;
+
     @SerializedName(ApiConstants.CREATED)
     @Param(description = "the date this VPC was created")
     private Date created;
@@ -184,6 +188,10 @@ public void setVpcOfferingId(final String vpcOfferingId) {
         this.vpcOfferingId = vpcOfferingId;
     }
 
+    public void setVpcOfferingName(final String vpcOfferingName) {
+        this.vpcOfferingName = vpcOfferingName;
+    }
+
     public List<NetworkResponse> getNetworks() {
         return networks;
     }
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -860,6 +860,7 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip
             Vpc vpc = ApiDBUtils.findVpcById(ipAddr.getVpcId());
             if (vpc != null) {
                 ipResponse.setVpcId(vpc.getUuid());
+                ipResponse.setVpcName(vpc.getName());
             }
         }
 
@@ -2884,6 +2885,7 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) {
         VpcOffering voff = ApiDBUtils.findVpcOfferingById(vpc.getVpcOfferingId());
         if (voff != null) {
             response.setVpcOfferingId(voff.getUuid());
+            response.setVpcOfferingName(voff.getName());
         }
         response.setCidr(vpc.getCidr());
         response.setRestartRequired(vpc.isRestartRequired());
@@ -2956,6 +2958,7 @@ public PrivateGatewayResponse createPrivateGatewayResponse(PrivateGateway result
         if (result.getVpcId() != null) {
             Vpc vpc = ApiDBUtils.findVpcById(result.getVpcId());
             response.setVpcId(vpc.getUuid());
+            response.setVpcName(vpc.getName());
         }
 
         DataCenter zone = ApiDBUtils.findZoneById(result.getZoneId());
@@ -3146,6 +3149,7 @@ public Site2SiteVpnGatewayResponse createSite2SiteVpnGatewayResponse(Site2SiteVp
         Vpc vpc = ApiDBUtils.findVpcById(result.getVpcId());
         if (vpc != null) {
             response.setVpcId(vpc.getUuid());
+            response.setVpcName(vpc.getName());
         }
         response.setRemoved(result.getRemoved());
         response.setForDisplay(result.isDisplay());
diff --git a/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
@@ -74,6 +74,7 @@ public DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A
         routerResponse.setZoneId(router.getDataCenterUuid());
         routerResponse.setName(router.getName());
         routerResponse.setTemplateId(router.getTemplateUuid());
+        // routerResponse.setTemplateName(router.getTemplateId());
         routerResponse.setCreated(router.getCreated());
         routerResponse.setState(router.getState());
         routerResponse.setIsRedundantRouter(router.isRedundantRouter());
diff --git a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -48,6 +48,7 @@
 import com.cloud.api.query.vo.UserVmJoinVO;
 import com.cloud.gpu.GPU;
 import com.cloud.service.ServiceOfferingDetailsVO;
+import com.cloud.storage.dao.GuestOSDao;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.User;
@@ -77,6 +78,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
     private UserDao _userDao;
     @Inject
     private NicExtraDhcpOptionDao _nicExtraDhcpOptionDao;
+    @Inject
+    private GuestOSDao _guestOsDao;
+
 
     private final SearchBuilder<UserVmJoinVO> VmDetailSearch;
     private final SearchBuilder<UserVmJoinVO> activeVmByIsoSearch;
@@ -201,6 +205,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
         userVmResponse.setPublicIp(userVm.getPublicIpAddress());
         userVmResponse.setKeyPairName(userVm.getKeypairName());
         userVmResponse.setOsTypeId(userVm.getGuestOsUuid());
+        userVmResponse.setOsDisplayName(_guestOsDao.findById(userVm.getGuestOsId()).getDisplayName());
 
         if (details.contains(VMDetails.all) || details.contains(VMDetails.stats)) {
             // stats calculation

Original file line number	Diff line number	Diff line change
`@@ -860,6 +860,7 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip`
`860`	`860`	`Vpc vpc = ApiDBUtils.findVpcById(ipAddr.getVpcId());`
`861`	`861`	`if (vpc != null) {`
`862`	`862`	`ipResponse.setVpcId(vpc.getUuid());`
	`863`	`+ ipResponse.setVpcName(vpc.getName());`
`863`	`864`	`}`
`864`	`865`	`}`
`865`	`866`
`@@ -2884,6 +2885,7 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) {`
`2884`	`2885`	`VpcOffering voff = ApiDBUtils.findVpcOfferingById(vpc.getVpcOfferingId());`
`2885`	`2886`	`if (voff != null) {`
`2886`	`2887`	`response.setVpcOfferingId(voff.getUuid());`
	`2888`	`+ response.setVpcOfferingName(voff.getName());`
`2887`	`2889`	`}`
`2888`	`2890`	`response.setCidr(vpc.getCidr());`
`2889`	`2891`	`response.setRestartRequired(vpc.isRestartRequired());`
`@@ -2956,6 +2958,7 @@ public PrivateGatewayResponse createPrivateGatewayResponse(PrivateGateway result`
`2956`	`2958`	`if (result.getVpcId() != null) {`
`2957`	`2959`	`Vpc vpc = ApiDBUtils.findVpcById(result.getVpcId());`
`2958`	`2960`	`response.setVpcId(vpc.getUuid());`
	`2961`	`+ response.setVpcName(vpc.getName());`
`2959`	`2962`	`}`
`2960`	`2963`
`2961`	`2964`	`DataCenter zone = ApiDBUtils.findZoneById(result.getZoneId());`
`@@ -3146,6 +3149,7 @@ public Site2SiteVpnGatewayResponse createSite2SiteVpnGatewayResponse(Site2SiteVp`
`3146`	`3149`	`Vpc vpc = ApiDBUtils.findVpcById(result.getVpcId());`
`3147`	`3150`	`if (vpc != null) {`
`3148`	`3151`	`response.setVpcId(vpc.getUuid());`
	`3152`	`+ response.setVpcName(vpc.getName());`
`3149`	`3153`	`}`
`3150`	`3154`	`response.setRemoved(result.getRemoved());`
`3151`	`3155`	`response.setForDisplay(result.isDisplay());`