Merge pull request #2972 from grafnu/dynreload

Clone dyn_ port state on reconfigure

Author: anarkiwi

faucet/dp.py

@@ -331,6 +331,14 @@ def __init__(self, _id, dp_id, conf):
     def __str__(self):
         return self.name
 
+    def clone_dyn_state(self, prev_dp):
+        self.dyn_running = prev_dp.dyn_running
+        self.dyn_up_port_nos = set(prev_dp.dyn_up_port_nos)
+        self.dyn_last_coldstart_time = prev_dp.dyn_last_coldstart_time
+        for port in prev_dp.ports:
+            if port in self.ports:
+                self.ports[port].clone_dyn_state(prev_dp.ports[port])
+
     def check_config(self):
         super(DP, self).check_config()
         test_config_condition(not isinstance(self.dp_id, int), (

faucet/port.py

@@ -189,6 +189,18 @@ def set_defaults(self):
         self._set_default('description', self.name)
         self._set_default('tagged_vlans', [])
 
+    def clone_dyn_state(self, old_port):
+        self.dyn_dot1x_native_vlan = old_port.dyn_dot1x_native_vlan
+        self.dyn_lacp_up = old_port.dyn_lacp_up
+        self.dyn_lacp_updated_time = old_port.dyn_lacp_updated_time
+        self.dyn_last_ban_time = old_port.dyn_last_ban_time
+        self.dyn_last_lacp_pkt = old_port.dyn_last_lacp_pkt
+        self.dyn_last_lldp_beacon_time = old_port.dyn_last_lldp_beacon_time
+        self.dyn_learn_ban_count = old_port.dyn_learn_ban_count
+        self.dyn_phys_up = old_port.dyn_phys_up
+        self.dyn_stack_current_state = old_port.dyn_stack_current_state
+        self.dyn_stack_probe_info = old_port.dyn_stack_probe_info.copy()
+
     def check_config(self):
         super(Port, self).check_config()
         test_config_condition(not (isinstance(self.number, int) and self.number > 0 and (

faucet/valve.py

@@ -140,8 +140,12 @@ def close_logs(self):
             valve_util.close_logger(self.logger.logger)
         valve_util.close_logger(self.ofchannel_logger)
 
-    def dp_init(self):
+    def dp_init(self, new_dp=None):
         """Initialize datapath state at connection/re/config time."""
+        if new_dp:
+            new_dp.clone_dyn_state(self.dp)
+            self.dp = new_dp
+
         self.close_logs()
         self.logger = ValveLogger(
             logging.getLogger(self.logname + '.valve'), self.dp.dp_id, self.dp.name)
@@ -1406,14 +1410,12 @@ def _apply_config_changes(self, new_dp, changes):
 
         if self._pipeline_change():
             self.logger.info('pipeline change')
-            self.dp = new_dp
-            self.dp_init()
+            self.dp_init(new_dp)
             return True, []
 
         if all_ports_changed:
             self.logger.info('all ports changed')
-            self.dp = new_dp
-            self.dp_init()
+            self.dp_init(new_dp)
             return True, []
 
         all_up_port_nos = [
@@ -1434,8 +1436,7 @@ def _apply_config_changes(self, new_dp, changes):
             self.logger.info('ports changed/added: %s' % changed_ports)
             ofmsgs.extend(self.ports_delete(changed_ports))
 
-        self.dp = new_dp
-        self.dp_init()
+        self.dp_init(new_dp)
 
         if changed_vlans:
             self.logger.info('VLANs changed/added: %s' % changed_vlans)
@@ -1469,14 +1470,8 @@ def reload_config(self, _now, new_dp):
         Returns:
             ofmsgs (list): OpenFlow messages.
         """
-        dp_running = self.dp.dyn_running
-        up_ports = self.dp.dyn_up_port_nos
-        coldstart_time = self.dp.dyn_last_coldstart_time
         cold_start, ofmsgs = self._apply_config_changes(
             new_dp, self.dp.get_config_changes(self.logger, new_dp))
-        self.dp.dyn_running = dp_running
-        self.dp.dyn_up_port_nos = up_ports
-        self.dp.dyn_last_coldstart_time = coldstart_time
         restart_type = None
         if cold_start:
             restart_type = 'cold'

tests/integration/mininet_tests.py

@@ -6854,6 +6854,25 @@ def test_untagged(self):
             self.verify_stack_hosts()
             self.flap_all_switch_ports()
 
+    def test_dyn_fail(self):
+        """Test lacp fail on reload with dynamic lacp status."""
+
+        conf = self._get_faucet_conf()
+        src_port = self.non_host_ports(self.dpids[0])[0]
+        dst_port = self.non_host_ports(self.dpids[0])[1]
+        fail_port = self.non_host_ports(self.dpids[1])[0]
+
+        self.wait_for_lacp_port_up(src_port, self.dpids[0], 'faucet-1')
+        self.wait_for_lacp_port_up(dst_port, self.dpids[0], 'faucet-1')
+
+        conf['dps']['faucet-2']['interfaces'][fail_port]['lacp'] = 0
+        conf['dps']['faucet-2']['interfaces'][fail_port]['lacp_active'] = False
+        self.reload_conf(conf, self.faucet_config_path, restart=True,
+                         cold_start=False, change_expected=False)
+
+        self.wait_for_lacp_port_down(src_port, self.dpids[0], 'faucet-1')
+        self.wait_for_lacp_port_up(dst_port, self.dpids[0], 'faucet-1')
+
 
 class FaucetStackStringOfDPUntaggedTest(FaucetStringOfDPTest):
     """Test topology of stacked datapaths with untagged hosts."""