From 982c5fffbfe7e0af37ee061f6ab4a4b76869ade4 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Tue, 4 Dec 2012 14:56:58 +0530 Subject: [PATCH] CLOUDSTACK-5228: [API] [EIP/ELB enabled Zone] Need to display EIP address as "Public IP Address" for system VMs In system VM response object return EIP as public IP in case of basic zone with EIP service. Conflicts: server/src/com/cloud/api/ApiResponseHelper.java --- .../src/com/cloud/api/ApiResponseHelper.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index b5d2de69a70..68770e5dff8 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1149,12 +1149,29 @@ public class ApiResponseHelper implements ResponseGenerator { vmResponse.setLinkLocalIp(singleNicProfile.getIp4Address()); vmResponse.setLinkLocalMacAddress(singleNicProfile.getMacAddress()); vmResponse.setLinkLocalNetmask(singleNicProfile.getNetmask()); - } else if (network.getTrafficType() == TrafficType.Public || network.getTrafficType() == TrafficType.Guest) { - /*In basic zone, public ip has TrafficType.Guest*/ + } else if (network.getTrafficType() == TrafficType.Public) { vmResponse.setPublicIp(singleNicProfile.getIp4Address()); vmResponse.setPublicMacAddress(singleNicProfile.getMacAddress()); vmResponse.setPublicNetmask(singleNicProfile.getNetmask()); vmResponse.setGateway(singleNicProfile.getGateway()); + } else if (network.getTrafficType() == TrafficType.Guest) { + /* + * In basic zone, public ip has TrafficType.Guest in case EIP service is not enabled. + * When EIP service is enabled in the basic zone, system VM by default get the public + * IP allocated for EIP. So return the guest/public IP accordingly. + * */ + NetworkOffering networkOffering = ApiDBUtils.findNetworkOfferingById(network.getNetworkOfferingId()); + if (networkOffering.getElasticIp()) { + IpAddress ip = ApiDBUtils.findIpByAssociatedVmId(vm.getId()); + if (ip != null) { + vmResponse.setPublicIp(ip.getAddress().addr()); + } + } else { + vmResponse.setPublicIp(singleNicProfile.getIp4Address()); + vmResponse.setPublicMacAddress(singleNicProfile.getMacAddress()); + vmResponse.setPublicNetmask(singleNicProfile.getNetmask()); + vmResponse.setGateway(singleNicProfile.getGateway()); + } } } }