openstack/neutron
Code Issues Proposed changes

Merge "Update `filter_existing_chassis` signature and make it static"

Browse Source
This commit is contained in:
Zuul 2025-05-06 10:17:27 +00:00 committed by Gerrit Code Review
commit 72912c1e16
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/commands.py
View File

@ -437,8 +437,7 @@ class ScheduleUnhostedGatewaysCommand(command.BaseCommand):
az_hints = self.api.get_gateway_chassis_az_hints(self.g_name)
filtered_existing_chassis = (
self.scheduler.filter_existing_chassis(
nb_idl=self.api, gw_chassis=self.all_gw_chassis,
physnet=physnet,
gw_chassis=self.all_gw_chassis, physnet=physnet,
chassis_physnets=self.chassis_with_physnets,
existing_chassis=existing_chassis, az_hints=az_hints,
chassis_with_azs=self.chassis_with_azs))

4
neutron/scheduler/l3_ovn_scheduler.py
View File

@ -40,8 +40,8 @@ class OVNGatewayScheduler(metaclass=abc.ABCMeta):
scheduled.
"""
def filter_existing_chassis(self, nb_idl, gw_chassis,
physnet, chassis_physnets,
@staticmethod
def filter_existing_chassis(gw_chassis, physnet, chassis_physnets,
existing_chassis, az_hints, chassis_with_azs):
chassis_list = copy.copy(existing_chassis)
for chassis_name in existing_chassis or []:

13
neutron/tests/unit/scheduler/test_l3_ovn_scheduler.py
View File

@ -118,8 +118,7 @@ class TestOVNGatewayScheduler(base.BaseTestCase):
def filter_existing_chassis(self, *args, **kwargs):
return self.l3_scheduler.filter_existing_chassis(
nb_idl=kwargs.pop('nb_idl'), gw_chassis=kwargs.pop('gw_chassis'),
physnet=kwargs.pop('physnet'),
gw_chassis=kwargs.pop('gw_chassis'), physnet=kwargs.pop('physnet'),
chassis_physnets=kwargs.pop('chassis_physnets'),
existing_chassis=kwargs.pop('existing_chassis'),
az_hints=kwargs.pop('az_hints', []),
@ -171,26 +170,24 @@ class OVNGatewayChanceScheduler(TestOVNGatewayScheduler):
# it from Base class didnt seem right. Also, there is no need to have
# another test in LeastLoadedScheduler.
chassis_physnets = {'temp': ['phys-network-0', 'phys-network-1']}
nb_idl = FakeOVNGatewaySchedulerNbOvnIdl(
self.fake_chassis_gateway_mappings['None'], 'g1')
# Check if invalid chassis is removed
self.assertEqual(
['temp'], self.filter_existing_chassis(
nb_idl=nb_idl, gw_chassis=["temp"],
gw_chassis=["temp"],
physnet='phys-network-1',
chassis_physnets=chassis_physnets,
existing_chassis=['temp', None]))
# Check if invalid is removed -II
self.assertFalse(
self.filter_existing_chassis(
nb_idl=nb_idl, gw_chassis=["temp"],
gw_chassis=["temp"],
physnet='phys-network-1',
chassis_physnets=chassis_physnets,
existing_chassis=None))
# Check if chassis removed when physnet doesnt exist
self.assertFalse(
self.filter_existing_chassis(
nb_idl=nb_idl, gw_chassis=["temp"],
gw_chassis=["temp"],
physnet='phys-network-2',
chassis_physnets=chassis_physnets,
existing_chassis=['temp']))
@ -198,7 +195,7 @@ class OVNGatewayChanceScheduler(TestOVNGatewayScheduler):
# or in chassis_physnets
self.assertFalse(
self.filter_existing_chassis(
nb_idl=nb_idl, gw_chassis=["temp1"],
gw_chassis=["temp1"],
physnet='phys-network-2',
chassis_physnets=chassis_physnets,
existing_chassis=['temp']))