From 15dd3581a49d865b4654bc616192cafff24aeb54 Mon Sep 17 00:00:00 2001
From: Andrew McLeod <andrew.mcleod@canonical.com>
Date: Tue, 26 Nov 2019 17:06:23 +0100
Subject: [PATCH] Rename (#12)

* add working v2 test back

* rename charm

* fix
---
 README.md                                      | 6 +++---
 src/layer.yaml                                 | 2 +-
 src/lib/charm/openstack/cinder_backup_swift.py | 2 +-
 src/metadata.yaml                              | 2 +-
 src/reactive/cinder_backup_swift_handlers.py   | 2 +-
 src/tests/bundles/bionic-queens-swift-v2.yaml  | 6 +++---
 src/tests/bundles/bionic-queens-swift-v3.yaml  | 6 +++---
 src/tests/tests.yaml                           | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ce8bfe6..f95fd8f 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ In order to use it external swift URL is needed along with authentication detail
 To use:
 
     juju deploy cinder
-    juju deploy cinder-backup-swift
-    juju add-relation cinder-backup-swift cinder
+    juju deploy cinder-backup-swift-proxy
+    juju add-relation cinder-backup-swift-proxy cinder
 
 
 # Bugs
 
-Please report bugs on [Launchpad](https://bugs.launchpad.net/charm-cinder-backup-swift/+filebug).
+Please report bugs on [Launchpad](https://bugs.launchpad.net/charm-cinder-backup-swift-proxy/+filebug).
 For general questions please refer to the OpenStack [Charm Guide](https://github.com/openstack/charm-guide).
\ No newline at end of file
diff --git a/src/layer.yaml b/src/layer.yaml
index b651e28..9c42866 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -1,7 +1,7 @@
 includes:
   - 'layer:openstack'
   - 'interface:cinder-backup'
-repo: https://github.com/openstack/charm-cinder-backup-swift
+repo: https://github.com/openstack/charm-cinder-backup-swift-proxy
 options:
   basic:
     use_venv: true
diff --git a/src/lib/charm/openstack/cinder_backup_swift.py b/src/lib/charm/openstack/cinder_backup_swift.py
index 2544e39..f726e52 100644
--- a/src/lib/charm/openstack/cinder_backup_swift.py
+++ b/src/lib/charm/openstack/cinder_backup_swift.py
@@ -13,7 +13,7 @@ from charms_openstack.charm import OpenStackCharm
 
 
 class CinderBackupSwiftCharm(OpenStackCharm):
-    name = 'cinder-backup-swift'
+    name = 'cinder-backup-swift-proxy'
     packages = ['cinder-backup']
     release = 'queens'
 
diff --git a/src/metadata.yaml b/src/metadata.yaml
index bdeaf0b..b6394b8 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -1,4 +1,4 @@
-name: cinder-backup-swift
+name: cinder-backup-swift-proxy
 summary: Cinder-backup integration for OpenStack Block Storage
 maintainer: Alex Litvinov <alexander.litvinov@canonical.com>
 description: |
diff --git a/src/reactive/cinder_backup_swift_handlers.py b/src/reactive/cinder_backup_swift_handlers.py
index 5294981..f2bbe7a 100644
--- a/src/reactive/cinder_backup_swift_handlers.py
+++ b/src/reactive/cinder_backup_swift_handlers.py
@@ -3,7 +3,7 @@ import charms.reactive as reactive
 import charms_openstack
 
 # This charm's library contains all of the handler code associated with
-# cinder-backup-swift -- we need to import it to get the definitions
+# cinder-backup-swift-proxy -- we need to import it to get the definitions
 # for the charm.
 import charm.openstack.cinder_backup_swift  # noqa
 import charms.reactive.flags as flags
diff --git a/src/tests/bundles/bionic-queens-swift-v2.yaml b/src/tests/bundles/bionic-queens-swift-v2.yaml
index d06aeb3..ea19066 100644
--- a/src/tests/bundles/bionic-queens-swift-v2.yaml
+++ b/src/tests/bundles/bionic-queens-swift-v2.yaml
@@ -33,7 +33,7 @@ relations:
 - - cinder-ceph:storage-backend
   - cinder:storage-backend
 - - cinder
-  - cinder-backup-swift
+  - cinder-backup-swift-proxy
 - - ceph-mon:client
   - nova-compute:ceph
 - - nova-compute:ceph-access
@@ -79,9 +79,9 @@ applications:
     series: bionic
     charm: cs:cinder-ceph
     num_units: 0
-  cinder-backup-swift:
+  cinder-backup-swift-proxy:
     series: bionic
-    charm: cinder-backup-swift
+    charm: cinder-backup-swift-proxy
     num_units: 0
     options:
       auth-version: 3
diff --git a/src/tests/bundles/bionic-queens-swift-v3.yaml b/src/tests/bundles/bionic-queens-swift-v3.yaml
index b64d010..c5e653d 100644
--- a/src/tests/bundles/bionic-queens-swift-v3.yaml
+++ b/src/tests/bundles/bionic-queens-swift-v3.yaml
@@ -33,7 +33,7 @@ relations:
 - - cinder-ceph:storage-backend
   - cinder:storage-backend
 - - cinder
-  - cinder-backup-swift
+  - cinder-backup-swift-proxy
 - - ceph-mon:client
   - nova-compute:ceph
 - - nova-compute:ceph-access
@@ -79,9 +79,9 @@ applications:
     series: bionic
     charm: cs:cinder-ceph
     num_units: 0
-  cinder-backup-swift:
+  cinder-backup-swift-proxy:
     series: bionic
-    charm: cinder-backup-swift
+    charm: cinder-backup-swift-proxy
     num_units: 0
     options:
       auth-version: 3
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 9fa74be..8644d85 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,4 +1,4 @@
-charm_name: cinder-backup-swift
+charm_name: cinder-backup-swift-proxy
 gate_bundles:
   - bionic-queens-swift-v3
   - bionic-queens-swift-v2