Merge "Implement nested snat validation test scenario"
diff --git a/neutron_tempest_plugin/api/base.py b/neutron_tempest_plugin/api/base.py
index e260313..e17cf5e 100644
--- a/neutron_tempest_plugin/api/base.py
+++ b/neutron_tempest_plugin/api/base.py
@@ -1544,7 +1544,9 @@
pagination_args['marker'] = resources[-1]['id']
body = self.list_method(**pagination_args)
resources_ = self._extract_resources(body)
- self.assertEqual(1, len(resources_))
+ # Empty resource list can be returned when any concurrent
+ # tests delete them
+ self.assertGreaterEqual(1, len(resources_))
resources.extend(resources_)
return self._test_resources(resources)
@@ -1569,7 +1571,9 @@
self.plural_name, uri
)
resources_ = self._extract_resources(body)
- self.assertEqual(1, len(resources_))
+ # Empty resource list can be returned when any concurrent
+ # tests delete them
+ self.assertGreaterEqual(1, len(resources_))
resources.extend(self._test_resources(resources_))
# The last element is empty and does not contain 'next' link
@@ -1587,7 +1591,9 @@
self.plural_name, uri
)
resources_ = self._extract_resources(body)
- self.assertEqual(1, len(resources_))
+ # Empty resource list can be returned when any concurrent
+ # tests delete them
+ self.assertGreaterEqual(1, len(resources_))
resources2.extend(self._test_resources(resources_))
self.assertSameOrder(resources, reversed(resources2))
diff --git a/neutron_tempest_plugin/scenario/test_floatingip.py b/neutron_tempest_plugin/scenario/test_floatingip.py
index 24e5820..9b7bfcc 100644
--- a/neutron_tempest_plugin/scenario/test_floatingip.py
+++ b/neutron_tempest_plugin/scenario/test_floatingip.py
@@ -18,7 +18,6 @@
import ddt
from neutron_lib import constants as lib_constants
from neutron_lib.services.qos import constants as qos_consts
-from neutron_lib.utils import test
from oslo_log import log
from tempest.common import utils
from tempest.common import waiters
@@ -147,7 +146,6 @@
same_network = True
- @test.unstable_test("bug 1717302")
@decorators.idempotent_id('05c4e3b3-7319-4052-90ad-e8916436c23b')
@ddt.unpack
@ddt.data({'src_has_fip': True, 'dest_has_fip': True},
@@ -165,7 +163,6 @@
same_network = False
- @test.unstable_test("bug 1717302")
@decorators.idempotent_id('f18f0090-3289-4783-b956-a0f8ac511e8b')
@ddt.unpack
@ddt.data({'src_has_fip': True, 'dest_has_fip': True},
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 3695565..9688954 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -1180,7 +1180,9 @@
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_sfc) | join(',') }}"
- NEUTRON_DEPLOY_MOD_WSGI: true
+ # TODO(slaweq): Switch it back to be deployed with mod_wsgi as soon as
+ # bug with RPC worker will be resolved
+ NEUTRON_DEPLOY_MOD_WSGI: false
# TODO(bcafarel): tests still fail from time to time in parallel
# https://bugs.launchpad.net/neutron/+bug/1851500
# https://bugs.launchpad.net/networking-sfc/+bug/1660366
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 9a20f80..35f3384 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -190,10 +190,7 @@
- release-notes-jobs-python3
check:
jobs:
- - neutron-tempest-plugin-sfc:
- # Note(lajoskatona): make it voting when #2068727
- # is fixed.
- voting: false
+ - neutron-tempest-plugin-sfc
- neutron-tempest-plugin-sfc-2023-1
- neutron-tempest-plugin-sfc-2023-2
- neutron-tempest-plugin-sfc-2024-1
@@ -221,6 +218,7 @@
gate:
jobs:
+ - neutron-tempest-plugin-sfc
- neutron-tempest-plugin-bgpvpn-bagpipe
- neutron-tempest-plugin-dynamic-routing
- neutron-tempest-plugin-fwaas