openstack/deb-ryu
Code Issues Proposed changes

stplib: reduce unnecessary constant

Browse Source 
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>
This commit is contained in:
Yuichi Ito 2014-03-28 14:18:55 +09:00 committed by FUJITA Tomonori
parent c8a588dc5b
commit d0cd13a660
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ryu/app/simple_switch_stp.py
View File

@ -16,6 +16,7 @@
import struct import struct
from ryu.base import app_manager from ryu.base import app_manager
from ryu.controller.handler import MAIN_DISPATCHER
from ryu.controller.handler import set_ev_cls from ryu.controller.handler import set_ev_cls
from ryu.ofproto import ofproto_v1_0 from ryu.ofproto import ofproto_v1_0
from ryu.lib import dpid as dpid_lib from ryu.lib import dpid as dpid_lib
@ -75,7 +76,7 @@ class SimpleSwitchStp(app_manager.RyuApp):
command=ofproto.OFPFC_DELETE) command=ofproto.OFPFC_DELETE)
datapath.send_msg(mod) 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): def packet_in_handler(self, ev):
msg = ev.msg msg = ev.msg
datapath = msg.datapath datapath = msg.datapath
@ -109,7 +110,7 @@ class SimpleSwitchStp(app_manager.RyuApp):
actions=actions) actions=actions)
datapath.send_msg(out) 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): def _topology_change_handler(self, ev):
dp = ev.dp dp = ev.dp
dpid_str = dpid_lib.dpid_to_str(dp.id) 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] del self.mac_to_port[dp.id]
self.delete_flow(dp) 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): def _port_state_change_handler(self, ev):
dpid_str = dpid_lib.dpid_to_str(ev.dp.id) dpid_str = dpid_lib.dpid_to_str(ev.dp.id)
of_state = {stplib.PORT_STATE_DISABLE: 'DISABLE', of_state = {stplib.PORT_STATE_DISABLE: 'DISABLE',

3
ryu/lib/stplib.py
View File

@ -35,9 +35,6 @@ from ryu.ofproto import ofproto_v1_2
from ryu.ofproto import ofproto_v1_3 from ryu.ofproto import ofproto_v1_3
STP_EV_DISPATCHER = "stplib"
MAX_PORT_NO = 0xfff MAX_PORT_NO = 0xfff
# for OpenFlow 1.2/1.3 # for OpenFlow 1.2/1.3