File 0001-tempest-Allow-the-old-style-name-project-n... of Package openstack-magnum

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-tempest-Allow-the-old-style-name-project-name.patch of Package openstack-magnum

From 62e747ae40c2e5d826dfdb9204a082705dd86346 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Thu, 7 Jul 2016 17:37:17 +0200
Subject: [PATCH] tempest: Allow the old-style name project name

Tempest renamed a config option from the auth section called
"admin_tenant_name" to "admin_project_name".
To be able to run the magnum tempest tests with an older
version of tempest, also check for "admin_tenant_name" if
"admin_project_name" is not available.

Change-Id: I39de0978f36fd04ce1959d3904f1da55370e13aa
---
 magnum/tests/functional/common/config.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/magnum/tests/functional/common/config.py b/magnum/tests/functional/common/config.py
index c5cc2cc..03d6c40 100644
--- a/magnum/tests/functional/common/config.py
+++ b/magnum/tests/functional/common/config.py
@@ -12,6 +12,7 @@
 
 from tempest import config
 
+from oslo_config import cfg
 
 CONF = config.CONF
 
@@ -24,7 +25,11 @@ class Config(object):
     def set_admin_creds(cls, config):
         cls.admin_user = CONF.auth.admin_username
         cls.admin_passwd = CONF.auth.admin_password
-        cls.admin_tenant = CONF.auth.admin_project_name
+        # NOTE(toabctl): also allow the old style tempest definition
+        try:
+            cls.admin_tenant = CONF.auth.admin_project_name
+        except cfg.NoSuchOptError:
+            cls.admin_tenant = CONF.auth.admin_tenant_name
 
     @classmethod
     def set_user_creds(cls, config):
@@ -36,7 +41,11 @@ class Config(object):
         # check Ia5132c5cb32355d6f26b8acdd92a0e55a2c19f41
         cls.user = CONF.auth.admin_username
         cls.passwd = CONF.auth.admin_password
-        cls.tenant = CONF.auth.admin_project_name
+        # NOTE(toabctl): also allow the old style tempest definition
+        try:
+            cls.tenant = CONF.auth.admin_project_name
+        except cfg.NoSuchOptError:
+            cls.tenant = CONF.auth.admin_tenant_name
 
     @classmethod
     def set_auth_version(cls, config):
-- 
2.9.0

Places

File 0001-tempest-Allow-the-old-style-name-project-name.patch of Package openstack-magnum

Places