Merge "Change the default multicast group range"
diff --git a/.zuul.yaml b/.zuul.yaml
index 92d891a..7a3c106 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1255,7 +1255,9 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-rocky
+ # TODO(slaweq): bring rocky jobs back when dropping py27
+ # drama will be finally over
+ # - neutron-tempest-plugin-jobs-rocky
- neutron-tempest-plugin-jobs-stein
- neutron-tempest-plugin-jobs-train
- check-requirements
diff --git a/neutron_tempest_plugin/scenario/test_connectivity.py b/neutron_tempest_plugin/scenario/test_connectivity.py
index 7d72832..5aa8f73 100644
--- a/neutron_tempest_plugin/scenario/test_connectivity.py
+++ b/neutron_tempest_plugin/scenario/test_connectivity.py
@@ -15,6 +15,7 @@
import netaddr
+from neutron_lib import constants
from tempest.common import compute
from tempest.common import utils
from tempest.lib.common.utils import data_utils
@@ -185,10 +186,16 @@
Test ensures that both 10.1.0.1 and 10.1.0.x IP addresses are
reachable from VM.
"""
- ext_network = self.safe_client.show_network(self.external_network_id)
- ext_subnet_id = ext_network['network']['subnets'][0]['id']
- ext_subnet = self.safe_client.show_subnet(ext_subnet_id)
- ext_cidr = ext_subnet['subnet']['cidr']
+ ext_network = self.client.show_network(self.external_network_id)
+ for ext_subnetid in ext_network['network']['subnets']:
+ ext_subnet = self.os_admin.network_client.show_subnet(ext_subnetid)
+ ext_cidr = ext_subnet['subnet']['cidr']
+ if ext_subnet['subnet']['ip_version'] == constants.IP_VERSION_4:
+ break
+ else:
+ self.fail('No IPv4 subnet was found in external network %s' %
+ ext_network['network']['id'])
+
subnet_cidr = ip_utils.find_valid_cidr(used_cidr=ext_cidr)
gw_ip = netaddr.IPAddress(subnet_cidr.first + 1)