cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to 3d369de
Date Thu, 04 Sep 2014 11:57:48 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master aa64d8b3e -> 3d369de6f


CLOUDSTACK-7388: removed host credentials in the services dict.


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

Branch: refs/heads/master
Commit: 3d369de6fe3bc415c5bda5dffecc79e02ca58993
Parents: aa64d8b
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Thu Sep 4 17:26:51 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Thu Sep 4 17:26:51 2014 +0530

----------------------------------------------------------------------
 .../component/maint/test_redundant_router.py    | 46 ++++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d369de6/test/integration/component/maint/test_redundant_router.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_redundant_router.py b/test/integration/component/maint/test_redundant_router.py
index 991fc6f..1b215c3 100644
--- a/test/integration/component/maint/test_redundant_router.py
+++ b/test/integration/component/maint/test_redundant_router.py
@@ -94,11 +94,6 @@ class Services:
                                         },
                                     },
                         },
-                        "host": {
-                                 "username": "root",
-                                 "password": "password",
-                                 "publicport": 22,
-                        },
                         "network": {
                                   "name": "Test Network",
                                   "displaytext": "Test Network",
@@ -854,15 +849,21 @@ class TestRVRInternals(cloudstackTestCase):
                                 hypervisor=self.hypervisor
                                 )
         else:
-            result = get_process_status(
-                                master_host.ipaddress,
-                                self.services['host']["publicport"],
-                                self.services['host']["username"],
-                                self.services['host']["password"],
-                                master_router.linklocalip,
-                                'ip addr show eth2'
+            try:
+                host = {}
+                host.user, host.passwd = get_host_credentials(self.config, master_host.ipaddress)
+                result = get_process_status(
+                                    master_host.ipaddress,
+                                    22,
+                                    host.user,
+                                    host.passwd,
+                                    master_router.linklocalip,
+                                    "ip addr show eth2"
                                 )
 
+            except KeyError:
+                self.skipTest("Marvin configuration has no host credentials to check router
services")
+
         res = str(result)
 
         self.debug("Command 'ip addr show eth2': %s" % result)
@@ -890,14 +891,21 @@ class TestRVRInternals(cloudstackTestCase):
                                 hypervisor=self.hypervisor
                                 )
         else:
-            result = get_process_status(
-                                backup_host.ipaddress,
-                                self.services['host']["publicport"],
-                                self.services['host']["username"],
-                                self.services['host']["password"],
-                                backup_router.linklocalip,
-                                'ip addr show eth2',
+            try:
+                host = {}
+                host.user, host.passwd = get_host_credentials(self.config, backup_host.ipaddress)
+                result = get_process_status(
+                                    master_host.ipaddress,
+                                    22,
+                                    host.user,
+                                    host.passwd,
+                                    backup_router.linklocalip,
+                                    "ip addr show eth2"
                                 )
+
+            except KeyError:
+                self.skipTest("Marvin configuration has no host credentials to check router
services")
+
         res = str(result)
 
         self.debug("Command 'ip addr show eth2': %s" % result)


Mime
View raw message