Adding since for params

Author: davidjumani

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

@@ -78,7 +78,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
     private String podId;
 
     @SerializedName(ApiConstants.POD_NAME)
-    @Param(description = "the Pod name for the router")
+    @Param(description = "the Pod name for the router", since = "4.13.2")
     private String podName;
 
     @SerializedName(ApiConstants.HOST_ID)
@@ -150,7 +150,7 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
     private String templateId;
 
     @SerializedName(ApiConstants.TEMPLATE_NAME)
-    @Param(description = "the template name for the router")
+    @Param(description = "the template name for the router", since = "4.13.2")
     private String templateName;
 
     @SerializedName(ApiConstants.CREATED)

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

@@ -140,7 +140,7 @@ public class IPAddressResponse extends BaseResponse implements ControlledEntityR
     private String vpcId;
 
     @SerializedName(ApiConstants.VPC_NAME)
-    @Param(description = "VPC name the ip belongs to")
+    @Param(description = "VPC name the ip belongs to", since = "4.13.2")
     private String vpcName;
 
     @SerializedName(ApiConstants.TAGS)

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

@@ -62,7 +62,7 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
     private String vpcId;
 
     @SerializedName(ApiConstants.VPC_NAME)
-    @Param(description = "VPC name the private gateway belongs to")
+    @Param(description = "VPC name the private gateway belongs to", since = "4.13.2")
     private String vpcName;
 
     @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID)

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

@@ -43,7 +43,7 @@ public class Site2SiteVpnGatewayResponse extends BaseResponse implements Control
     private String vpcId;
 
     @SerializedName(ApiConstants.VPC_NAME)
-    @Param(description = "the vpc name of this gateway")
+    @Param(description = "the vpc name of this gateway", since = "4.13.2")
     private String vpcName;
 
     @SerializedName(ApiConstants.ACCOUNT)

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

@@ -79,7 +79,7 @@ public class SystemVmResponse extends BaseResponse {
     private String podId;
 
     @SerializedName("podname")
-    @Param(description = "the Pod name for the system VM")
+    @Param(description = "the Pod name for the system VM", since = "4.13.2")
     private String podName;
 
     @SerializedName("hostid")
@@ -135,7 +135,7 @@ public class SystemVmResponse extends BaseResponse {
     private String templateId;
 
     @SerializedName("templatename")
-    @Param(description = "the template name for the system VM")
+    @Param(description = "the template name for the system VM", since = "4.13.2")
     private String templateName;
 
     @SerializedName("created")

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

@@ -68,7 +68,7 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
     private String vpcOfferingId;
 
     @SerializedName(ApiConstants.VPC_OFF_NAME)
-    @Param(description = "vpc offering name the VPC is created from")
+    @Param(description = "vpc offering name the VPC is created from", since = "4.13.2")
     private String vpcOfferingName;
 
     @SerializedName(ApiConstants.CREATED)

server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java

@@ -33,9 +33,11 @@
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.ApiResponseHelper;
 import com.cloud.api.query.vo.DomainRouterJoinVO;
+import com.cloud.dc.HostPodVO;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.router.VirtualRouter.Role;
+import com.cloud.storage.VMTemplateVO;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.utils.db.GenericDaoBase;
@@ -47,7 +49,7 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO,
     public static final Logger s_logger = Logger.getLogger(DomainRouterJoinDaoImpl.class);
 
     @Inject
-    private ConfigurationDao  _configDao;
+    private ConfigurationDao _configDao;
     @Inject
     public AccountManager _accountMgr;
 
@@ -75,7 +77,10 @@ public DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A
         routerResponse.setZoneId(router.getDataCenterUuid());
         routerResponse.setName(router.getName());
         routerResponse.setTemplateId(router.getTemplateUuid());
-        routerResponse.setTemplateName(ApiDBUtils.findTemplateById(router.getTemplateId()).getName());
+        VMTemplateVO template = ApiDBUtils.findTemplateById(router.getTemplateId());
+        if (template != null) {
+            routerResponse.setTemplateName(template.getName());
+        }
         routerResponse.setCreated(router.getCreated());
         routerResponse.setState(router.getState());
         routerResponse.setIsRedundantRouter(router.isRedundantRouter());
@@ -100,7 +105,10 @@ public DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO router, A
                 routerResponse.setHypervisor(router.getHypervisorType().toString());
             }
             routerResponse.setPodId(router.getPodUuid());
-            routerResponse.setPodName(ApiDBUtils.findPodById(router.getPodId()).getName());
+            HostPodVO pod = ApiDBUtils.findPodById(router.getPodId());
+            if (pod != null) {
+                routerResponse.setPodName(pod.getName());
+            }
             long nic_id = router.getNicId();
             if (nic_id > 0) {
                 TrafficType ty = router.getTrafficType();

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.GuestOS;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.User;
@@ -68,7 +69,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
     public static final Logger s_logger = Logger.getLogger(UserVmJoinDaoImpl.class);
 
     @Inject
-    private ConfigurationDao  _configDao;
+    private ConfigurationDao _configDao;
     @Inject
     public AccountManager _accountMgr;
     @Inject
@@ -201,7 +202,10 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
         userVmResponse.setPublicIp(userVm.getPublicIpAddress());
         userVmResponse.setKeyPairName(userVm.getKeypairName());
         userVmResponse.setOsTypeId(userVm.getGuestOsUuid());
-        userVmResponse.setOsDisplayName(ApiDBUtils.findGuestOSById(userVm.getGuestOsId()).getDisplayName());
+        GuestOS guestOS = ApiDBUtils.findGuestOSById(userVm.getGuestOsId());
+        if (guestOS != null) {
+            userVmResponse.setOsDisplayName(guestOS.getDisplayName());
+        }
 
         if (details.contains(VMDetails.all) || details.contains(VMDetails.stats)) {
             // stats calculation