From 78f191ddbb4eb4a8a0dc8f21cb3056028a572666 Mon Sep 17 00:00:00 2001
From: jh629g <jh629g@att.com>
Date: Thu, 28 May 2020 09:41:56 -0500
Subject: [PATCH] Fixed region domainName update in class setup process

During setup of ranger tempest test runs, an update
statement is ran which updates ranger regions to
the appropriate testing domain as defined by
tempest.conf. This update statement has been updated
to target only the sites being used for that particular
ranger tempest test run. Also fixed typo in IMS test.

Change-Id: I4ebdc7fd21cebb23e8033a066bbd90d26f76bb50
---
 ranger_tempest_plugin/tests/api/base.py        | 10 ++++++----
 ranger_tempest_plugin/tests/api/test_images.py |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ranger_tempest_plugin/tests/api/base.py b/ranger_tempest_plugin/tests/api/base.py
index 6a3c141..a9b3256 100755
--- a/ranger_tempest_plugin/tests/api/base.py
+++ b/ranger_tempest_plugin/tests/api/base.py
@@ -46,13 +46,15 @@ class BaseOrmTest(test.BaseTestCase):
         regions = [x for x in regions_list['regions']]
 
         for region in regions:
-            if region['domainName'] != CONF.auth.admin_domain_name:
-                region['domainName'] = CONF.auth.admin_domain_name
-                cls.region_client.update_region(region['id'],
-                                                **region)
+            if region['id'] is CONF.identity.region or \
+                region['id'] is CONF.ranger.alt_region:
                 cls.addClassResourceCleanup(cls.region_client.update_region,
                                             region['id'],
                                             **region)
+                region['domainName'] = CONF.auth.admin_domain_name
+                cls.region_client.update_region(region['id'],
+                                                **region)
+
         super(BaseOrmTest, cls).setup_clients()
 
     @classmethod
diff --git a/ranger_tempest_plugin/tests/api/test_images.py b/ranger_tempest_plugin/tests/api/test_images.py
index 5cb77c1..747d5f0 100644
--- a/ranger_tempest_plugin/tests/api/test_images.py
+++ b/ranger_tempest_plugin/tests/api/test_images.py
@@ -318,7 +318,7 @@ class TestTempestIms(ims_base.ImsBaseOrmTest):
         self.assertIn('id', body['image'])
         _, body = self.client.get_image(image['id'])
         self.assertEqual(body['image']['id'], image['id'])
-        self.assertEqual(body['image']['regions'][0]['status'], 'success')
+        self.assertEqual(body['image']['regions'][0]['status'], 'Success')
         self._update_region(CONF.identity.region)
 
     @SYNC('region')