You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2014/03/13 14:53:07 UTC
[16/31] git commit: updated refs/heads/distributedrouter to a8d43ba
CLOUDSTACK-6235 - return gateway/netmask of publicVlan, along with the EIP information, for system vms in EIP/ELB setup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40192cd8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40192cd8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40192cd8
Branch: refs/heads/distributedrouter
Commit: 40192cd8a1ee33ec784cfcbdb7c4c78483a8f1eb
Parents: b5c8a56
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Mar 12 14:36:43 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Mar 12 15:11:01 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40192cd8/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 81bfe21..2deaa50 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1192,8 +1192,11 @@ public class ApiResponseHelper implements ResponseGenerator {
NetworkOffering networkOffering = ApiDBUtils.findNetworkOfferingById(network.getNetworkOfferingId());
if (networkOffering.getElasticIp()) {
IpAddress ip = ApiDBUtils.findIpByAssociatedVmId(vm.getId());
+ Vlan vlan = ApiDBUtils.findVlanById(ip.getVlanId());
if (ip != null) {
vmResponse.setPublicIp(ip.getAddress().addr());
+ vmResponse.setPublicNetmask(vlan.getVlanNetmask());
+ vmResponse.setGateway(vlan.getVlanGateway());
}
} else {
vmResponse.setPublicIp(singleNicProfile.getIp4Address());