dr: Add option to customize base image
Add the option to replace the base image to build the test container image with quagga. This allows users to adjust the image reference according to their environment (eg. in case a local image registry is used). Change-Id: I9ae3ef8bd5d42df801f9ee5b396d785ef42030c7
This commit is contained in:
@@ -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(
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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.
|
||||
Reference in New Issue
Block a user