Remove Client Side Batching

main.py

@@ -872,24 +872,16 @@ def handle_link_down(self, event):
             emit_event(self.controller, "failover_link_down",
                        content=failover_event_contents)
 
-        while switch_flows:
-            offset = settings.BATCH_SIZE or None
-            switches = list(switch_flows.keys())
-            for dpid in switches:
-                emit_event(
-                    self.controller,
-                    context="kytos.flow_manager",
-                    name="flows.install",
-                    content={
-                        "dpid": dpid,
-                        "flow_dict": {"flows": switch_flows[dpid][:offset]},
-                    }
-                )
-                if offset is None or offset >= len(switch_flows[dpid]):
-                    del switch_flows[dpid]
-                    continue
-                switch_flows[dpid] = switch_flows[dpid][offset:]
-            time.sleep(settings.BATCH_INTERVAL)
+        for dpid, flows in switch_flows.items():
+            emit_event(
+                self.controller,
+                context="kytos.flow_manager",
+                name="flows.install",
+                content={
+                    "dpid": dpid,
+                    "flow_dict": {"flows": flows},
+                }
+            )
 
         for evc in evcs_normal:
             emit_event(

settings.py

@@ -28,15 +28,6 @@
 # the maximum disjoint paths from unwanted_path
 DISJOINT_PATH_CUTOFF = 10
 
-# BATCH_INTERVAL: time interval between batch requests that will be sent to
-# flow_manager (in seconds) - zero enable sending all the requests in a row
-BATCH_INTERVAL = 0.5
-
-# BATCH_SIZE: size of a batch request that will be sent to flow_manager, in
-# number of FlowMod requests. Use 0 (zero) to disable BATCH mode, i.e. sends
-# everything at a glance
-BATCH_SIZE = 50
-
 # Default values for EVPL and EPL respectively. They are use when sb_priority
 # is not set in a request
 EVPL_SB_PRIORITY = 20000

tests/unit/test_main.py

@@ -1854,9 +1854,8 @@ def test_handle_link_up(self):
         evc_mock.handle_link_up.assert_called_with("abc")
 
     @patch("time.sleep", return_value=None)
-    @patch("napps.kytos.mef_eline.main.settings")
     @patch("napps.kytos.mef_eline.main.emit_event")
-    def test_handle_link_down(self, emit_event_mock, settings_mock, _):
+    def test_handle_link_down(self, emit_event_mock, _):
         """Test handle_link_down method."""
         uni = create_autospec(UNI)
         evc1 = MagicMock(id="1", service_level=0, creation_time=1,
@@ -1910,7 +1909,6 @@ def test_handle_link_down(self, emit_event_mock, settings_mock, _):
         event = KytosEvent(name="test", content={"link": link})
         self.napp.circuits = {"1": evc1, "2": evc2, "3": evc3, "4": evc4,
                               "5": evc5, "6": evc6}
-        settings_mock.BATCH_SIZE = 2
         self.napp.handle_link_down(event)
 
         assert evc5.service_level > evc4.service_level
@@ -1949,16 +1947,9 @@ def test_handle_link_down(self, emit_event_mock, settings_mock, _):
                 name="flows.install",
                 content={
                     "dpid": "3",
-                    "flow_dict": {"flows": ["flow3", "flow4"]},
-                }
-            ),
-            call(
-                self.napp.controller,
-                context="kytos.flow_manager",
-                name="flows.install",
-                content={
-                    "dpid": "3",
-                    "flow_dict": {"flows": ["flow5", "flow6"]},
+                    "flow_dict": {
+                        "flows": ["flow3", "flow4", "flow5", "flow6"]
+                    },
                 }
             ),
         ])