From 7674df6c7a80fa4ace2a8195350c14f46914123c Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 3 Nov 2010 15:38:42 -0700 Subject: [PATCH] fixing the merge conflicts --- .../src/com/cloud/api/ApiResponseHelper.java | 3 +++ .../cloud/api/commands/ListZonesByCmd.java | 20 ------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index ad01ecea9c4..e47db72a1b5 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -771,6 +771,9 @@ public class ApiResponseHelper { zoneResponse.setGuestCidrAddress(dataCenter.getGuestNetworkCidr()); } + zoneResponse.setDomain(dataCenter.getDomain()); + zoneResponse.setDomainId(dataCenter.getDomainId()); + return zoneResponse; } diff --git a/server/src/com/cloud/api/commands/ListZonesByCmd.java b/server/src/com/cloud/api/commands/ListZonesByCmd.java index f524593d291..8894aa0d5bc 100644 --- a/server/src/com/cloud/api/commands/ListZonesByCmd.java +++ b/server/src/com/cloud/api/commands/ListZonesByCmd.java @@ -75,26 +75,6 @@ public class ListZonesByCmd extends BaseListCmd { List zoneResponses = new ArrayList(); 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); }