Merge "Add a config option for BGP speaker scheduling"

This commit is contained in:
Zuul 2021-11-02 22:31:49 +00:00 committed by Gerrit Code Review
commit 61e802f4de
2 changed files with 10 additions and 1 deletions

View File

@ -141,6 +141,12 @@ NeutronPluginOptions = [
'If True, multicast test(s) will assert that multicast '
'traffic is not being flooded to all ports. Defaults '
'to False.'),
# Option for scheduling BGP speakers to agents explicitly
# The default is false with automatic scheduling on creation
# happening with the default scheduler
cfg.BoolOpt('bgp_schedule_speakers_to_agents',
default=False,
help='Schedule BGP speakers to agents explicitly.'),
]
# TODO(amuller): Redo configuration options registration as part of the planned

View File

@ -25,9 +25,9 @@ from tempest.common import utils
from tempest import config
from neutron_tempest_plugin.api import base
from neutron_tempest_plugin import config as nconfig
from neutron_tempest_plugin.services.bgp import bgp_client
CONF = config.CONF
Scope = collections.namedtuple('Scope', 'name')
@ -149,6 +149,9 @@ class BgpSpeakerScenarioTestJSONBase(base.BaseAdminNetworkTest):
if auto_delete:
self.addCleanup(self.bgp_adm_client.delete_bgp_speaker,
bgp_speaker_id)
if nconfig.CONF.neutron_plugin_options.bgp_schedule_speakers_to_agents:
self.add_bgp_speaker_to_dragent(self.get_dragent_id(),
bgp_speaker_id)
return bgp_speaker['bgp_speaker']
def delete_bgp_speaker(self, id):