apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

VPC : get correct guest gateway

Browse Source
This commit is contained in:
anthony 2012-06-06 18:22:09 -07:00 committed by Alena Prokharchyk
parent a4d0f91cfe
commit fb72b7e31b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -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);

2
wscript
View File

@ -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