cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject git commit: updated refs/heads/master to 5bddebb
Date Mon, 22 Sep 2014 11:13:55 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 937aee34e -> 5bddebb8f


In case of Hyper-v ssvm/cpvm reboot takes time so made changes to handle this


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

Branch: refs/heads/master
Commit: 5bddebb8fc6eb85753a030f1d71fe2303969325b
Parents: 937aee3
Author: sanjeev <sanjeev@apache.org>
Authored: Mon Sep 22 16:27:44 2014 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Mon Sep 22 16:43:16 2014 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/lib/utils.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bddebb8/tools/marvin/marvin/lib/utils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/utils.py b/tools/marvin/marvin/lib/utils.py
index c52e277..8788b3b 100644
--- a/tools/marvin/marvin/lib/utils.py
+++ b/tools/marvin/marvin/lib/utils.py
@@ -208,12 +208,16 @@ def get_process_status(hostip, port, username, password, linklocalip,
process, h
                       process)
 
     # Double hop into router
-    timeout = 5
+    if str(hypervisor).lower() == 'hyperv':
+        timeout = 12
+    else:
+        timeout = 5
     # Ensure the SSH login is successful
     while True:
         res = ssh.execute(ssh_command)
-
-        if res[0] != "Host key verification failed.":
+        if "Connection refused".lower() in res[0].lower():
+            pass
+        elif res[0] != "Host key verification failed.":
             break
         elif timeout == 0:
             break


Mime
View raw message