From 085717b41fda6d275eb55ff74470534a685d2690 Mon Sep 17 00:00:00 2001 From: Yuichi Ito Date: Wed, 20 Nov 2013 10:15:45 +0900 Subject: [PATCH] lacplib: reduce unnecessary constant and correct the inaccurate dispatchers. Signed-off-by: Yuichi Ito Signed-off-by: FUJITA Tomonori --- ryu/app/simple_switch_lacp.py | 5 +++-- ryu/lib/lacplib.py | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ryu/app/simple_switch_lacp.py b/ryu/app/simple_switch_lacp.py index 2b4edb01..37741631 100644 --- a/ryu/app/simple_switch_lacp.py +++ b/ryu/app/simple_switch_lacp.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 addrconv @@ -64,7 +65,7 @@ class SimpleSwitchLacp(app_manager.RyuApp): command=ofproto.OFPFC_DELETE) datapath.send_msg(mod) - @set_ev_cls(lacplib.EventPacketIn, lacplib.LAG_EV_DISPATCHER) + @set_ev_cls(lacplib.EventPacketIn, MAIN_DISPATCHER) def _packet_in_handler(self, ev): msg = ev.msg datapath = msg.datapath @@ -100,7 +101,7 @@ class SimpleSwitchLacp(app_manager.RyuApp): actions=actions) datapath.send_msg(out) - @set_ev_cls(lacplib.EventSlaveStateChanged, lacplib.LAG_EV_DISPATCHER) + @set_ev_cls(lacplib.EventSlaveStateChanged, MAIN_DISPATCHER) def _slave_state_changed_handler(self, ev): datapath = ev.datapath dpid = datapath.id diff --git a/ryu/lib/lacplib.py b/ryu/lib/lacplib.py index 48859c09..e425abb5 100644 --- a/ryu/lib/lacplib.py +++ b/ryu/lib/lacplib.py @@ -31,9 +31,6 @@ from ryu.lib.packet import ethernet from ryu.lib.packet import slow -LAG_EV_DISPATCHER = "lacplib" - - class EventPacketIn(event.EventBase): """a PacketIn event class using except LACP.""" def __init__(self, msg):