Update filter_existing_chassis signature and make it static

Partial-Bug: #2092271
Change-Id: Iafd1edcda72720bcd185d9d232de8e8e03a7cbff

Author: ralonsoh

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/commands.py

@@ -392,8 +392,7 @@ def run_idl(self, txn):
         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))

neutron/scheduler/l3_ovn_scheduler.py

@@ -40,8 +40,8 @@ def select(self, nb_idl, sb_idl, gateway_name, candidates=None,
         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 []:

neutron/tests/unit/scheduler/test_l3_ovn_scheduler.py

@@ -118,8 +118,7 @@ def select(self, chassis_gateway_mapping, gateway_name,
 
     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,34 +170,32 @@ def test_filter_existing_chassis(self):
         # 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']))
         # Check if chassis removed when it doesnt exist in gw_chassis
         # 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']))