openstack
/
os-ken
Code Issues Proposed changes

ryu/controller/dpset.py: code simplification 

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Isaku Yamahata 2012-05-17 13:10:59 +09:00 committed by FUJITA Tomonori
parent 396fda8bc8
commit 97cbf8412c
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ryu-manager
View File

@ -50,7 +50,7 @@ def main():
log.init_log()
nw = network.Network()
dpset_ = dpset.create_dpset()
dpset_ = dpset.DPSet()
app_mgr = AppManager()
app_mgr.load_apps(FLAGS.app_lists, network=nw, dpset=dpset_)

24
ryu/controller/dpset.py
View File

@ -25,6 +25,11 @@ from ryu.controller.handler import set_ev_cls
LOG = logging.getLogger('ryu.controller.dpset')
QUEUE_NAME_DPSET = 'dpset'
DISPATCHER_NAME_DPSET = 'dpset'
DPSET_EV_DISPATCHER = dispatcher.EventDispatcher(DISPATCHER_NAME_DPSET)
class EventDPBase(event.EventBase):
def __init__(self, dp):
super(EventDPBase, self).__init__()
@ -42,15 +47,16 @@ class EventDP(EventDPBase):
# this depends on controller::Datapath and dispatchers in handler
class DPSet(object):
def __init__(self, ev_q, dispatcher_):
def __init__(self):
super(DPSet, self).__init__()
# dp registration and type setting can be occur in any order
# Sometimes the sw_type is set before dp connection
self.dp_types = {}
self.dps = {} # datapath_id => class Datapath
self.ev_q = ev_q
self.dispatcher = dispatcher_
self.ev_q = dispatcher.EventQueue(QUEUE_NAME_DPSET,
DPSET_EV_DISPATCHER)
handler.register_instance(self)
def register(self, dp):
@ -102,13 +108,3 @@ class DPSet(object):
elif ev.new_dispatcher.name == handler.DISPATCHER_NAME_OFP_DEAD:
LOG.debug('DPSET: unregister datapath %s', datapath)
self.unregister(datapath)
DISPATCHER_NAME_DPSET = 'dpset'
DPSET_EV_DISPATCHER = dispatcher.EventDispatcher(DISPATCHER_NAME_DPSET)
QUEUE_NAME_DPSET = 'datapath'
_DPSET_EV_Q = dispatcher.EventQueue(QUEUE_NAME_DPSET, DPSET_EV_DISPATCHER)
def create_dpset():
return DPSet(_DPSET_EV_Q, DPSET_EV_DISPATCHER)