From 657a40ad30e29ea695d4feb65e2097ddc59cb7cc Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 6 Jun 2012 18:22:09 -0700 Subject: [PATCH] VPC : get correct guest gateway --- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 3 ++- wscript | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 31a44888d5b..75b02664e30 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -7022,6 +7022,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 vms = VM.getByNameLabel(conn, domrName); if ( vms == null || vms.isEmpty() ) { @@ -7045,7 +7046,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); diff --git a/wscript b/wscript index e578b8d6469..54f1386bcff 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