CLOUDSTACK-7431: moved ldap configuration details to test_data.py

SrikanteswaraRao Talluri · SrikanteswaraRao Talluri · commit b43d9345e971 · 2014-09-04T17:38:42.000+05:30
Signed-off-by: SrikanteswaraRao Talluri &lt;talluri@apache.org&gt;
diff --git a/test/integration/component/test_ldap.py b/test/integration/component/test_ldap.py
@@ -35,35 +35,6 @@
 from nose.plugins.attrib import attr
 import urllib
 
-
-
-class Services:
-    """Test LDAP Configuration
-    """
-
-    def __init__(self):
-        self.services = {
-            "account": {
-                "email": "rmurphy@cloudstack.org",
-                "firstname": "Ryan",
-                "lastname": "Murphy",
-                "username": "rmurphy",
-                "password": "internalcloudstackpassword",
-                },
-            "ldapConfiguration_1":
-                {
-                "basedn": "dc=cloudstack,dc=org",
-                "emailAttribute": "mail",
-                "userObject": "inetOrgPerson",
-                "usernameAttribute": "uid",
-                "hostname": "localhost",
-                "port": "10389",
-                "ldapUsername": "rmurphy",
-                "ldapPassword": "password"
-                }
-        }
-
-
 class TestLdap(cloudstackTestCase):
     """
     This tests attempts to register a LDAP server and authenticate as an LDAP user.
@@ -72,12 +43,10 @@ class TestLdap(cloudstackTestCase):
     @classmethod
     def setUpClass(cls):
 
-        cls.api_client = super(
-            TestLdap,
-            cls
-        ).getClsTestClient().getApiClient()
-        cls.services = Services().services
-        cls.account = cls.services["account"]
+        testClient = super(TestLdap, cls).getClsTestClient()
+        cls.api_client = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+        cls.account = cls.services["ldap_account"]
         cls._cleanup = []
 
 
@@ -97,12 +66,12 @@ def setUp(self):
 
         self.acct = createAccount.createAccountCmd()
         self.acct.accounttype = 0
-        self.acct.firstname = self.services["account"]["firstname"]
-        self.acct.lastname = self.services["account"]["lastname"]
-        self.acct.password = self.services["account"]["password"]
-        self.acct.username = self.services["account"]["username"]
-        self.acct.email = self.services["account"]["email"]
-        self.acct.account = self.services["account"]["username"]
+        self.acct.firstname = self.services["ldap_account"]["firstname"]
+        self.acct.lastname = self.services["ldap_account"]["lastname"]
+        self.acct.password = self.services["ldap_account"]["password"]
+        self.acct.username = self.services["ldap_account"]["username"]
+        self.acct.email = self.services["ldap_account"]["email"]
+        self.acct.account = self.services["ldap_account"]["username"]
         self.acct.domainid = 1
 
         self.acctRes = self.apiClient.createAccount(self.acct)
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
@@ -1234,5 +1234,23 @@
                     },
                 },
                 "ostype": 'CentOS 5.6 (64-bit)',
-        }
+        },
+        "ldap_account": {
+            "email": "rmurphy@cloudstack.org",
+            "firstname": "Ryan",
+            "lastname": "Murphy",
+            "username": "rmurphy",
+            "password": "internalcloudstackpassword",
+            },
+        "ldapConfiguration_1":
+            {
+            "basedn": "dc=cloudstack,dc=org",
+            "emailAttribute": "mail",
+            "userObject": "inetOrgPerson",
+            "usernameAttribute": "uid",
+            "hostname": "localhost",
+            "port": "10389",
+            "ldapUsername": "rmurphy",
+            "ldapPassword": "password"
+            }
 }
