From d004a4152d048ae72c51393da7aabcb39c71c339 Mon Sep 17 00:00:00 2001
From: Andrew McLeod <andrew.mcleod@canonical.com>
Date: Thu, 28 Nov 2019 16:45:44 +0100
Subject: [PATCH] rename cinder backup swift to cinder backup swift proxy
 (#134)

---
 .../__init__.py                                   |  2 +-
 .../setup.py                                      | 15 ++++++++-------
 .../tests.py                                      |  0
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename zaza/openstack/charm_tests/{cinder_backup_swift => cinder_backup_swift_proxy}/__init__.py (97%)
 rename zaza/openstack/charm_tests/{cinder_backup_swift => cinder_backup_swift_proxy}/setup.py (78%)
 rename zaza/openstack/charm_tests/{cinder_backup_swift => cinder_backup_swift_proxy}/tests.py (100%)

diff --git a/zaza/openstack/charm_tests/cinder_backup_swift/__init__.py b/zaza/openstack/charm_tests/cinder_backup_swift_proxy/__init__.py
similarity index 97%
rename from zaza/openstack/charm_tests/cinder_backup_swift/__init__.py
rename to zaza/openstack/charm_tests/cinder_backup_swift_proxy/__init__.py
index 3d7e48c..e093594 100644
--- a/zaza/openstack/charm_tests/cinder_backup_swift/__init__.py
+++ b/zaza/openstack/charm_tests/cinder_backup_swift_proxy/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Collection of code for setting up and testing cinder-backup-swift."""
+"""Collection of code for setting up and testing cinder-backup-swift-proxy."""
diff --git a/zaza/openstack/charm_tests/cinder_backup_swift/setup.py b/zaza/openstack/charm_tests/cinder_backup_swift_proxy/setup.py
similarity index 78%
rename from zaza/openstack/charm_tests/cinder_backup_swift/setup.py
rename to zaza/openstack/charm_tests/cinder_backup_swift_proxy/setup.py
index d84ad2e..d4c92e4 100644
--- a/zaza/openstack/charm_tests/cinder_backup_swift/setup.py
+++ b/zaza/openstack/charm_tests/cinder_backup_swift_proxy/setup.py
@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Code for configuring cinder-backup-swift."""
+"""Code for configuring cinder-backup-swift-proxy."""
 
 import zaza.model as zaza_model
 import zaza.openstack.charm_tests.test_utils
 
 
 def configure_cinder_backup():
-    """Configure cinder-backup-swift."""
+    """Configure cinder-backup-swift-proxy."""
     keystone_ip = zaza_model.get_app_ips(
         'swift-keystone')[0]
     swift_ip = zaza_model.get_app_ips(
@@ -32,17 +32,18 @@ def configure_cinder_backup():
     else:
         auth_url = 'http://{}:5000/v3'.format(keystone_ip)
         endpoint_url = 'http://{}:8080/v1/AUTH'.format(swift_ip)
-    cinder_backup_swift_conf = {
+    cinder_backup_swift_proxy_conf = {
         'endpoint-url': endpoint_url,
         'auth-url': auth_url
     }
-    juju_service = 'cinder-backup-swift'
-    zaza_model.set_application_config(juju_service, cinder_backup_swift_conf)
+    juju_service = 'cinder-backup-swift-proxy'
+    zaza_model.set_application_config(juju_service,
+                                      cinder_backup_swift_proxy_conf)
     zaza_model.wait_for_agent_status()
     zaza_model.wait_for_application_states()
     _singleton = zaza.openstack.charm_tests.test_utils.OpenStackBaseTest()
     _singleton.setUpClass()
-    with _singleton.config_change(cinder_backup_swift_conf,
-                                  cinder_backup_swift_conf):
+    with _singleton.config_change(cinder_backup_swift_proxy_conf,
+                                  cinder_backup_swift_proxy_conf):
         # wait for configuration to be applied then return
         pass
diff --git a/zaza/openstack/charm_tests/cinder_backup_swift/tests.py b/zaza/openstack/charm_tests/cinder_backup_swift_proxy/tests.py
similarity index 100%
rename from zaza/openstack/charm_tests/cinder_backup_swift/tests.py
rename to zaza/openstack/charm_tests/cinder_backup_swift_proxy/tests.py