openstack/deb-ryu
Code Issues Proposed changes

nxm: fix NXM_NX_REG

Browse Source 
Needs to handle NXM_NX_REG_W.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
FUJITA Tomonori 2012-06-26 09:41:45 +09:00
parent 8748812e5e
commit fd7bac0f2d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ryu/ofproto/nx_match.py
View File

@ -704,7 +704,8 @@ class MFICMPV6Label(MFField):
@_register_make @_register_make
@_set_nxm_headers([ofproto_v1_0.nxm_nx_reg(i) for i in range(FLOW_N_REGS)]) @_set_nxm_headers([ofproto_v1_0.nxm_nx_reg(i) for i in range(FLOW_N_REGS)]
+ [ofproto_v1_0.nxm_nx_reg_w(i) for i in range(FLOW_N_REGS)])
class MFRegister(MFField): class MFRegister(MFField):
@classmethod @classmethod
def make(cls, header): def make(cls, header):
@ -712,7 +713,8 @@ class MFRegister(MFField):
def put(self, buf, offset, rule): def put(self, buf, offset, rule):
for i in range(FLOW_N_REGS): for i in range(FLOW_N_REGS):
if ofproto_v1_0.nxm_nx_reg(i) == self.nxm_header: if (ofproto_v1_0.nxm_nx_reg(i) == self.nxm_header or
ofproto_v1_0.nxm_nx_reg_w(i) == self.nxm_header):
if rule.wc.regs_mask[i]: if rule.wc.regs_mask[i]:
return self.putm(buf, offset, rule.flow.regs[i], return self.putm(buf, offset, rule.flow.regs[i],
rule.wc.regs_mask[i]) rule.wc.regs_mask[i])
@ -889,7 +891,10 @@ def serialize_nxm_match(rule, buf, offset):
for i in range(FLOW_N_REGS): for i in range(FLOW_N_REGS):
if rule.wc.regs_bits & (1 << i): if rule.wc.regs_bits & (1 << i):
header = ofproto_v1_0.nxm_nx_reg(i) if rule.wc.regs_mask[i]:
header = ofproto_v1_0.nxm_nx_reg_w(i)
else:
header = ofproto_v1_0.nxm_nx_reg(i)
offset += nxm_put(buf, offset, header, rule) offset += nxm_put(buf, offset, header, rule)
# Pad # Pad