etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing the merge conflicts

This commit is contained in:
abhishek 2010-11-03 15:38:42 -07:00
parent 46497e3aad
commit 7674df6c7a
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -771,6 +771,9 @@ public class ApiResponseHelper {
zoneResponse.setGuestCidrAddress(dataCenter.getGuestNetworkCidr());
}
zoneResponse.setDomain(dataCenter.getDomain());
zoneResponse.setDomainId(dataCenter.getDomainId());
return zoneResponse;
}

20
server/src/com/cloud/api/commands/ListZonesByCmd.java
View File

@ -75,26 +75,6 @@ public class ListZonesByCmd extends BaseListCmd {
List<ZoneResponse> zoneResponses = new ArrayList<ZoneResponse>();
for (DataCenterVO dataCenter : dataCenters) {
ZoneResponse zoneResponse = ApiResponseHelper.createZoneResponse(dataCenter);
ZoneResponse zoneResponse = new ZoneResponse();
zoneResponse.setId(dataCenter.getId());
zoneResponse.setName(dataCenter.getName());
if ((dataCenter.getDescription() != null) && !dataCenter.getDescription().equalsIgnoreCase("null")) {
zoneResponse.setDescription(dataCenter.getDescription());
}
if ((account == null) || (account.getType() == Account.ACCOUNT_TYPE_ADMIN)) {
zoneResponse.setDns1(dataCenter.getDns1());
zoneResponse.setDns2(dataCenter.getDns2());
zoneResponse.setInternalDns1(dataCenter.getInternalDns1());
zoneResponse.setInternalDns2(dataCenter.getInternalDns2());
zoneResponse.setVlan(dataCenter.getVnet());
zoneResponse.setGuestCidrAddress(dataCenter.getGuestNetworkCidr());
}
zoneResponse.setDomain(dataCenter.getDomain());
zoneResponse.setDomainId(dataCenter.getDomainId());
zoneResponse.setResponseName("zone");
zoneResponses.add(zoneResponse);
}