Merge "Add method to reserve the external subnet cidrs"

This commit is contained in:
Zuul 2020-11-25 15:16:57 +00:00 committed by Gerrit Code Review
commit e1a07536db
3 changed files with 13 additions and 0 deletions

View File

@ -139,6 +139,17 @@ class BaseNetworkTest(test.BaseTestCase):
cls.network_segment_ranges = []
cls.conntrack_helpers = []
@classmethod
def reserve_external_subnet_cidrs(cls):
client = cls.os_admin.network_client
ext_nets = client.list_networks(
**{"router:external": True})['networks']
for ext_net in ext_nets:
ext_subnets = client.list_subnets(
network_id=ext_net['id'])['subnets']
for ext_subnet in ext_subnets:
cls.reserve_subnet_cidr(ext_subnet['cidr'])
@classmethod
def resource_cleanup(cls):
if CONF.service_available.neutron:

View File

@ -84,6 +84,7 @@ class IPv6Test(base.BaseTempestTestCase):
@tempest_utils.requires_ext(extension="router", service="network")
def resource_setup(cls):
super(IPv6Test, cls).resource_setup()
cls.reserve_external_subnet_cidrs()
cls._setup_basic_resources()
@classmethod

View File

@ -56,6 +56,7 @@ class MetadataTest(base.BaseTempestTestCase):
super(MetadataTest, cls).resource_setup()
cls.rand_name = data_utils.rand_name(
cls.__name__.rsplit('.', 1)[-1])
cls.reserve_external_subnet_cidrs()
cls.network = cls.create_network(name=cls.rand_name)
cls.subnet_v4 = cls.create_subnet(
network=cls.network, name=cls.rand_name)