From 0cb517f0351dcd1b063dc4a8771879c040a170f7 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Tue, 23 Jun 2020 15:53:44 +0200 Subject: [PATCH] Rename charm --- README.md | 2 +- src/README.md | 4 ++-- src/lib/charm/openstack/neutron_arista.py | 2 +- src/metadata.yaml | 2 +- src/tests/bundles/bionic-queens.yaml | 10 +++++----- src/tests/bundles/bionic-rocky.yaml | 10 +++++----- src/tests/bundles/xenial-queens.yaml | 10 +++++----- src/tests/tests.yaml | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 91dd0a4..5e16ba2 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ development and testing, however. tox -e pep8 tox -e py3 tox -e build -cd build/builds/neutron-arista +cd build/builds/neutron-api-plugin-arista export TEST_ARISTA_IMAGE=/tmp/arista-cvx-virt-test.qcow2 tox -e func ``` diff --git a/src/README.md b/src/README.md index a316953..8b18eac 100644 --- a/src/README.md +++ b/src/README.md @@ -13,9 +13,9 @@ To deploy (partial deployment only): juju deploy neutron-api juju deploy neutron-openvswitch - juju deploy neutron-arista + juju deploy neutron-api-plugin-arista - juju add-relation neutron-api neutron-arista + juju add-relation neutron-api neutron-api-plugin-arista juju add-relation neutron-api mysql juju add-relation neutron-api rabbitmq-server juju add-relation neutron-api neutron-openvswitch diff --git a/src/lib/charm/openstack/neutron_arista.py b/src/lib/charm/openstack/neutron_arista.py index 24e8080..8edb84a 100644 --- a/src/lib/charm/openstack/neutron_arista.py +++ b/src/lib/charm/openstack/neutron_arista.py @@ -26,7 +26,7 @@ TEMPLATES = 'templates/' class NeutronAristaCharm(charms_openstack.charm.OpenStackCharm): # Internal name of charm - service_name = name = 'neutron-arista' + service_name = name = 'neutron-api-plugin-arista' # First release supported release = 'queens' diff --git a/src/metadata.yaml b/src/metadata.yaml index ed34f80..5be6804 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -1,4 +1,4 @@ -name: neutron-arista +name: neutron-api-plugin-arista summary: Arista ML2 plugin support for Neutron-API maintainer: Michael Skalka description: | diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index aef0f09..515b47a 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -15,7 +15,7 @@ applications: num_units: 1 neutron-api: - # Temporary fork until we refactor neutron-arista: + # Temporary fork until we refactor neutron-api-plugin-arista: charm: cs:~aurelien-lourot/neutron-api-arista-test-fixture num_units: 1 options: @@ -53,8 +53,8 @@ applications: options: network-manager: Neutron - neutron-arista: - charm: ../../../neutron-arista + neutron-api-plugin-arista: + charm: ../../../neutron-api-plugin-arista num_units: 0 options: # Fake IP, will be set to arista-virt-test-fixture's IP address on test @@ -131,9 +131,9 @@ relations: - - nova-cloud-controller:neutron-api - neutron-api:neutron-api - - neutron-api - - neutron-arista + - neutron-api-plugin-arista - - neutron-api:neutron-plugin-api-subordinate - - neutron-arista:neutron-plugin-api-subordinate + - neutron-api-plugin-arista:neutron-plugin-api-subordinate - - openstack-dashboard - mysql - - openstack-dashboard:identity-service diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index c171fd3..fdb9534 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -19,7 +19,7 @@ applications: num_units: 1 neutron-api: - # Temporary fork until we refactor neutron-arista: + # Temporary fork until we refactor neutron-api-plugin-arista: charm: cs:~aurelien-lourot/neutron-api-arista-test-fixture num_units: 1 options: @@ -59,8 +59,8 @@ applications: openstack-origin: cloud:bionic-rocky network-manager: Neutron - neutron-arista: - charm: ../../../neutron-arista + neutron-api-plugin-arista: + charm: ../../../neutron-api-plugin-arista num_units: 0 options: # Fake IP, will be set to arista-virt-test-fixture's IP address on test @@ -140,9 +140,9 @@ relations: - - nova-cloud-controller:neutron-api - neutron-api:neutron-api - - neutron-api - - neutron-arista + - neutron-api-plugin-arista - - neutron-api:neutron-plugin-api-subordinate - - neutron-arista:neutron-plugin-api-subordinate + - neutron-api-plugin-arista:neutron-plugin-api-subordinate - - openstack-dashboard - mysql - - openstack-dashboard:identity-service diff --git a/src/tests/bundles/xenial-queens.yaml b/src/tests/bundles/xenial-queens.yaml index 803b9cc..d69194f 100644 --- a/src/tests/bundles/xenial-queens.yaml +++ b/src/tests/bundles/xenial-queens.yaml @@ -19,7 +19,7 @@ applications: num_units: 1 neutron-api: - # Temporary fork until we refactor neutron-arista: + # Temporary fork until we refactor neutron-api-plugin-arista: charm: cs:~aurelien-lourot/neutron-api-arista-test-fixture num_units: 1 options: @@ -59,8 +59,8 @@ applications: openstack-origin: cloud:xenial-queens network-manager: Neutron - neutron-arista: - charm: ../../../neutron-arista + neutron-api-plugin-arista: + charm: ../../../neutron-api-plugin-arista num_units: 0 options: # Fake IP, will be set to arista-virt-test-fixture's IP address on test @@ -140,9 +140,9 @@ relations: - - nova-cloud-controller:neutron-api - neutron-api:neutron-api - - neutron-api - - neutron-arista + - neutron-api-plugin-arista - - neutron-api:neutron-plugin-api-subordinate - - neutron-arista:neutron-plugin-api-subordinate + - neutron-api-plugin-arista:neutron-plugin-api-subordinate - - openstack-dashboard - mysql - - openstack-dashboard:identity-service diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4804456..721ecee 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,4 +1,4 @@ -charm_name: neutron-arista +charm_name: neutron-api-plugin-arista smoke_bundles: - bionic-queens gate_bundles: