summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2014-03-03 11:38:27 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-03-04 13:34:34 +0900
commitaa08ed2c787822d3d90efa63a9f60dba52a92826 (patch)
tree14c20be6eed34163b34c930e7a42cb328fb182aa
parentde7af3ace7a648b7cfd69953bb6ca20560722b48 (diff)
of14: Correct documentation and example of get config reply flags
* Flags is a bitmap of OFPC_FRAG_* values rather than a single OFPC_FRAG_* value * OFPC_FRAG_MASK is not a valid bitmap field Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/ofproto/ofproto_v1_4_parser.py24
1 files changed, 10 insertions, 14 deletions
diff --git a/ryu/ofproto/ofproto_v1_4_parser.py b/ryu/ofproto/ofproto_v1_4_parser.py
index ce232e08..cb35c23e 100644
--- a/ryu/ofproto/ofproto_v1_4_parser.py
+++ b/ryu/ofproto/ofproto_v1_4_parser.py
@@ -481,11 +481,10 @@ class OFPGetConfigReply(MsgBase):
============= =========================================================
Attribute Description
============= =========================================================
- flags One of the following configuration flags.
+ flags Bitmap of the following flags.
OFPC_FRAG_NORMAL
OFPC_FRAG_DROP
OFPC_FRAG_REASM
- OFPC_FRAG_MASK
miss_send_len Max bytes of new flow that datapath should send to the
controller
============= =========================================================
@@ -497,20 +496,17 @@ class OFPGetConfigReply(MsgBase):
msg = ev.msg
dp = msg.datapath
ofp = dp.ofproto
-
- if msg.flags == ofp.OFPC_FRAG_NORMAL:
- flags = 'NORMAL'
- elif msg.flags == ofp.OFPC_FRAG_DROP:
- flags = 'DROP'
- elif msg.flags == ofp.OFPC_FRAG_REASM:
- flags = 'REASM'
- elif msg.flags == ofp.OFPC_FRAG_MASK:
- flags = 'MASK'
- else:
- flags = 'unknown'
+ flags = []
+
+ if msg.flags & ofp.OFPC_FRAG_NORMAL:
+ flags.append('NORMAL')
+ if msg.flags & ofp.OFPC_FRAG_DROP:
+ flags.append('DROP')
+ if msg.flags & ofp.OFPC_FRAG_REASM:
+ flags.append('REASM')
self.logger.debug('OFPGetConfigReply received: '
'flags=%s miss_send_len=%d',
- flags, msg.miss_send_len)
+ ','.join(flags), msg.miss_send_len)
"""
def __init__(self, datapath, flags=None, miss_send_len=None):
super(OFPGetConfigReply, self).__init__(datapath)