openstack/deb-ryu
Code Issues Proposed changes

ryu.app.ofctl: raise exceptions on openflow error messages

Browse Source 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2014-03-26 13:04:22 +09:00 committed by FUJITA Tomonori
parent 598c3c5e75
commit 92ef0bdbb5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ryu/app/ofctl/exception.py
View File

@ -27,3 +27,7 @@ class _ExceptionBase(exception.RyuException):
class UnexpectedMultiReply(_ExceptionBase):
message = 'Unexpected Multi replies %(result)s'
class OFError(_ExceptionBase):
message = 'OpenFlow errors %(result)s'

9
ryu/app/ofctl/service.py
View File

@ -62,6 +62,11 @@ class OfctlService(app_manager.RyuApp):
self.unobserve_event(ev_cls)
self.logger.debug('ofctl: stop observing %s' % (ev_cls,))
@staticmethod
def _is_error(msg):
return (ofp_event.ofp_msg_to_ev_cls(type(msg)) ==
ofp_event.EventOFPErrorMsg)
@set_ev_cls(ofp_event.EventOFPSwitchFeatures, CONFIG_DISPATCHER)
def _switch_features_handler(self, ev):
datapath = ev.msg.datapath
@ -142,7 +147,9 @@ class OfctlService(app_manager.RyuApp):
req = si.xids.pop(xid)
if not req.reply_cls is None:
self._unobserve_msg(req.reply_cls)
if req.reply_multi:
if any(self._is_error(r) for r in result):
rep = event.Reply(exception=exception.OFError(result=result))
elif req.reply_multi:
rep = event.Reply(result=result)
elif len(result) == 0:
rep = event.Reply()