Merge lp:~cjohnston/ubuntu-ci-services-itself/tenant-issues into lp:ubuntu-ci-services-itself

[Chris Johnston]

Fix auth_tenant/auth_tenant_name issues

Previously our code had been using auth_tenant_name. In a recent MP auth_tenant was mistakenly introduced. This clearly caused issues.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:235
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/145/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/145/rebuild

review: Approve (continuous-integration)

[Ursula Junque (ursinha)]

Looks good to me, tests pass (locally) and so on.

review: Approve

=== modified file 'ci-utils/ci_utils/data_store/__init__.py'
--- ci-utils/ci_utils/data_store/__init__.py	2014-02-11 16:26:02 +0000
+++ ci-utils/ci_utils/data_store/__init__.py	2014-02-12 20:43:20 +0000
@@ -38,7 +38,7 @@
 
     @staticmethod
     def validate_auth_config(auth_config):
-        required_fields = ['auth_user', 'auth_password', 'auth_tenant',
+        required_fields = ['auth_user', 'auth_password', 'auth_tenant_name',
                            'auth_url', 'auth_region']
 
         missing_fields = []

=== modified file 'ci-utils/ci_utils/tests/test_data_store.py'
--- ci-utils/ci_utils/tests/test_data_store.py	2014-02-11 16:26:02 +0000
+++ ci-utils/ci_utils/tests/test_data_store.py	2014-02-12 20:43:20 +0000
@@ -21,7 +21,7 @@
     'auth_url': 'http://example.com',
     'auth_user': 'user',
     'auth_password': 'pass',
-    'auth_tenant': 'tenant',
+    'auth_tenant_name': 'tenant',
     'auth_region': 'region',
 }
 

=== modified file 'cli/ci_libs/utils.py'
--- cli/ci_libs/utils.py	2014-02-11 16:26:02 +0000
+++ cli/ci_libs/utils.py	2014-02-12 20:43:20 +0000
@@ -46,7 +46,7 @@
         data_store.DataStore.validate_auth_config(AUTH_CONFIG)
     except IOError:
         r = ['ci_url', 'auth_url', 'auth_user', 'auth_password',
-             'auth_region', 'auth_tenant']
+             'auth_region', 'auth_tenant_name']
         error_msg = ("ERROR: Missing YAML config in {}:\n {}"
                      "\n\nThis can be created by running: {} auto_config")
         sys.exit(error_msg.format(config_file, "\n ".join(r), sys.argv[0]))

=== modified file 'cli/tests/__init__.py'
--- cli/tests/__init__.py	2014-01-29 18:14:33 +0000
+++ cli/tests/__init__.py	2014-02-12 20:43:20 +0000
@@ -47,7 +47,7 @@
                          "auth_url": "test",
                          "auth_user": "test",
                          "auth_password": "test",
-                         "auth_tenant": "test",
+                         "auth_tenant_name": "test",
                          }
     utils.CI_URL = utils.AUTH_CONFIG['ci_url']
 

=== modified file 'cli/tests/test_utils.py'
--- cli/tests/test_utils.py	2014-02-11 16:26:02 +0000
+++ cli/tests/test_utils.py	2014-02-12 20:43:20 +0000
@@ -26,11 +26,12 @@
 config_contents = """auth_url: http://example.com
 auth_user: user
 auth_password: pass
-auth_tenant: user_project
+auth_tenant_name: user_project
 auth_region: region1
 ci_url: http://example.com/ci
 """
 
+
 class UtilsTestCase(CLITestCase):
     def test_parse_id(self):
         location = 'http://www.example.com/api/v1/ticket/5/'