From ed5a30eb2874eaaeb0c53b5a92a44b8ea14b2da0 Mon Sep 17 00:00:00 2001 From: Andrew McLeod Date: Mon, 25 Nov 2019 12:24:53 +0100 Subject: [PATCH 1/5] add working v2 test back --- src/tests/bundles/bionic-queens-swift-v2.yaml | 151 ++++++++++++++++++ src/tests/tests.yaml | 3 + 2 files changed, 154 insertions(+) create mode 100644 src/tests/bundles/bionic-queens-swift-v2.yaml diff --git a/src/tests/bundles/bionic-queens-swift-v2.yaml b/src/tests/bundles/bionic-queens-swift-v2.yaml new file mode 100644 index 0000000..d06aeb3 --- /dev/null +++ b/src/tests/bundles/bionic-queens-swift-v2.yaml @@ -0,0 +1,151 @@ +series: bionic +relations: +- - nova-compute:amqp + - rabbitmq-server:amqp +- - keystone:shared-db + - mysql:shared-db +- - nova-cloud-controller:identity-service + - keystone:identity-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - mysql:shared-db +- - glance:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:image-service + - glance:image-service +- - nova-compute:image-service + - glance:image-service +- - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute +- - nova-cloud-controller:amqp + - rabbitmq-server:amqp +- - nova-cloud-controller:shared-db + - mysql:shared-db +- - cinder:image-service + - glance:image-service +- - cinder:amqp + - rabbitmq-server:amqp +- - cinder:identity-service + - keystone:identity-service +- - cinder:cinder-volume-service + - nova-cloud-controller:cinder-volume-service +- - cinder-ceph:storage-backend + - cinder:storage-backend +- - cinder + - cinder-backup-swift +- - ceph-mon:client + - nova-compute:ceph +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - cinder:shared-db + - mysql:shared-db +- - ceph-mon:client + - cinder-ceph:ceph +- - ceph-mon:client + - glance:ceph +- - ceph-osd:mon + - ceph-mon:osd + +# external swift service +- - swift-keystone:shared-db + - swift-mysql:shared-db +- - swift-proxy:identity-service + - swift-keystone:identity-service +- - swift-proxy:swift-storage + - swift-storage:swift-storage + +applications: + ceph-mon: + series: bionic + charm: cs:ceph-mon + num_units: 3 + options: + monitor-count: '3' + ceph-osd: + series: bionic + charm: cs:ceph-osd + num_units: 3 + storage: + osd-devices: 'cinder,10G' + cinder: + series: bionic + charm: cs:cinder + num_units: 1 + options: + block-device: None + glance-api-version: 2 + cinder-ceph: + series: bionic + charm: cs:cinder-ceph + num_units: 0 + cinder-backup-swift: + series: bionic + charm: cinder-backup-swift + num_units: 0 + options: + auth-version: 3 + swift-user: admin + swift-key: openstack + user-domain: admin_domain + project-domain: admin_domain + project-name: admin + glance: + series: bionic + charm: cs:glance + num_units: 1 + keystone: + series: bionic + charm: cs:keystone + num_units: 1 + mysql: + series: bionic + charm: cs:percona-cluster + num_units: 1 + options: + dataset-size: 25% + max-connections: 1000 + nova-cloud-controller: + series: bionic + charm: cs:nova-cloud-controller + num_units: 1 + rabbitmq-server: + series: bionic + charm: cs:rabbitmq-server + num_units: 1 + nova-compute: + series: bionic + charm: cs:nova-compute + num_units: 1 + +# external swift + swift-keystone: + series: xenial + charm: cs:keystone + num_units: 1 + options: + admin-password: openstack + preferred-api-version: 3 + swift-mysql: + series: xenial + charm: cs:percona-cluster + num_units: 1 + options: + dataset-size: 25% + max-connections: 1000 + swift-proxy: + series: xenial + charm: cs:swift-proxy + num_units: 1 + options: + zone-assignment: manual + replicas: 1 + swift-storage: + series: xenial + charm: cs:swift-storage + num_units: 1 + options: + zone: 1 + storage: + block-devices: 'cinder,10G' + diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index d29db12..9fa74be 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,9 +1,12 @@ charm_name: cinder-backup-swift gate_bundles: - bionic-queens-swift-v3 + - bionic-queens-swift-v2 smoke_bundles: - bionic-queens-swift-v3 + - bionic-queens-swift-v2 configure: - zaza.openstack.charm_tests.cinder_backup_swift.setup.configure_cinder_backup tests: - zaza.openstack.charm_tests.cinder_backup_swift.tests.CinderBackupSwiftTest + From 72ddd4907097e9832029bb57fa4ba2235cd6fda8 Mon Sep 17 00:00:00 2001 From: Andrew McLeod Date: Tue, 26 Nov 2019 14:13:54 +0100 Subject: [PATCH 2/5] rename charm --- 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 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 From 2416410bda56a82f70e063d978e6e18ef9abf379 Mon Sep 17 00:00:00 2001 From: Andrew McLeod Date: Tue, 26 Nov 2019 17:04:53 +0100 Subject: [PATCH 3/5] fix --- src/tests/bundles/bionic-queens-swift-v2.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tests/bundles/bionic-queens-swift-v2.yaml b/src/tests/bundles/bionic-queens-swift-v2.yaml index 6b14244..ea19066 100644 --- a/src/tests/bundles/bionic-queens-swift-v2.yaml +++ b/src/tests/bundles/bionic-queens-swift-v2.yaml @@ -33,11 +33,7 @@ relations: - - cinder-ceph:storage-backend - cinder:storage-backend - - cinder -<<<<<<< HEAD - cinder-backup-swift-proxy -======= - - cinder-backup-swift ->>>>>>> master - - ceph-mon:client - nova-compute:ceph - - nova-compute:ceph-access From e4dd48b1d9496e62d321394f3187cbda5bb9eb05 Mon Sep 17 00:00:00 2001 From: Andrew McLeod Date: Thu, 28 Nov 2019 15:55:14 +0100 Subject: [PATCH 4/5] update rename --- src/reactive/cinder_backup_swift_handlers.py | 2 +- src/tests/tests.yaml | 4 ++-- unit_tests/test_lib_charm_openstack_cinder_backup_swift.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/reactive/cinder_backup_swift_handlers.py b/src/reactive/cinder_backup_swift_handlers.py index f2bbe7a..7c1bcc6 100644 --- a/src/reactive/cinder_backup_swift_handlers.py +++ b/src/reactive/cinder_backup_swift_handlers.py @@ -5,7 +5,7 @@ import charms_openstack # This charm's library contains all of the handler code associated with # cinder-backup-swift-proxy -- we need to import it to get the definitions # for the charm. -import charm.openstack.cinder_backup_swift # noqa +import charm.openstack.cinder_backup_swift_proxy # noqa import charms.reactive.flags as flags from charms.reactive.relations import ( endpoint_from_flag, diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 8644d85..e425c11 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -6,7 +6,7 @@ smoke_bundles: - bionic-queens-swift-v3 - bionic-queens-swift-v2 configure: - - zaza.openstack.charm_tests.cinder_backup_swift.setup.configure_cinder_backup + - zaza.openstack.charm_tests.cinder_backup_swift_proxy.setup.configure_cinder_backup tests: - - zaza.openstack.charm_tests.cinder_backup_swift.tests.CinderBackupSwiftTest + - zaza.openstack.charm_tests.cinder_backup_swift_proxy.tests.CinderBackupSwiftTest diff --git a/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py b/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py index a50de0d..b0bceb4 100644 --- a/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py +++ b/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py @@ -14,19 +14,19 @@ from __future__ import absolute_import from __future__ import print_function import charms_openstack.test_utils as test_utils -import charm.openstack.cinder_backup_swift as cinder_backup_swift +import charm.openstack.cinder_backup_swift_proxy as cinder_backup_swift_proxy class Helper(test_utils.PatchHelper): def setUp(self): super().setUp() - self.patch_release(cinder_backup_swift.CinderBackupSwiftCharm.release) + self.patch_release(cinder_backup_swift_proxy.CinderBackupSwiftCharm.release) class TestCinderBackupSwiftCharm(Helper): def test_swift_backup_name(self): - c = cinder_backup_swift.CinderBackupSwiftCharm() + c = cinder_backup_swift_proxy.CinderBackupSwiftCharm() result = c.get_swift_backup_config() self.assertEqual(result[0], 'cinder-backup') From 06d2eff3f5b88dbbe19c3c26369edcf9ee16c69f Mon Sep 17 00:00:00 2001 From: Andrew McLeod Date: Thu, 28 Nov 2019 15:58:15 +0100 Subject: [PATCH 5/5] fix unit tests and pep8 --- .../{cinder_backup_swift.py => cinder_backup_swift_proxy.py} | 0 unit_tests/test_lib_charm_openstack_cinder_backup_swift.py | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename src/lib/charm/openstack/{cinder_backup_swift.py => cinder_backup_swift_proxy.py} (100%) diff --git a/src/lib/charm/openstack/cinder_backup_swift.py b/src/lib/charm/openstack/cinder_backup_swift_proxy.py similarity index 100% rename from src/lib/charm/openstack/cinder_backup_swift.py rename to src/lib/charm/openstack/cinder_backup_swift_proxy.py diff --git a/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py b/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py index b0bceb4..b61fe55 100644 --- a/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py +++ b/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py @@ -21,7 +21,8 @@ class Helper(test_utils.PatchHelper): def setUp(self): super().setUp() - self.patch_release(cinder_backup_swift_proxy.CinderBackupSwiftCharm.release) + self.patch_release( + cinder_backup_swift_proxy.CinderBackupSwiftCharm.release) class TestCinderBackupSwiftCharm(Helper):