With this change, the user don't have to handle EventDP with 'for port in ...' Thus the user code will be simplified.
Signed-off-by: Isaku Yamahata <[email protected]> --- ryu/controller/dpset.py | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ryu/controller/dpset.py b/ryu/controller/dpset.py index b0c594e..7752c2d 100644 --- a/ryu/controller/dpset.py +++ b/ryu/controller/dpset.py @@ -69,19 +69,17 @@ class EventPortModify(EventPortBase): class PortState(dict): - def __init__(self, dp): + def __init__(self): super(PortState, self).__init__() - for port in dp.ports.values(): - self.add(port.port_no, port.state) - def add(self, port_no, state): - self[port_no] = state + def add(self, port_no, port): + self[port_no] = port def remove(self, port_no): del self[port_no] - def modify(self, port_no, state): - self[port_no] = state + def modify(self, port_no, port): + self[port_no] = port # this depends on controller::Datapath and dispatchers in handler @@ -109,10 +107,20 @@ class DPSet(object): dp.dp_type = dp_type_ self.dps[dp.id] = dp - self.port_state[dp.id] = PortState(dp) + self.port_state[dp.id] = PortState() self.ev_q.queue(EventDP(dp, True)) + # generate port_add event for convenience + # so that the user don't have to handle dp enter event + for port in dp.ports.values(): + self._port_added(dp, port) + def unregister(self, dp): + # generate port_del event for convenience + # so that the user don't have to handle dp leave event + for port in self.port_state.get(dp.id, {}).values(): + self._port_deleted(dp, port) + if dp.id in self.dps: self.ev_q.queue(EventDP(dp, False)) del self.dps[dp.id] @@ -134,6 +142,14 @@ class DPSet(object): def get_all(self): return self.dps.items() + def _port_added(self, datapath, port): + self.port_state[datapath.id].add(port.port_no, port) + self.ev_q.queue(EventPortAdd(datapath, port)) + + def _port_deleted(self, datapath, port): + self.port_state[datapath.id].remove(port.port_no) + self.ev_q.queue(EventPortDelete(datapath, port)) + @set_ev_cls(dispatcher.EventDispatcherChange, dispatcher.QUEUE_EV_DISPATCHER) def dispacher_change(self, ev): @@ -162,19 +178,17 @@ class DPSet(object): LOG.debug('port status %s', reason) if reason == ofproto.OFPPR_ADD: - self.port_state[datapath.id].add(port.port_no, port.state) - self.ev_q.queue(EventPortAdd(datapath, port)) + self._port_added(datapath, port) elif reason == ofproto.OFPPR_DELETE: - self.port_state[datapath.id].remove(port.port_no) - self.ev_q.queue(EventPortDelete(datapath, port)) + self._port_deleted(datapath, port) else: assert reason == ofproto.OFPPR_MODIFY - self.port_state[datapath.id].modify(port.port_no, port.state) + self.port_state[datapath.id].modify(port.port_no, port) self.ev_q.queue(EventPortModify(datapath, port)) def get_port_state(self, dpid, port_no): try: - return self.port_state[dpid][port_no] + return self.port_state[dpid][port_no].state except KeyError: raise ryu_exc.PortNotFound(dpid=dpid, port=port_no, network_id=None) -- 1.7.1.1 ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
