From c904cfcd056cc258a996443369316e1be92a8075 Mon Sep 17 00:00:00 2001 From: anthony Date: Tue, 24 Jul 2012 15:39:46 -0700 Subject: [PATCH] KVM fix --- .../virtualnetwork/VirtualRoutingResource.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index cc4c54bcf79..9d5a987b8e2 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -519,7 +519,7 @@ public class VirtualRoutingResource implements Manager { } protected String getDomRVersion(String routerIP) { - return routerProxy("getDomRVersion.sh", routerIP, null); + return routerProxy("get_template_version.sh", routerIP, null); } protected Answer execute(GetDomRVersionCmd cmd) { @@ -632,21 +632,6 @@ public class VirtualRoutingResource implements Manager { } - public String assignPublicIpAddress(final String vmName, final long id, final String vnet, final String privateIpAddress, final String macAddress, final String publicIpAddress) { - String args ="-A"; - args += " -f"; //first ip is source nat ip - args += " -r "; - args += vmName; - args += " -i "; - args += privateIpAddress; - args += " -a "; - args += macAddress; - args += " -l "; - args += publicIpAddress; - return routerProxy("ipassoc.sh", privateIpAddress, args); - } - - public String assignPublicIpAddress(final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP, final boolean sourceNat,