I try to implement nxm registers and looks like we need some changes
to the nxm core code.
The problem is that if a MFField child class handles multiple
NXM_OF_*, the child object can't know which NXM_OF_* is used for
itself.
Looks like the simplest way to passing a nxm header value to MFField
child classes in the following way:
Opinions?
diff --git a/ryu/ofproto/nx_match.py b/ryu/ofproto/nx_match.py
index 5ca27ca..78054c5 100644
--- a/ryu/ofproto/nx_match.py
+++ b/ryu/ofproto/nx_match.py
@@ -69,9 +69,11 @@ MF_PACK_STRING_MAC = '!6s'
_MF_FIELDS = {}
+FLOW_N_REGS = 8 # ovs 1.5
class Flow(object):
def __init__(self):
+ self.regs = [0] * FLOW_N_REGS
self.in_port = 0
self.dl_src = mac.DONTCARE
self.dl_dst = mac.DONTCARE
@@ -122,6 +124,13 @@ class ClsRule(object):
self.wc = FlowWildcards()
self.flow = Flow()
+ def set_reg(self, reg_idx, value):
+ self.set_reg_masked(reg_idx, value, 0)
+
+ def set_reg_masked(self, reg_idx, value, mask):
+ #self.wc.reg_masks[reg_idx] = mask
+ self.flow.regs[reg_idx] = value
+
def set_in_port(self, port):
self.wc.wildcards &= ~FWW_IN_PORT
self.flow.in_port = port
@@ -345,11 +354,12 @@ def mf_from_nxm_header(nxm_header):
return None
make = _MF_FIELDS.get(nxm_header)
assert make is not None
- return make()
+ return make(nxm_header)
class MFField(object):
- def __init__(self, pack_str):
+ def __init__(self, nxm_header, pack_str):
+ self.nxm_header = nxm_header
self.pack_str = pack_str
self.n_bytes = struct.calcsize(pack_str)
self.n_bits = self.n_bytes * 8
@@ -713,12 +723,32 @@ class MFCookie(MFField):
return self._put(buf, offset, rule.flow.cookie)
+@_register_make
+@_set_nxm_headers([ofproto_v1_0.nxm_nx_reg(i) for i in range(FLOW_N_REGS)])
+class MFRegister(MFField):
+ @classmethod
+ def make(cls, header):
+ return cls(header, MF_PACK_STRING_BE32)
+
+ def put(self, buf, offset, rule):
+ for i in range(FLOW_N_REGS):
+ if ofproto_v1_0.nxm_nx_reg(i) == self.nxm_header:
+ return self._put(buf, offset, rule.flow.regs[i])
+
+
def serialize_nxm_match(rule, buf, offset):
old_offset = offset
if not rule.wc.wildcards & FWW_IN_PORT:
offset += nxm_put(buf, offset, ofproto_v1_0.NXM_OF_IN_PORT, rule)
+ for i in range(0, len(rule.flow.regs)):
+ if rule.flow.regs[i] == 0:
+ continue
+ else:
+ header = ofproto_v1_0.nxm_nx_reg(i)
+ offset += nxm_put(buf, offset, header, rule)
+
# Ethernet.
if rule.flow.dl_dst != mac.DONTCARE:
if rule.wc.dl_dst_mask:
------------------------------------------------------------------------------
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
