From adfc3fb772f8ba1748173ed3f67ecbb46762cb1d Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Thu, 26 Sep 2019 13:30:33 -0500 Subject: [PATCH] Neutron: Ensure test project purge targets correct project This PS updates the test project purge script to target specificly the desired project by its id. Change-Id: I54bfaa7727fdad781bdecc31251c1fe53f912c18 Signed-off-by: Pete Birley --- neutron/templates/bin/_neutron-test-force-cleanup.sh.tpl | 8 +++++--- neutron/templates/pod-rally-test.yaml | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/neutron/templates/bin/_neutron-test-force-cleanup.sh.tpl b/neutron/templates/bin/_neutron-test-force-cleanup.sh.tpl index 12ce3136a7..924eea16fb 100644 --- a/neutron/templates/bin/_neutron-test-force-cleanup.sh.tpl +++ b/neutron/templates/bin/_neutron-test-force-cleanup.sh.tpl @@ -16,7 +16,9 @@ set -ex -if openstack project show "${OS_TEST_PROJECT_NAME}"; then - ospurge --purge-project "${OS_TEST_PROJECT_NAME}" - openstack quota set "${OS_TEST_PROJECT_NAME}" --networks "${NETWORK_QUOTA}" --ports "${PORT_QUOTA}" --routers "${ROUTER_QUOTA}" --subnets "${SUBNET_QUOTA}" --secgroups "${SEC_GROUP_QUOTA}" + +if openstack project show "${OS_TEST_PROJECT_NAME}" --domain="${OS_TEST_PROJECT_DOMAIN_NAME}" ; then + OS_TEST_PROJECT_ID=$(openstack project show "${OS_TEST_PROJECT_NAME}" -f value -c id --domain="${OS_TEST_PROJECT_DOMAIN_NAME}") + ospurge --purge-project "${OS_TEST_PROJECT_ID}" + openstack quota set "${OS_TEST_PROJECT_ID}" --networks "${NETWORK_QUOTA}" --ports "${PORT_QUOTA}" --routers "${ROUTER_QUOTA}" --subnets "${SUBNET_QUOTA}" --secgroups "${SEC_GROUP_QUOTA}" fi diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml index 362d2aa273..1e3c4f15b9 100644 --- a/neutron/templates/pod-rally-test.yaml +++ b/neutron/templates/pod-rally-test.yaml @@ -75,6 +75,8 @@ spec: {{- end }} - name: OS_TEST_PROJECT_NAME value: {{ .Values.endpoints.identity.auth.test.project_name }} + - name: OS_TEST_PROJECT_DOMAIN_NAME + value: {{ .Values.endpoints.identity.auth.test.domain_name }} - name: NETWORK_QUOTA value: {{ (first (index .Values.conf.rally_tests.tests "NeutronNetworks.create_and_delete_networks")).context.quotas.neutron.network | quote }} - name: PORT_QUOTA