commit 26c2befd040ad52c4f7cdc7cf78fe522b714ccd0
author Jenkins <jenkins@review.openstack.org> Mon Oct 19 23:46:44 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Oct 19 23:46:44 2015 +0000
tree 31cf1c72125fdcb0909123504e14dd89cb02dc7f
parent c3dbc153136888572085af3b671b3d37f4950550
parent b5047aad92194fc25f55514779d13fc5dffe5a8e

Merge "Stop using deprecated tempest options"

manila_tempest_tests/tests/api/base.py

diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index a8f2b83..7beb289 100644
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -713,9 +713,14 @@
 
     @classmethod
     def resource_setup(cls):
-        cls.username = CONF.identity.admin_username
-        cls.password = CONF.identity.admin_password
-        cls.tenant_name = CONF.identity.admin_tenant_name
+        if hasattr(CONF.identity, 'admin_username'):
+            cls.username = CONF.identity.admin_username
+            cls.password = CONF.identity.admin_password
+            cls.tenant_name = CONF.identity.admin_tenant_name
+        else:
+            cls.username = CONF.auth.admin_username
+            cls.password = CONF.auth.admin_password
+            cls.tenant_name = CONF.auth.admin_tenant_name
         cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
         cls.os = clients.AdminManager()
         admin_share_network_id = CONF.share.admin_share_network_id