From 0c0656f95a646756df5caae10734c2e561ff7b56 Mon Sep 17 00:00:00 2001 From: mgrex97 Date: Wed, 23 Aug 2017 15:13:44 +0800 Subject: [PATCH] topology/switches: Fix delete port can't immediately remove link. If remove port data from self.port_state first, self.get_port method can't get the port data, this problem will cause link can't immediately be removed. This patch remove port data after get_port and link delete. Signed-off-by: Yu Ren Signed-off-by: mgrex97 Signed-off-by: FUJITA Tomonori --- ryu/topology/switches.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ryu/topology/switches.py b/ryu/topology/switches.py index 644a1fec..7264075a 100644 --- a/ryu/topology/switches.py +++ b/ryu/topology/switches.py @@ -717,7 +717,6 @@ class Switches(app_manager.RyuApp): # LOG.debug('A port was deleted.' + # '(datapath id = %s, port number = %s)', # dp.id, ofpport.port_no) - self.port_state[dp.id].remove(ofpport.port_no) self.send_event_to_observers( event.EventPortDelete(Port(dp.id, dp.ofproto, ofpport))) @@ -730,6 +729,8 @@ class Switches(app_manager.RyuApp): self._link_down(port) self.lldp_event.set() + self.port_state[dp.id].remove(ofpport.port_no) + else: assert reason == dp.ofproto.OFPPR_MODIFY # LOG.debug('A port was modified.' +