cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [28/50] [abbrv] git commit: updated refs/heads/regionvpc to edf12eb
Date Tue, 11 Mar 2014 14:26:50 GMT
Bug-Id: CS-19455 Add support for Hyper-v in regression test test_routers.py

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>


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

Branch: refs/heads/regionvpc
Commit: 4eece72eb178d468e4b86c371e88d5f1ff4dde93
Parents: 3f7b628
Author: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Authored: Mon Mar 10 17:56:22 2014 +0530
Committer: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Committed: Mon Mar 10 18:12:21 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_routers.py   | 28 +++++++++++------------
 tools/marvin/marvin/integration/lib/utils.py |  3 ++-
 2 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4eece72e/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index f8359f0..ced3f52 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -1254,21 +1254,10 @@ class TestRouterStopCreateFW(cloudstackTestCase):
                     str(self.services["fw_rule"]["endport"]),
                     "Check end port of firewall rule"
                     )
-        hosts = list_hosts(
-                           self.apiclient,
-                           id=router.hostid,
-                           )
-        self.assertEqual(
-                        isinstance(hosts, list),
-                        True,
-                        "Check for list hosts response return valid data"
-                        )
-        host = hosts[0]
-        host.user, host.passwd = get_host_credentials(self.config, host.ipaddress)
-
         # For DNS and DHCP check 'dnsmasq' process status
-        if self.apiclient.hypervisor.lower() == 'vmware':
-               result = get_process_status(
+        if (self.apiclient.hypervisor.lower() == 'vmware'
+                         or self.apiclient.hypervisor.lower() == 'hyperv'):
+            result = get_process_status(
                                self.apiclient.connection.mgtSvr,
                                22,
                                self.apiclient.connection.user,
@@ -1278,6 +1267,17 @@ class TestRouterStopCreateFW(cloudstackTestCase):
                                 hypervisor=self.apiclient.hypervisor
                                )
         else:
+            hosts = list_hosts(
+                        self.apiclient,
+                        id=router.hostid,
+                        )
+            self.assertEqual(
+                        isinstance(hosts, list),
+                        True,
+                        "Check for list hosts response return valid data"
+                        )
+            host = hosts[0]
+            host.user, host.passwd = get_host_credentials(self.config, host.ipaddress)
             try:
                 result = get_process_status(
                     host.ipaddress,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4eece72e/tools/marvin/marvin/integration/lib/utils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/utils.py b/tools/marvin/marvin/integration/lib/utils.py
index e870158..709fdde 100644
--- a/tools/marvin/marvin/integration/lib/utils.py
+++ b/tools/marvin/marvin/integration/lib/utils.py
@@ -191,7 +191,8 @@ def get_process_status(hostip, port, username, password, linklocalip,
process, h
 
     #SSH to the machine
     ssh = SshClient(hostip, port, username, password)
-    if str(hypervisor).lower() == 'vmware':
+    if (str(hypervisor).lower() == 'vmware'
+		or str(hypervisor).lower() == 'hyperv'):
         ssh_command = "ssh -i /var/cloudstack/management/.ssh/id_rsa -ostricthostkeychecking=no
"
     else:
         ssh_command = "ssh -i ~/.ssh/id_rsa.cloud -ostricthostkeychecking=no "


Mime
View raw message