diff options
| author | Yuichi Ito <ito.yuichi0@gmail.com> | 2014-03-28 14:18:55 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-03-30 10:43:52 +0900 |
| commit | d0cd13a6605337682219da8abcfbb702b484be76 (patch) | |
| tree | 0dac9ea6d76d8ce921f0c0c051c0c54d7defaef9 | |
| parent | c8a588dc5b1a527e8704ca0b778856b14bd43e67 (diff) | |
stplib: reduce unnecessary constant
and correct the inaccurate dispatchers.
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/app/simple_switch_stp.py | 7 | ||||
| -rw-r--r-- | ryu/lib/stplib.py | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ryu/app/simple_switch_stp.py b/ryu/app/simple_switch_stp.py index 8efad141..a86c8a53 100644 --- a/ryu/app/simple_switch_stp.py +++ b/ryu/app/simple_switch_stp.py @@ -16,6 +16,7 @@ import struct from ryu.base import app_manager +from ryu.controller.handler import MAIN_DISPATCHER from ryu.controller.handler import set_ev_cls from ryu.ofproto import ofproto_v1_0 from ryu.lib import dpid as dpid_lib @@ -75,7 +76,7 @@ class SimpleSwitchStp(app_manager.RyuApp): command=ofproto.OFPFC_DELETE) datapath.send_msg(mod) - @set_ev_cls(stplib.EventPacketIn, stplib.STP_EV_DISPATCHER) + @set_ev_cls(stplib.EventPacketIn, MAIN_DISPATCHER) def packet_in_handler(self, ev): msg = ev.msg datapath = msg.datapath @@ -109,7 +110,7 @@ class SimpleSwitchStp(app_manager.RyuApp): actions=actions) datapath.send_msg(out) - @set_ev_cls(stplib.EventTopologyChange, stplib.STP_EV_DISPATCHER) + @set_ev_cls(stplib.EventTopologyChange, MAIN_DISPATCHER) def _topology_change_handler(self, ev): dp = ev.dp dpid_str = dpid_lib.dpid_to_str(dp.id) @@ -120,7 +121,7 @@ class SimpleSwitchStp(app_manager.RyuApp): del self.mac_to_port[dp.id] self.delete_flow(dp) - @set_ev_cls(stplib.EventPortStateChange, stplib.STP_EV_DISPATCHER) + @set_ev_cls(stplib.EventPortStateChange, MAIN_DISPATCHER) def _port_state_change_handler(self, ev): dpid_str = dpid_lib.dpid_to_str(ev.dp.id) of_state = {stplib.PORT_STATE_DISABLE: 'DISABLE', diff --git a/ryu/lib/stplib.py b/ryu/lib/stplib.py index bf6e919b..fba2da2d 100644 --- a/ryu/lib/stplib.py +++ b/ryu/lib/stplib.py @@ -35,9 +35,6 @@ from ryu.ofproto import ofproto_v1_2 from ryu.ofproto import ofproto_v1_3 -STP_EV_DISPATCHER = "stplib" - - MAX_PORT_NO = 0xfff # for OpenFlow 1.2/1.3 |