VPC : get correct guest gateway
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fb72b7e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fb72b7e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fb72b7e3 Branch: refs/heads/vpc Commit: fb72b7e31b477bafb6e33afc15800d9da921f437 Parents: a4d0f91 Author: anthony <[email protected]> Authored: Wed Jun 6 18:22:09 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri Jun 15 14:26:31 2012 -0700 ---------------------------------------------------------------------- .../xen/resource/CitrixResourceBase.java | 3 ++- wscript | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fb72b7e3/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index edb1881..a5359ce 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -7035,6 +7035,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe String domrIP = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); String domrGIP = cmd.getAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP); String domrName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME); + String gw = cmd.getAccessDetail(NetworkElementCommand.GUEST_NETWORK_GATEWAY); try { Set<VM> vms = VM.getByNameLabel(conn, domrName); if ( vms == null || vms.isEmpty() ) { @@ -7058,7 +7059,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe String dev = "eth" + domrVif.getDevice(conn); args += " -d " + dev; args += " -i " + domrGIP; - args += " -g " + nic.getGateway(); + args += " -g " + gw; args += " -m " + Long.toString(NetUtils.getCidrSize(nic.getNetmask())); args += " -s " + nic.getDns1(); String result = callHostPlugin(conn, "vmops", "routerProxy", "args", args); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fb72b7e3/wscript ---------------------------------------------------------------------- diff --git a/wscript b/wscript index 26a82f5..d9b5488 100644 --- a/wscript +++ b/wscript @@ -4,7 +4,7 @@ # the following two variables are used by the target "waf dist" # if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog -VERSION = '3.0.3.2012-06-07T00:17:43Z' +VERSION = '3.0.3.2012-06-07T00:21:40Z' APPNAME = 'cloud' import shutil,os
