openstack/neutron-tempest-plugin
Code Issues Proposed changes

Remove transition logic for old tempest option renaming

Browse Source 
This logic was required to adopt to the renaming in tempest[1] which
was done in 12.0.0 release. Now the minimum tempest version required
is much higher so we no longer need this compatibility consideration.

[1] ed6e586b9f8f0ada10af7711f297afa01b2b7754

Change-Id: I5d13f9146b00b2fcd5c2e96071ab914b8a56a089
This commit is contained in:
Takashi Kajinami 2024-11-23 02:33:10 +09:00
parent 20e6666c81
commit 938f2c7fc8
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron_tempest_plugin/api/base.py
View File

@ -595,15 +595,11 @@ class BaseNetworkTest(test.BaseTestCase):
# Generate subnet CIDRs starting from configured values
ip_version = ip_version or cls._ip_version
if ip_version == const.IP_VERSION_4:
mask_bits = mask_bits or config.safe_get_config_value(
'network', 'project_network_mask_bits')
cidr = netaddr.IPNetwork(config.safe_get_config_value(
'network', 'project_network_cidr'))
mask_bits = mask_bits or CONF.network.project_network_mask_bits
cidr = netaddr.IPNetwork(CONF.network.project_network_cidr)
elif ip_version == const.IP_VERSION_6:
mask_bits = config.safe_get_config_value(
'network', 'project_network_v6_mask_bits')
cidr = netaddr.IPNetwork(config.safe_get_config_value(
'network', 'project_network_v6_cidr'))
mask_bits = CONF.network.project_network_v6_mask_bits
cidr = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
else:
raise ValueError('Invalid IP version: {!r}'.format(ip_version))

4
neutron_tempest_plugin/api/test_routers.py
View File

@ -38,9 +38,9 @@ class RoutersTest(base_routers.BaseRouterTest):
def resource_setup(cls):
super(RoutersTest, cls).resource_setup()
cls.tenant_cidr = (
config.safe_get_config_value('network', 'project_network_cidr')
CONF.network.project_network_cidr
if cls._ip_version == 4 else
config.safe_get_config_value('network', 'project_network_v6_cidr'))
CONF.network.project_network_v6_cidr)
@decorators.idempotent_id('c72c1c0c-2193-4aca-eeee-b1442640eeee')
@tutils.requires_ext(extension="standard-attr-description",

16
neutron_tempest_plugin/config.py
View File

@ -259,19 +259,3 @@ dns_feature_group = cfg.OptGroup(
name='designate_feature_enabled', title='Enabled Designate Features')
CONF.register_group(dns_feature_group)
CONF.register_opts(DnsFeatureGroup, group="designate_feature_enabled")
config_opts_translator = {
'project_network_cidr': 'tenant_network_cidr',
'project_network_v6_cidr': 'tenant_network_v6_cidr',
'project_network_mask_bits': 'tenant_network_mask_bits',
'project_network_v6_mask_bits': 'tenant_network_v6_mask_bits'}
def safe_get_config_value(group, name):
"""Safely get Oslo config opts from Tempest, using old and new names."""
conf_group = getattr(CONF, group)
try:
return getattr(conf_group, name)
except cfg.NoSuchOptError:
return getattr(conf_group, config_opts_translator[name])