mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 13:56:09 +02:00
Code Issues Projects Releases Wiki Activity

of12: OFPMatch api compat

Browse Source 
make old query api work on OFPMatch instances created with from_jsondict.

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 2013-07-23 16:03:20 +09:00 committed by FUJITA Tomonori
parent 4c14442022
commit efcf9263b0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ryu/ofproto/ofproto_v1_2_parser.py
View File

@ -1660,14 +1660,23 @@ class OFPMatch(StringifyMixin):
@classmethod
def from_jsondict(cls, dict_):
return super(OFPMatch, cls).from_jsondict(dict_, lambda x: x)
o = super(OFPMatch, cls).from_jsondict(dict_, lambda x: x)
# XXX old api compat
# serialize and parse to fill OFPMatch.fields
buf = bytearray()
o.serialize(buf, 0)
return OFPMatch.parser(str(buf), 0)
def append_field(self, header, value, mask=None):
self.fields.append(OFPMatchField.make(header, value, mask))
def _composed_with_old_api(self):
return (self.fields and not self._fields2) or \
self._wc.__dict__ != FlowWildcards().__dict__
def serialize(self, buf, offset):
# XXX compat
if self.fields or self._wc.__dict__ != FlowWildcards().__dict__:
if self._composed_with_old_api():
return self.serialize_old(buf, offset)
fields = [ofproto_v1_2.oxm_from_user(k, v) for (k, v)