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

KVM : fix, can boot user VM

Browse Source
This commit is contained in:
anthony 2012-07-24 17:29:32 -07:00
parent 0021192b05
commit 1261f0c821
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -485,11 +485,11 @@ public class VirtualRoutingResource implements Manager {
} }
public String getRouterStatus(String routerIP) { public String getRouterStatus(String routerIP) {
return routerProxy("checkrouter.sh", routerIP, null); return routerProxyWithParser("checkrouter.sh", routerIP, null);
} }
public String routerProxy(String script, String routerIP, String args) { public String routerProxyWithParser(String script, String routerIP, String args) {
final Script command = new Script(_routerProxyPath, _timeout, s_logger); final Script command = new Script(_routerProxyPath, _timeout, s_logger);
final OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser(); final OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser();
command.add(script); command.add(script);
@ -518,6 +518,16 @@ public class VirtualRoutingResource implements Manager {
} }
return new CheckS2SVpnConnectionsAnswer(cmd, true, result); return new CheckS2SVpnConnectionsAnswer(cmd, true, result);
} }
public String routerProxy(String script, String routerIP, String args) {
final Script command = new Script(_routerProxyPath, _timeout, s_logger);
command.add(script);
command.add(routerIP);
if ( args != null ) {
command.add(args);
}
return command.execute();
}
protected Answer execute(CheckRouterCommand cmd) { protected Answer execute(CheckRouterCommand cmd) {
final String routerPrivateIPAddress = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); final String routerPrivateIPAddress = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
@ -542,7 +552,7 @@ public class VirtualRoutingResource implements Manager {
} }
protected String getDomRVersion(String routerIP) { protected String getDomRVersion(String routerIP) {
return routerProxy("get_template_version.sh", routerIP, null); return routerProxyWithParser("get_template_version.sh", routerIP, null);
} }
protected Answer execute(GetDomRVersionCmd cmd) { protected Answer execute(GetDomRVersionCmd cmd) {