Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BCEF11612 for ; Mon, 22 Sep 2014 11:13:56 +0000 (UTC) Received: (qmail 94714 invoked by uid 500); 22 Sep 2014 11:13:56 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 94684 invoked by uid 500); 22 Sep 2014 11:13:56 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 94675 invoked by uid 99); 22 Sep 2014 11:13:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2014 11:13:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C340A948869; Mon, 22 Sep 2014 11:13:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sanjeev@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 5bddebb Date: Mon, 22 Sep 2014 11:13:55 +0000 (UTC) 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 Authored: Mon Sep 22 16:27:44 2014 +0530 Committer: sanjeev 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