incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject [3/4] git commit: KVM : fix, can boot user VM
Date Sat, 28 Jul 2012 00:06:09 GMT
KVM  : fix, can boot user VM


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1261f0c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1261f0c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1261f0c8

Branch: refs/heads/vpc
Commit: 1261f0c821c12cbe68d0779cbf98d195c517cde0
Parents: 0021192
Author: anthony <anthony@cloud.com>
Authored: Tue Jul 24 17:29:32 2012 -0700
Committer: anthony <anthony@cloud.com>
Committed: Fri Jul 27 16:56:39 2012 -0700

----------------------------------------------------------------------
 .../virtualnetwork/VirtualRoutingResource.java     |   16 ++++++++++++--
 1 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1261f0c8/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 7e290bd..041d86d 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -485,11 +485,11 @@ public class VirtualRoutingResource implements Manager {
     }
 
     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 OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser();
         command.add(script);
@@ -518,6 +518,16 @@ public class VirtualRoutingResource implements Manager {
         }
         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) {
         final String routerPrivateIPAddress = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
@@ -542,7 +552,7 @@ public class VirtualRoutingResource implements Manager {
     }
 
     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) {


Mime
View raw message