This commit is contained in:
anthony 2012-07-27 16:37:22 -07:00
parent 3c90fc842f
commit 0021192b05

View File

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