KVM fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0021192b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0021192b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0021192b Branch: refs/heads/vpc Commit: 0021192b05a02e7eb395df39758ef75c469043c4 Parents: 3c90fc8 Author: anthony <[email protected]> Authored: Fri Jul 27 16:37:22 2012 -0700 Committer: anthony <[email protected]> Committed: Fri Jul 27 16:54:05 2012 -0700 ---------------------------------------------------------------------- .../virtualnetwork/VirtualRoutingResource.java | 16 +-------------- 1 files changed, 1 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0021192b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 4081ff6..7e290bd 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -542,7 +542,7 @@ public class VirtualRoutingResource implements Manager { } protected String getDomRVersion(String routerIP) { - return routerProxy("netusage.sh", routerIP, null); + return routerProxy("get_template_version.sh", routerIP, null); } protected Answer execute(GetDomRVersionCmd cmd) { @@ -655,20 +655,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,
