openstack
/
neutron-tempest-plugin
Code Issues Proposed changes

Merge "Makes "segmentation_id" configurable"

This commit is contained in:
Zuul 2024-03-05 12:12:47 +00:00 committed by Gerrit Code Review
parent 9c55bfc364 88d1d5752a
commit 20549ceb92
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron_tempest_plugin/config.py
View File

@ -242,6 +242,17 @@ taas_group = cfg.OptGroup(name='taas',
CONF.register_group(taas_group)
CONF.register_opts(TaasGroup, group="taas")
# DNS Integration with an External Service
DnsFeatureGroup = [
cfg.IntOpt(
'segmentation_id', default=12345,
help="For network types VLAN, GRE, VXLAN or GENEVE, the segmentation"
" ID must be outside the ranges assigned to project networks."),
]
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',

9
neutron_tempest_plugin/scenario/test_dns_integration.py
View File

@ -212,11 +212,10 @@ class DNSIntegrationAdminTests(BaseDNSIntegrationTests,
@classmethod
def resource_setup(cls):
super(DNSIntegrationAdminTests, cls).resource_setup()
# TODO(jh): We should add the segmentation_id as tempest option
# so that it can be changed to match the deployment if needed
cls.network2 = cls.create_network(dns_domain=cls.zone['name'],
provider_network_type='vxlan',
provider_segmentation_id=12345)
segmentation_id = CONF.designate_feature_enabled.segmentation_id
cls.network2 = cls.create_network(
dns_domain=cls.zone['name'], provider_network_type='vxlan',
provider_segmentation_id=segmentation_id)
cls.subnet2 = cls.create_subnet(cls.network2)
def _verify_dns_assignment(self, port):