openstack/neutron-tempest-plugin
Code Issues Proposed changes

Merge "dr: Add option to customize base image"

Browse Source
This commit is contained in:
Zuul 2024-12-04 11:38:22 +00:00 committed by Gerrit Code Review
commit bf916cefcc
7 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
neutron_tempest_plugin/config.py
View File

@ -248,6 +248,21 @@ taas_group = cfg.OptGroup(name='taas',
CONF.register_group(taas_group)
CONF.register_opts(TaasGroup, group="taas")
DynamicRoutingGroup = [
cfg.StrOpt('base_image',
default='quay.io/nf-core/ubuntu:20.04',
help=('Base image used to build the image for connectivity '
'check')),
]
dynamic_routing_group = cfg.OptGroup(
name="dynamic_routing",
title=("Neutron-Dynamic-Routing Service Options"))
CONF.register_group(dynamic_routing_group)
CONF.register_opts(DynamicRoutingGroup, group="dynamic_routing")
# DNS Integration with an External Service
DnsFeatureGroup = [
cfg.IntOpt(

2
neutron_tempest_plugin/neutron_dynamic_routing/scenario/base.py
View File

@ -40,7 +40,6 @@ CHECKTIME = 180
CHECKTIME_INFO = 60
CHECKTIME_INT = 1
BRIDGE_TYPE = ctn_base.BRIDGE_TYPE_DOCKER
BASE_NDR_IMAGE = 'quay.io/nf-core/ubuntu:20.04'
def _setup_client_args(auth_provider):
@ -66,6 +65,7 @@ def _setup_client_args(auth_provider):
class BgpSpeakerScenarioTestJSONBase(base.BaseAdminNetworkTest):
baseimage = CONF.dynamic_routing.base_image
def setUp(self):
self.addCleanup(self.net_resource_cleanup)

2
neutron_tempest_plugin/neutron_dynamic_routing/scenario/basic/base.py
View File

@ -84,7 +84,7 @@ class BgpSpeakerBasicTestJSONBase(base.BgpSpeakerScenarioTestJSONBase):
router_id=cls.L_AS.router_id)
cls.dr.set_addr_info(bridge='br-docker-basic', ipv4=cls.public_gw)
# quagga container
cls.dockerimg = ctn_base.DockerImage(baseimage=base.BASE_NDR_IMAGE)
cls.dockerimg = ctn_base.DockerImage(baseimage=cls.baseimage)
cls.q_img = cls.dockerimg.create_quagga(check_exist=True)
cls.images.append(cls.q_img)
for i in range(cls.RAS_MAX):

2
neutron_tempest_plugin/neutron_dynamic_routing/scenario/basic/test_4byte_asn.py
View File

@ -91,7 +91,7 @@ class BgpSpeaker4byteASNTest(test_base.BgpSpeakerProtoTestBase):
router_id=cls.L_AS.router_id)
cls.dr.set_addr_info(bridge='br-docker-4byte-asn', ipv4=cls.public_gw)
# quagga container
cls.dockerimg = ctn_base.DockerImage(baseimage=base.BASE_NDR_IMAGE)
cls.dockerimg = ctn_base.DockerImage(baseimage=cls.baseimage)
cls.q_img = cls.dockerimg.create_quagga(check_exist=True)
cls.images.append(cls.q_img)
for i in range(cls.RAS_MAX):

2
neutron_tempest_plugin/neutron_dynamic_routing/scenario/ipv4/test_ipv4.py
View File

@ -91,7 +91,7 @@ class BgpSpeakerIpv4Test(test_base.BgpSpeakerProtoTestBase):
router_id=cls.L_AS.router_id)
cls.dr.set_addr_info(bridge='br-docker-ipv4', ipv4=cls.public_gw)
# quagga container
cls.dockerimg = ctn_base.DockerImage(baseimage=base.BASE_NDR_IMAGE)
cls.dockerimg = ctn_base.DockerImage(baseimage=cls.baseimage)
cls.q_img = cls.dockerimg.create_quagga(check_exist=True)
cls.images.append(cls.q_img)
for i in range(cls.RAS_MAX):

2
neutron_tempest_plugin/neutron_dynamic_routing/scenario/ipv6/test_ipv6.py
View File

@ -91,7 +91,7 @@ class BgpSpeakerIpv6Test(test_base.BgpSpeakerProtoTestBase):
router_id=cls.L_AS.router_id)
cls.dr.set_addr_info(bridge='br-docker-ipv6', ipv6=cls.public_gw)
# quagga container
cls.dockerimg = ctn_base.DockerImage(baseimage=base.BASE_NDR_IMAGE)
cls.dockerimg = ctn_base.DockerImage(baseimage=cls.baseimage)
cls.q_img = cls.dockerimg.create_quagga(check_exist=True)
cls.images.append(cls.q_img)
for i in range(cls.RAS_MAX):

6
releasenotes/notes/dynamic-routing-base-image-12e76a6d85411a6d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The new ``[dynamic_routing] base_image`` option has been added. This option
allows customizing the reference of the base container image used for
connectivity check in dynamic routing plugin tests.