From a5cdede38739b52340d204ebe57c63638a19dcca Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Wed, 23 Jun 2021 09:37:04 +0200 Subject: [PATCH] Fix required extensions for the subnet's service type API tests In [1] new tests for subnet service types were added but by mistake 'service-types' was set as API extension required for those tests. In fact this API feature in the subnet is provided by the 'subnet-service-types' extension and this should be required for that tests. This patch also adds "subnet-service-types" extension to the Tempest conf in jobs for all branches up to stable/queens becuase this API extension was available in Neutron since queens for sure so it's safe to add it there. [1] https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/787718 Related-Bug: #1933115 Change-Id: I2b9b472a07455f5e67fc4adcc3b264b4ad8a9dbf --- neutron_tempest_plugin/api/test_subnets.py | 2 +- zuul.d/master_jobs.yaml | 1 + zuul.d/queens_jobs.yaml | 1 + zuul.d/rocky_jobs.yaml | 1 + zuul.d/stein_jobs.yaml | 1 + zuul.d/train_jobs.yaml | 1 + zuul.d/ussuri_jobs.yaml | 1 + zuul.d/victoria_jobs.yaml | 1 + zuul.d/wallaby_jobs.yaml | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/neutron_tempest_plugin/api/test_subnets.py b/neutron_tempest_plugin/api/test_subnets.py index a866a09d3..d4992d354 100644 --- a/neutron_tempest_plugin/api/test_subnets.py +++ b/neutron_tempest_plugin/api/test_subnets.py @@ -74,7 +74,7 @@ class SubnetsSearchCriteriaTest(base.BaseSearchCriteriaTest): class SubnetServiceTypeTestJSON(base.BaseNetworkTest): - required_extensions = ['service-type'] + required_extensions = ['subnet-service-types'] @classmethod def resource_setup(cls): diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml index 4d4b15276..5f8d08f6a 100644 --- a/zuul.d/master_jobs.yaml +++ b/zuul.d/master_jobs.yaml @@ -75,6 +75,7 @@ - standard-attr-timestamp - subnet_allocation - subnet-dns-publish-fixed-ip + - subnet-service-types - subnetpool-prefix-ops - tag-ports-during-bulk-creation - trunk diff --git a/zuul.d/queens_jobs.yaml b/zuul.d/queens_jobs.yaml index 33430c854..970154857 100644 --- a/zuul.d/queens_jobs.yaml +++ b/zuul.d/queens_jobs.yaml @@ -75,6 +75,7 @@ - standard-attr-timestamp - standard-attr-tag - subnet_allocation + - subnet-service-types - trunk - trunk-details network_api_extensions_tempest: diff --git a/zuul.d/rocky_jobs.yaml b/zuul.d/rocky_jobs.yaml index c5ccbc0b2..11e4c9ae5 100644 --- a/zuul.d/rocky_jobs.yaml +++ b/zuul.d/rocky_jobs.yaml @@ -84,6 +84,7 @@ - standard-attr-timestamp - standard-attr-tag - subnet_allocation + - subnet-service-types - trunk - trunk-details network_api_extensions_tempest: diff --git a/zuul.d/stein_jobs.yaml b/zuul.d/stein_jobs.yaml index 7a8ea25e4..40bca7cff 100644 --- a/zuul.d/stein_jobs.yaml +++ b/zuul.d/stein_jobs.yaml @@ -88,6 +88,7 @@ - standard-attr-tag - standard-attr-timestamp - subnet_allocation + - subnet-service-types - trunk - trunk-details - uplink-status-propagation diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml index b87dc8c82..a623251aa 100644 --- a/zuul.d/train_jobs.yaml +++ b/zuul.d/train_jobs.yaml @@ -92,6 +92,7 @@ - standard-attr-tag - standard-attr-timestamp - subnet_allocation + - subnet-service-types - subnetpool-prefix-ops - trunk - trunk-details diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml index 945ec258a..5c5881e7d 100644 --- a/zuul.d/ussuri_jobs.yaml +++ b/zuul.d/ussuri_jobs.yaml @@ -90,6 +90,7 @@ - standard-attr-timestamp - subnet_allocation - subnet-dns-publish-fixed-ip + - subnet-service-types - subnetpool-prefix-ops - tag-ports-during-bulk-creation - trunk diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml index e0e29ed74..832d242a3 100644 --- a/zuul.d/victoria_jobs.yaml +++ b/zuul.d/victoria_jobs.yaml @@ -89,6 +89,7 @@ - standard-attr-timestamp - subnet_allocation - subnet-dns-publish-fixed-ip + - subnet-service-types - subnetpool-prefix-ops - tag-ports-during-bulk-creation - trunk diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml index fa2ddb616..13a192e63 100644 --- a/zuul.d/wallaby_jobs.yaml +++ b/zuul.d/wallaby_jobs.yaml @@ -76,6 +76,7 @@ - standard-attr-timestamp - subnet_allocation - subnet-dns-publish-fixed-ip + - subnet-service-types - subnetpool-prefix-ops - tag-ports-during-bulk-creation - trunk