Merge "Add iptables and listening sockets to debug info"
diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py
index b96eac4..8591c89 100644
--- a/neutron_tempest_plugin/scenario/base.py
+++ b/neutron_tempest_plugin/scenario/base.py
@@ -206,9 +206,30 @@
else:
router = cls.create_admin_router(**kwargs)
LOG.debug("Created router %s", router['name'])
+ cls._wait_for_router_ha_active(router['id'])
return router
@classmethod
+ def _wait_for_router_ha_active(cls, router_id):
+ router = cls.os_admin.network_client.show_router(router_id)['router']
+ if not router.get('ha'):
+ return
+
+ def _router_active_on_l3_agent():
+ agents = cls.os_admin.network_client.list_l3_agents_hosting_router(
+ router_id)['agents']
+ return "active" in [agent['ha_state'] for agent in agents]
+
+ error_msg = (
+ "Router %s is not active on any of the L3 agents" % router_id)
+ # NOTE(slaweq): timeout here should be lower for sure, but due to
+ # the bug https://launchpad.net/bugs/1923633 let's wait even 10
+ # minutes until router will be active on some of the L3 agents
+ utils.wait_until_true(_router_active_on_l3_agent,
+ timeout=600, sleep=5,
+ exception=lib_exc.TimeoutException(error_msg))
+
+ @classmethod
def skip_if_no_extension_enabled_in_l3_agents(cls, extension):
l3_agents = cls.os_admin.network_client.list_agents(
binary='neutron-l3-agent')['agents']
diff --git a/neutron_tempest_plugin/scenario/test_basic.py b/neutron_tempest_plugin/scenario/test_basic.py
index 38bc40b..7583f88 100644
--- a/neutron_tempest_plugin/scenario/test_basic.py
+++ b/neutron_tempest_plugin/scenario/test_basic.py
@@ -24,7 +24,7 @@
class NetworkBasicTest(base.BaseTempestTestCase):
- credentials = ['primary']
+ credentials = ['primary', 'admin']
force_tenant_isolation = False
# Default to ipv4.
diff --git a/neutron_tempest_plugin/scenario/test_connectivity.py b/neutron_tempest_plugin/scenario/test_connectivity.py
index 66c4789..ca7d755 100644
--- a/neutron_tempest_plugin/scenario/test_connectivity.py
+++ b/neutron_tempest_plugin/scenario/test_connectivity.py
@@ -88,6 +88,8 @@
ap2_rt = self.create_router(
router_name=data_utils.rand_name("ap2_rt"),
admin_state_up=True)
+ self._wait_for_router_ha_active(ap1_rt['id'])
+ self._wait_for_router_ha_active(ap2_rt['id'])
ap1_internal_port = self.create_port(
ap1_net, security_groups=[self.secgroup['id']])
@@ -140,6 +142,7 @@
router_name=data_utils.rand_name("east_west_traffic_router"),
admin_state_up=True,
external_network_id=CONF.network.public_network_id)
+ self._wait_for_router_ha_active(router['id'])
internal_port_1 = self.create_port(
net_1, security_groups=[self.secgroup['id']])
diff --git a/neutron_tempest_plugin/scenario/test_internal_dns.py b/neutron_tempest_plugin/scenario/test_internal_dns.py
index 406af3d..c0a2c04 100644
--- a/neutron_tempest_plugin/scenario/test_internal_dns.py
+++ b/neutron_tempest_plugin/scenario/test_internal_dns.py
@@ -24,6 +24,7 @@
class InternalDNSTest(base.BaseTempestTestCase):
+ credentials = ['primary', 'admin']
@utils.requires_ext(extension="dns-integration", service="network")
@decorators.idempotent_id('988347de-07af-471a-abfa-65aea9f452a6')
diff --git a/neutron_tempest_plugin/scenario/test_multicast.py b/neutron_tempest_plugin/scenario/test_multicast.py
index b0da235..7c1fd2d 100644
--- a/neutron_tempest_plugin/scenario/test_multicast.py
+++ b/neutron_tempest_plugin/scenario/test_multicast.py
@@ -122,7 +122,7 @@
class BaseMulticastTest(object):
- credentials = ['primary']
+ credentials = ['primary', 'admin']
force_tenant_isolation = False
# Import configuration options
diff --git a/neutron_tempest_plugin/scenario/test_ports.py b/neutron_tempest_plugin/scenario/test_ports.py
index b3aeb87..fb2d2b0 100644
--- a/neutron_tempest_plugin/scenario/test_ports.py
+++ b/neutron_tempest_plugin/scenario/test_ports.py
@@ -28,7 +28,7 @@
class PortsTest(base.BaseTempestTestCase):
- credentials = ['primary']
+ credentials = ['primary', 'admin']
@classmethod
def resource_setup(cls):
diff --git a/neutron_tempest_plugin/scenario/test_portsecurity.py b/neutron_tempest_plugin/scenario/test_portsecurity.py
index 257627c..c90db08 100644
--- a/neutron_tempest_plugin/scenario/test_portsecurity.py
+++ b/neutron_tempest_plugin/scenario/test_portsecurity.py
@@ -21,7 +21,7 @@
class PortSecurityTest(base.BaseTempestTestCase):
- credentials = ['primary']
+ credentials = ['primary', 'admin']
required_extensions = ['port-security']
@decorators.idempotent_id('61ab176e-d48b-42b7-b38a-1ba571ecc033')
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 7ee20dc..04fe323 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -7,7 +7,6 @@
roles:
- zuul: openstack/devstack
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- openstack/neutron-tempest-plugin
- openstack/tempest
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 4f32c5e..db37fad 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -452,7 +452,6 @@
roles:
- zuul: openstack/devstack
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- openstack/neutron-tempest-plugin
- openstack/tempest
@@ -681,7 +680,6 @@
parent: neutron-tempest-plugin-base
timeout: 10800
required-projects:
- - openstack/devstack-gate
- openstack/networking-sfc
- openstack/neutron
- openstack/neutron-tempest-plugin
@@ -773,7 +771,6 @@
parent: neutron-tempest-plugin-base
timeout: 3900
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- openstack/neutron-vpnaas
- openstack/neutron-tempest-plugin
diff --git a/zuul.d/queens_jobs.yaml b/zuul.d/queens_jobs.yaml
index b4c22bc..33430c8 100644
--- a/zuul.d/queens_jobs.yaml
+++ b/zuul.d/queens_jobs.yaml
@@ -4,7 +4,6 @@
parent: neutron-tempest-plugin-api
override-checkout: stable/queens
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 0.3.0
@@ -115,7 +114,6 @@
nodeset: openstack-single-node-xenial
override-checkout: stable/queens
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 0.3.0
@@ -152,7 +150,6 @@
- zuul: openstack/neutron
override-checkout: stable/queens
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 0.3.0
@@ -203,7 +200,6 @@
nodeset: openstack-two-node-xenial
override-checkout: stable/queens
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 0.3.0
@@ -229,7 +225,6 @@
nodeset: openstack-single-node-xenial
override-checkout: stable/queens
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 0.3.0
diff --git a/zuul.d/rocky_jobs.yaml b/zuul.d/rocky_jobs.yaml
index 718369a..0cc84a7 100644
--- a/zuul.d/rocky_jobs.yaml
+++ b/zuul.d/rocky_jobs.yaml
@@ -6,7 +6,6 @@
This job run on py2 for stable/rocky gate.
override-checkout: stable/rocky
required-projects: &required-projects-rocky
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 0.9.0
@@ -342,7 +341,6 @@
nodeset: openstack-single-node-xenial
override-checkout: stable/rocky
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 0.9.0
diff --git a/zuul.d/stein_jobs.yaml b/zuul.d/stein_jobs.yaml
index 8db4508..28729a4 100644
--- a/zuul.d/stein_jobs.yaml
+++ b/zuul.d/stein_jobs.yaml
@@ -4,7 +4,6 @@
nodeset: openstack-single-node-bionic
override-checkout: stable/stein
required-projects: &required-projects-stein
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 1.3.0
@@ -209,7 +208,6 @@
nodeset: openstack-single-node-bionic
override-checkout: stable/stein
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- name: openstack/neutron-tempest-plugin
override-checkout: 1.3.0
diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml
index 88f64b6..945ec25 100644
--- a/zuul.d/ussuri_jobs.yaml
+++ b/zuul.d/ussuri_jobs.yaml
@@ -263,7 +263,6 @@
timeout: 10800
override-checkout: stable/ussuri
required-projects:
- - openstack/devstack-gate
- openstack/neutron-fwaas
- openstack/neutron
- openstack/neutron-tempest-plugin