diff --git a/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java b/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java index c749d28782b..53ea5511f17 100644 --- a/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java +++ b/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java @@ -40,6 +40,10 @@ public class AutoScaleVmProfileResponse extends BaseResponse implements Controll @Param(description = "parameters other than zoneId/serviceOfferringId/templateId to be used while deploying a virtual machine") private String otherDeployParams; + @SerializedName(ApiConstants.CS_URL) + @Param(description = "the URL including port of the CloudStack Management Server example: http://server.cloud.com:8080") + private String csUrl; + @SerializedName(ApiConstants.ACCOUNT) @Param(description = "the account owning the instance group") private String accountName; @@ -110,6 +114,10 @@ public class AutoScaleVmProfileResponse extends BaseResponse implements Controll this.snmpPort = snmpPort; } + public void setCsUrl(String csUrl) { + this.csUrl = csUrl; + } + @Override public void setAccountName(String accountName) { this.accountName = accountName; diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 4b15d02d875..9c8769cb024 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -8,7 +8,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.api; @@ -369,7 +369,7 @@ public class ApiResponseHelper implements ResponseGenerator { accountResponse.setVmStopped(vmStopped); accountResponse.setVmRunning(vmRunning); accountResponse.setObjectName("account"); - + //get resource limits for projects Long projectLimit = ApiDBUtils.findCorrectResourceLimit(ResourceType.project, account.getId()); String projectLimitDisplay = (accountIsAdmin || projectLimit == -1) ? "Unlimited" : String.valueOf(projectLimit); @@ -378,7 +378,7 @@ public class ApiResponseHelper implements ResponseGenerator { accountResponse.setProjectLimit(projectLimitDisplay); accountResponse.setProjectTotal(projectTotal); accountResponse.setProjectAvailable(projectAvail); - + //get resource limits for networks Long networkLimit = ApiDBUtils.findCorrectResourceLimit(ResourceType.network, account.getId()); String networkLimitDisplay = (accountIsAdmin || networkLimit == -1) ? "Unlimited" : String.valueOf(networkLimit); @@ -387,7 +387,7 @@ public class ApiResponseHelper implements ResponseGenerator { accountResponse.setNetworkLimit(networkLimitDisplay); accountResponse.setNetworkTotal(networkTotal); accountResponse.setNetworkAvailable(networkAvail); - + // adding all the users for an account as part of the response obj List usersForAccount = ApiDBUtils.listUsersByAccount(account.getAccountId()); List userResponseList = new ArrayList(); @@ -432,7 +432,7 @@ public class ApiResponseHelper implements ResponseGenerator { domainResponse.setLevel(domain.getLevel()); domainResponse.setNetworkDomain(domain.getNetworkDomain()); domainResponse.setParentDomainId(domain.getParent()); - StringBuilder domainPath = new StringBuilder("ROOT"); + StringBuilder domainPath = new StringBuilder("ROOT"); (domainPath.append(domain.getPath())).deleteCharAt(domainPath.length() - 1); domainResponse.setPath(domainPath.toString()); if (domain.getParent() != null) { @@ -559,7 +559,7 @@ public class ApiResponseHelper implements ResponseGenerator { snapshotResponse.setName(snapshot.getName()); snapshotResponse.setIntervalType(ApiDBUtils.getSnapshotIntervalTypes(snapshot.getId())); snapshotResponse.setState(snapshot.getStatus()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Snapshot, snapshot.getId()); List tagResponses = new ArrayList(); @@ -568,7 +568,7 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } snapshotResponse.setTags(tagResponses); - + snapshotResponse.setObjectName("snapshot"); return snapshotResponse; } @@ -649,7 +649,7 @@ public class ApiResponseHelper implements ResponseGenerator { hostResponse.setMemoryTotal(host.getTotalMemory()); String hostTags = ApiDBUtils.getHostTags(host.getId()); hostResponse.setHostTags(hostTags); - + String haTag = ApiDBUtils.getHaTag(); if (haTag != null && !haTag.isEmpty() && hostTags != null && !hostTags.isEmpty()) { if (haTag.equalsIgnoreCase(hostTags)) { @@ -660,7 +660,7 @@ public class ApiResponseHelper implements ResponseGenerator { } else { hostResponse.setHaHost(false); } - + hostResponse.setHypervisorVersion(host.getHypervisorVersion()); String cpuAlloc = decimalFormat.format(((float) cpu / (float) (host.getCpus() * host.getSpeed())) * 100f) + "%"; @@ -827,7 +827,7 @@ public class ApiResponseHelper implements ResponseGenerator { ipResponse.setVlanId(ipAddr.getVlanId()); ipResponse.setVlanName(ApiDBUtils.findVlanById(ipAddr.getVlanId()).getVlanTag()); } - + if (ipAddr.getSystem()) { if (ipAddr.isOneToOneNat()) { ipResponse.setPurpose(IpAddress.Purpose.StaticNat.toString()); @@ -835,7 +835,7 @@ public class ApiResponseHelper implements ResponseGenerator { ipResponse.setPurpose(IpAddress.Purpose.Lb.toString()); } } - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.PublicIpAddress, ipAddr.getId()); List tagResponses = new ArrayList(); @@ -844,7 +844,7 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } ipResponse.setTags(tagResponses); - + ipResponse.setObjectName("ipaddress"); return ipResponse; } @@ -872,7 +872,7 @@ public class ApiResponseHelper implements ResponseGenerator { lbResponse.setState(stateToSet); populateOwner(lbResponse, loadBalancer); lbResponse.setZoneId(publicIp.getDataCenterId()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.UserVm, loadBalancer.getId()); List tagResponses = new ArrayList(); @@ -1083,7 +1083,7 @@ public class ApiResponseHelper implements ResponseGenerator { volResponse.setCreated(volumeHostRef.getCreated()); Account caller = UserContext.current().getCaller(); if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) - volResponse.setHypervisor(ApiDBUtils.getHypervisorTypeFromFormat(volumeHostRef.getFormat()).toString()); + volResponse.setHypervisor(ApiDBUtils.getHypervisorTypeFromFormat(volumeHostRef.getFormat()).toString()); if (volumeHostRef.getDownloadState() != Status.DOWNLOADED) { String volumeStatus = "Processing"; if (volumeHostRef.getDownloadState() == VMTemplateHostVO.Status.DOWNLOAD_IN_PROGRESS) { @@ -1107,9 +1107,9 @@ public class ApiResponseHelper implements ResponseGenerator { volResponse.setState("Uploaded"); } else { volResponse.setStatus("Successfully Installed"); - } + } } - + populateOwner(volResponse, volume); String storageType; @@ -1155,21 +1155,21 @@ public class ApiResponseHelper implements ResponseGenerator { // return hypervisor for ROOT and Resource domain only Account caller = UserContext.current().getCaller(); - if ((caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) && volume.getState() != Volume.State.UploadOp) { - volResponse.setHypervisor(ApiDBUtils.getVolumeHyperType(volume.getId()).toString()); + if ((caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) && volume.getState() != Volume.State.UploadOp) { + volResponse.setHypervisor(ApiDBUtils.getVolumeHyperType(volume.getId()).toString()); } volResponse.setAttached(volume.getAttached()); - volResponse.setDestroyed(volume.getState() == Volume.State.Destroy); + volResponse.setDestroyed(volume.getState() == Volume.State.Destroy); boolean isExtractable = true; if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk dont have any template dependence. VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId()); if (template != null) { // For ISO based volumes template = null and we allow extraction of all ISO based // volumes - isExtractable = template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM; + isExtractable = template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM; } } - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Volume, volume.getId()); List tagResponses = new ArrayList(); @@ -1178,7 +1178,7 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } volResponse.setTags(tagResponses); - + volResponse.setExtractable(isExtractable); volResponse.setObjectName("volume"); return volResponse; @@ -1313,7 +1313,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (vm != null) { response.setVirtualMachineId(vm.getId()); response.setVirtualMachineName(vm.getHostName()); - + if (vm.getDisplayName() != null) { response.setVirtualMachineDisplayName(vm.getDisplayName()); } else { @@ -1326,7 +1326,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (state.equals(FirewallRule.State.Revoke)) { stateToSet = "Deleting"; } - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.PortForwardingRule, fwRule.getId()); List tagResponses = new ArrayList(); @@ -1335,7 +1335,7 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } response.setTags(tagResponses); - + response.setState(stateToSet); response.setObjectName("portforwardingrule"); return response; @@ -1408,11 +1408,11 @@ public class ApiResponseHelper implements ResponseGenerator { } else { userVmResponse.setDisplayName(userVm.getHostName()); } - + if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN) { userVmResponse.setInstanceName(userVm.getInstanceName()); } - + if (userVm.getPassword() != null) { userVmResponse.setPassword(userVm.getPassword()); } @@ -1470,7 +1470,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (userVm.getHypervisorType() != null) { userVmResponse.setHypervisor(userVm.getHypervisorType().toString()); } - + if (details.contains(VMDetails.all) || details.contains(VMDetails.tmpl)) { // Template Info VMTemplateVO template = templates.get(userVm.getTemplateId()); @@ -1610,7 +1610,7 @@ public class ApiResponseHelper implements ResponseGenerator { } userVmResponse.setNics(nicResponses); } - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.UserVm, userVm.getId()); List tagResponses = new ArrayList(); @@ -1619,7 +1619,7 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } userVmResponse.setTags(tagResponses); - + IpAddress ip = ApiDBUtils.findIpByAssociatedVmId(userVm.getId()); if (ip != null) { userVmResponse.setPublicIpId(ip.getId()); @@ -1897,7 +1897,7 @@ public class ApiResponseHelper implements ResponseGenerator { Account owner = ApiDBUtils.findAccountById(result.getAccountId()); populateAccount(response, owner.getId()); populateDomain(response, owner.getDomainId()); - + //set tag information List tags = null; if (result.getFormat() == ImageFormat.ISO) { @@ -1905,7 +1905,7 @@ public class ApiResponseHelper implements ResponseGenerator { } else { tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Template, result.getId()); } - + List tagResponses = new ArrayList(); for (ResourceTag tag : tags) { ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); @@ -2098,7 +2098,7 @@ public class ApiResponseHelper implements ResponseGenerator { templateResponse.setChecksum(template.getChecksum()); templateResponse.setTemplateTag(template.getTemplateTag()); - + //set tag information List tags = null; if (template.getFormat() == ImageFormat.ISO) { @@ -2144,7 +2144,7 @@ public class ApiResponseHelper implements ResponseGenerator { Account owner = ApiDBUtils.findAccountById(iso.getAccountId()); populateAccount(isoResponse, owner.getId()); populateDomain(isoResponse, owner.getDomainId()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.ISO, iso.getId()); List tagResponses = new ArrayList(); @@ -2301,10 +2301,10 @@ public class ApiResponseHelper implements ResponseGenerator { if (isoSize > 0) { isoResponse.setSize(isoSize); } - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.ISO, iso.getId()); - + List tagResponses = new ArrayList(); for (ResourceTag tag : tags) { ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); @@ -2321,7 +2321,7 @@ public class ApiResponseHelper implements ResponseGenerator { public ListResponse createSecurityGroupResponses( List networkGroups) { List groupResultObjs = SecurityGroupResultObject - .transposeNetworkGroups(networkGroups); + .transposeNetworkGroups(networkGroups); ListResponse response = new ListResponse(); List netGrpResponses = new ArrayList(); @@ -2334,7 +2334,7 @@ public class ApiResponseHelper implements ResponseGenerator { populateOwner(netGrpResponse, networkGroup); List securityGroupRules = networkGroup - .getSecurityGroupRules(); + .getSecurityGroupRules(); if ((securityGroupRules != null) && !securityGroupRules.isEmpty()) { List ingressRulesResponse = new ArrayList(); List egressRulesResponse = new ArrayList(); @@ -2377,15 +2377,15 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } netGrpResponse.setTags(tagResponses); - + netGrpResponse - .setSecurityGroupIngressRules(ingressRulesResponse); + .setSecurityGroupIngressRules(ingressRulesResponse); netGrpResponse.setSecurityGroupEgressRules(egressRulesResponse); } netGrpResponse.setObjectName("securitygroup"); netGrpResponses.add(netGrpResponse); } - + response.setResponses(netGrpResponses); return response; } @@ -2449,11 +2449,11 @@ public class ApiResponseHelper implements ResponseGenerator { boolean savedValue = SerializationContext.current().getUuidTranslation(); SerializationContext.current().setUuidTranslation(false); - + Object resultObject = ApiSerializerHelper.fromSerializedString(job.getResult()); jobResponse.setJobResult((ResponseObject) resultObject); SerializationContext.current().setUuidTranslation(savedValue); - + if (resultObject != null) { Class clz = resultObject.getClass(); if (clz.isPrimitive() || clz.getSuperclass() == Number.class || clz == String.class || clz == Date.class) { @@ -2574,17 +2574,17 @@ public class ApiResponseHelper implements ResponseGenerator { } if (capacityType == Capacity.CAPACITY_TYPE_CPU || capacityType == Capacity.CAPACITY_TYPE_MEMORY) { // Reserved - // Capacity - // accounts -// for + // Capacity + // accounts + // for // stopped -// vms + // vms // that -// have been + // have been // stopped -// within + // within // an -// interval + // interval usedCapacity += capacity.getReservedCapacity(); } @@ -2613,17 +2613,17 @@ public class ApiResponseHelper implements ResponseGenerator { } if (capacityType == Capacity.CAPACITY_TYPE_CPU || capacityType == Capacity.CAPACITY_TYPE_MEMORY) { // Reserved - // Capacity - // accounts - // for - // stopped - // vms -// that + // Capacity + // accounts + // for + // stopped + // vms + // that // have -// been + // been // stopped // within -// an + // an // interval usedCapacity += capacity.getReservedCapacity(); } @@ -2655,7 +2655,7 @@ public class ApiResponseHelper implements ResponseGenerator { @Override public List createCapacityResponse(List result, DecimalFormat format) { List capacityResponses = new ArrayList(); - + for (Capacity summedCapacity : result) { CapacityResponse capacityResponse = new CapacityResponse(); capacityResponse.setCapacityTotal(summedCapacity.getTotalCapacity()); @@ -2912,7 +2912,7 @@ public class ApiResponseHelper implements ResponseGenerator { serviceResponses.add(svcRsp); } response.setForVpc(ApiDBUtils.isOfferingForVpc(offering)); - + response.setServices(serviceResponses); response.setObjectName("networkoffering"); return response; @@ -3033,7 +3033,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setSpecifyIpRanges(network.getSpecifyIpRanges()); response.setCanUseForDeploy(ApiDBUtils.canUseForDeploy(network)); response.setVpcId(network.getVpcId()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Network, network.getId()); List tagResponses = new ArrayList(); @@ -3070,7 +3070,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setDomain(domain.getName()); response.setOwner(ApiDBUtils.getProjectOwner(project.getId()).getAccountName()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Project, project.getId()); List tagResponses = new ArrayList(); @@ -3113,7 +3113,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setIcmpCode(fwRule.getIcmpCode()); response.setIcmpType(fwRule.getIcmpType()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.FirewallRule, fwRule.getId()); List tagResponses = new ArrayList(); @@ -3127,7 +3127,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setObjectName("firewallrule"); return response; } - + @Override public NetworkACLResponse createNetworkACLResponse(FirewallRule networkACL) { NetworkACLResponse response = new NetworkACLResponse(); @@ -3157,7 +3157,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setIcmpType(networkACL.getIcmpType()); response.setState(stateToSet); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.NetworkACL, networkACL.getId()); List tagResponses = new ArrayList(); @@ -3166,7 +3166,7 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } response.setTags(tagResponses); - + response.setObjectName("networkacl"); return response; } @@ -3187,7 +3187,7 @@ public class ApiResponseHelper implements ResponseGenerator { userVmData.setDisplayName(userVm.getHostName()); } userVmData.setInstanceName(userVm.getInstanceName()); - + userVmData.setDomainId(userVm.getDomainId()); if (userVm.getHypervisorType() != null) { @@ -3287,7 +3287,7 @@ public class ApiResponseHelper implements ResponseGenerator { userVmResponse.setNics(new ArrayList(nicResponses)); userVmResponse.setPublicIpId(userVmData.getPublicIpId()); userVmResponse.setPublicIp(userVmData.getPublicIp()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.UserVm, userVmData.getId()); List tagResponses = new ArrayList(); @@ -3622,20 +3622,20 @@ public class ApiResponseHelper implements ResponseGenerator { response.setObjectName("storagenetworkiprange"); return response; } - + @Override public Long getIdentiyId(String tableName, String token) { return ApiDispatcher.getIdentiyId(tableName, token); } - + @Override public ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag, boolean keyValueOnly) { ResourceTagResponse response = new ResourceTagResponse(); response.setKey(resourceTag.getKey()); response.setValue(resourceTag.getValue()); - + if (!keyValueOnly) { - response.setResourceType(resourceTag.getResourceType().toString()); + response.setResourceType(resourceTag.getResourceType().toString()); response.setId(ApiDBUtils.getUuid(String.valueOf(resourceTag.getResourceId()),resourceTag.getResourceType())); Long accountId = resourceTag.getAccountId(); Long domainId = resourceTag.getDomainId(); @@ -3651,20 +3651,20 @@ public class ApiResponseHelper implements ResponseGenerator { response.setAccountName(account.getAccountName()); } } - + if (domainId != null) { response.setDomainId(domainId); response.setDomainName(ApiDBUtils.findDomainById(domainId).getName()); } - + response.setCustomer(resourceTag.getCustomer()); } - + response.setObjectName("tag"); - + return response; } - + @Override public VpcOfferingResponse createVpcOfferingResponse(VpcOffering offering) { VpcOfferingResponse response = new VpcOfferingResponse(); @@ -3699,7 +3699,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setObjectName("vpcoffering"); return response; } - + @Override public VpcResponse createVpcResponse(Vpc vpc) { VpcResponse response = new VpcResponse(); @@ -3733,21 +3733,21 @@ public class ApiResponseHelper implements ResponseGenerator { serviceResponses.add(svcRsp); } - + List networkResponses = new ArrayList(); List networks = ApiDBUtils.listVpcNetworks(vpc.getId()); for (Network network : networks) { NetworkResponse ntwkRsp = createNetworkResponse(network); networkResponses.add(ntwkRsp); } - + DataCenter zone = ApiDBUtils.findZoneById(vpc.getZoneId()); response.setZoneId(vpc.getZoneId()); response.setZoneName(zone.getName()); - + response.setNetworks(networkResponses); response.setServices(serviceResponses); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Vpc, vpc.getId()); List tagResponses = new ArrayList(); @@ -3756,7 +3756,7 @@ public class ApiResponseHelper implements ResponseGenerator { tagResponses.add(tagResponse); } response.setTags(tagResponses); - + response.setObjectName("vpc"); return response; } @@ -3774,11 +3774,11 @@ public class ApiResponseHelper implements ResponseGenerator { response.setZoneName(zone.getName()); response.setAddress(result.getIp4Address()); response.setPhysicalNetworkId(result.getPhysicalNetworkId()); - + populateAccount(response, result.getAccountId()); populateDomain(response, result.getDomainId()); response.setState(result.getState().toString()); - + response.setObjectName("privategateway"); return response; } @@ -3795,6 +3795,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setSnmpPort(profile.getSnmpPort()); response.setDestroyVmGraceperiod(profile.getDestroyVmGraceperiod()); response.setAutoscaleUserId(profile.getAutoScaleUserId()); + response.setCsUrl(profile.getCsUrl()); // Populates the account information in the response populateOwner(response, profile); return response; @@ -3813,7 +3814,7 @@ public class ApiResponseHelper implements ResponseGenerator { conditions.add(createConditionResponse(vo)); } response.setConditions(conditions); - + // Populates the account information in the response populateOwner(response, policy); @@ -3849,14 +3850,14 @@ public class ApiResponseHelper implements ResponseGenerator { } return response; } - + @Override public StaticRouteResponse createStaticRouteResponse(StaticRoute result) { StaticRouteResponse response = new StaticRouteResponse(); response.setId(result.getId()); response.setVpcId(result.getVpcId()); response.setCidr(result.getCidr()); - + StaticRoute.State state = result.getState(); String stateToSet = state.toString(); if (state.equals(FirewallRule.State.Revoke)) { @@ -3865,7 +3866,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setState(stateToSet); populateAccount(response, result.getAccountId()); populateDomain(response, result.getDomainId()); - + //set tag information List tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.StaticRoute, result.getId()); List tagResponses = new ArrayList(); @@ -3877,7 +3878,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setObjectName("staticroute"); return response; } - + @Override public Site2SiteVpnGatewayResponse createSite2SiteVpnGatewayResponse(Site2SiteVpnGateway result) { Site2SiteVpnGatewayResponse response = new Site2SiteVpnGatewayResponse(); @@ -3886,10 +3887,10 @@ public class ApiResponseHelper implements ResponseGenerator { response.setVpcId(result.getVpcId()); response.setRemoved(result.getRemoved()); response.setObjectName("vpngateway"); - + populateAccount(response, result.getAccountId()); populateDomain(response, result.getDomainId()); - + return response; } @@ -3902,10 +3903,10 @@ public class ApiResponseHelper implements ResponseGenerator { response.setIpsecPsk(result.getIpsecPsk()); response.setRemoved(result.getRemoved()); response.setObjectName("vpncustomergateway"); - + populateAccount(response, result.getAccountId()); populateDomain(response, result.getDomainId()); - + return response; } @@ -3913,32 +3914,32 @@ public class ApiResponseHelper implements ResponseGenerator { public Site2SiteVpnConnectionResponse createSite2SiteVpnConnectionResponse(Site2SiteVpnConnection result) { Site2SiteVpnConnectionResponse response = new Site2SiteVpnConnectionResponse(); response.setId(result.getId()); - - response.setVpnGatewayId(result.getVpnGatewayId()); + + response.setVpnGatewayId(result.getVpnGatewayId()); Long vpnGatewayId = result.getVpnGatewayId(); if(vpnGatewayId != null) { - Site2SiteVpnGatewayVO vpnGateway = ApiDBUtils.findVpnGatewayById(vpnGatewayId); - - long ipId = vpnGateway.getAddrId(); - IPAddressVO ipObj = ApiDBUtils.findIpAddressById(ipId); - response.setIp(ipObj.getAddress().addr()); + Site2SiteVpnGatewayVO vpnGateway = ApiDBUtils.findVpnGatewayById(vpnGatewayId); + + long ipId = vpnGateway.getAddrId(); + IPAddressVO ipObj = ApiDBUtils.findIpAddressById(ipId); + response.setIp(ipObj.getAddress().addr()); } - - response.setCustomerGatewayId(result.getCustomerGatewayId()); + + response.setCustomerGatewayId(result.getCustomerGatewayId()); Long customerGatewayId = result.getCustomerGatewayId(); if(customerGatewayId != null) { - Site2SiteCustomerGatewayVO customerGateway = ApiDBUtils.findCustomerGatewayById(customerGatewayId); - response.setGatewayIp(customerGateway.getGatewayIp()); - response.setGuestCidrList(customerGateway.getGuestCidrList()); - response.setIpsecPsk(customerGateway.getIpsecPsk()); - response.setIkePolicy(customerGateway.getIkePolicy()); - response.setEspPolicy(customerGateway.getEspPolicy()); - response.setLifetime(customerGateway.getLifetime()); - } - + Site2SiteCustomerGatewayVO customerGateway = ApiDBUtils.findCustomerGatewayById(customerGatewayId); + response.setGatewayIp(customerGateway.getGatewayIp()); + response.setGuestCidrList(customerGateway.getGuestCidrList()); + response.setIpsecPsk(customerGateway.getIpsecPsk()); + response.setIkePolicy(customerGateway.getIkePolicy()); + response.setEspPolicy(customerGateway.getEspPolicy()); + response.setLifetime(customerGateway.getLifetime()); + } + populateAccount(response, result.getAccountId()); populateDomain(response, result.getDomainId()); - + response.setState(result.getState().toString()); response.setCreated(result.getCreated()); response.setRemoved(result.getRemoved());