Rename services, reduce slow advertise to 15s.

Author: Josh Bailey

faucet/faucet.py

@@ -61,8 +61,8 @@ class EventFaucetStateExpire(event.EventBase): # pylint: disable=too-few-public-
     """Event used to trigger expiration of state in controller."""
     pass
 
-class EventFaucetStackLinkStates(event.EventBase): # pylint: disable=too-few-public-methods
-    """Event used to update link stack states."""
+class EventFaucetFastStateExpire(event.EventBase): # pylint: disable=too-few-public-methods
+    """Event used to trigger fast expiration of state in controller."""
     pass
 
 
@@ -71,8 +71,8 @@ class EventFaucetAdvertise(event.EventBase): # pylint: disable=too-few-public-me
     pass
 
 
-class EventFaucetLLDPAdvertise(event.EventBase): # pylint: disable=too-few-public-methods
-    """Event used to trigger periodic LLDP beacons."""
+class EventFaucetFastAdvertise(event.EventBase): # pylint: disable=too-few-public-methods
+    """Event used to trigger periodic fast network advertisements (eg LACP)."""
     pass
 
 
@@ -92,9 +92,9 @@ class Faucet(RyuAppBase):
         EventFaucetMetricUpdate: (None, 5),
         EventFaucetResolveGateways: ('resolve_gateways', 2),
         EventFaucetStateExpire: ('state_expire', 5),
-        EventFaucetStackLinkStates: ('update_stack_link_states', 2),
+        EventFaucetFastStateExpire: ('fast_state_expire', 2),
         EventFaucetAdvertise: ('advertise', 15),
-        EventFaucetLLDPAdvertise: ('send_lldp_beacons', 5),
+        EventFaucetFastAdvertise: ('fast_advertise', 5),
     }
     logname = 'faucet'
     exc_logname = logname + '.exception'
@@ -199,9 +199,9 @@ def metric_update(self, _):
 
     @set_ev_cls(EventFaucetResolveGateways, MAIN_DISPATCHER)
     @set_ev_cls(EventFaucetStateExpire, MAIN_DISPATCHER)
-    @set_ev_cls(EventFaucetStackLinkStates, MAIN_DISPATCHER)
+    @set_ev_cls(EventFaucetFastStateExpire, MAIN_DISPATCHER)
     @set_ev_cls(EventFaucetAdvertise, MAIN_DISPATCHER)
-    @set_ev_cls(EventFaucetLLDPAdvertise, MAIN_DISPATCHER)
+    @set_ev_cls(EventFaucetFastAdvertise, MAIN_DISPATCHER)
     @kill_on_exception(exc_logname)
     def _valve_flow_services(self, ryu_event):
         """Call a method on all Valves and send any resulting flows."""

faucet/valve.py

@@ -545,7 +545,7 @@ def _send_lldp_beacon_on_port(self, port, now):
         port.dyn_last_lldp_beacon_time = now
         return valve_of.packetout(port.number, lldp_beacon_pkt.data)
 
-    def send_lldp_beacons(self, now, _other_valves):
+    def fast_advertise(self, now, _other_valves):
         """Called periodically to send LLDP beacon packets."""
         # TODO: the beacon service is specifically NOT to support conventional R/STP.
         # It is intended to facilitate physical troubleshooting (e.g.
@@ -613,7 +613,7 @@ def _update_stack_link_state(self, port, now, other_valves):
             for valve in [self] + other_valves:
                 valve.flood_manager.update_stack_topo(port_stack_up, self.dp, port)
 
-    def update_stack_link_states(self, now, other_valves):
+    def fast_state_expire(self, now, other_valves):
         """Called periodically to verify the state of stack ports."""
         for port in self.dp.stack_ports:
             self._update_stack_link_state(port, now, other_valves)

tests/unit/faucet/test_valve.py

@@ -603,8 +603,7 @@ def rcv_packet(self, port, vid, match):
             rcv_packet_ofmsgs = self.last_flows_to_dp[self.DP_ID]
             self.table.apply_ofmsgs(rcv_packet_ofmsgs)
             for valve_service in (
-                    'resolve_gateways', 'advertise',
-                    'send_lldp_beacons', 'state_expire'):
+                    'resolve_gateways', 'advertise', 'fast_advertise', 'state_expire'):
                 self.valves_manager.valve_flow_services(
                     now, valve_service)
             self.valves_manager.update_metrics(now)
@@ -1285,7 +1284,7 @@ def test_port_acl_deny(self):
         def test_lldp_beacon(self):
             """Test LLDP beacon service."""
             # TODO: verify LLDP packet content.
-            self.assertTrue(self.valve.send_lldp_beacons(time.time(), None))
+            self.assertTrue(self.valve.fast_advertise(time.time(), None))
 
         def test_unknown_port(self):
             """Test port status change for unknown port handled."""
@@ -1887,7 +1886,7 @@ def test_stack_probe(self):
         other_dp = self.valves_manager.valves[2].dp
         other_port = other_dp.ports[1]
         other_valves = self.valves_manager._other_running_valves(self.valve)
-        self.valve.update_stack_link_states(time.time(), other_valves)
+        self.valve.fast_state_expire(time.time(), other_valves)
         self.assertTrue(stack_port.is_stack_down())
         for change_func, check_func in [
                 ('stack_init', 'is_stack_init'),
@@ -1920,7 +1919,7 @@ def test_stack_lost_lldp(self):
         self.rcv_lldp(stack_port, other_dp, other_port)
         self.assertTrue(stack_port.is_stack_init())
         other_valves = self.valves_manager._other_running_valves(self.valve)
-        self.valve.update_stack_link_states(time.time() + 300, other_valves) # simulate packet loss
+        self.valve.fast_state_expire(time.time() + 300, other_valves) # simulate packet loss
         self.assertTrue(stack_port.is_stack_down())
 
 
@@ -1947,7 +1946,7 @@ def down_stack_port(port):
             peer_port.stack_down()
             self.valves_manager.valve_flow_services(
                 time.time() + 600,
-                'update_stack_link_states')
+                'fast_state_expire')
             self.assertTrue(port.is_stack_down())
 
         def verify_stack_learn_edges(num_edges, edge=None, test_func=None):