summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-10-28 17:08:08 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-10-28 23:02:49 +0900
commit4985890a55e0ba43676c365baa1452ecc7dca655 (patch)
treefc11be888f36e5baed0b0d1cdcb368911b2d3281
parent1d2255113c4acb7b72ec3805b1fb605fc118e066 (diff)
oxm_fields: allow None values
will be used for table-features Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/ofproto/oxm_fields.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/ryu/ofproto/oxm_fields.py b/ryu/ofproto/oxm_fields.py
index 73b55a2a..e1860d03 100644
--- a/ryu/ofproto/oxm_fields.py
+++ b/ryu/ofproto/oxm_fields.py
@@ -148,7 +148,8 @@ def from_user(name_to_field, name, user_value):
else:
value = user_value
mask = None
- value = t.from_user(value)
+ if not value is None:
+ value = t.from_user(value)
if not mask is None:
mask = t.from_user(mask)
return num, value, mask
@@ -162,7 +163,10 @@ def to_user(num_to_field, n, v, m):
except KeyError:
t = UnknownType
name = 'field_%d' % n
- value = t.to_user(v)
+ if not v is None:
+ value = t.to_user(v)
+ else:
+ value = None
if m is None:
user_value = value
else: