mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-25 02:21:45 +01:00
Code Issues Projects Releases Wiki Activity

of12/3/4/5: fix to_jsondict of OFPActionSetField

Browse Source 
Some fields missing in the JSON dict that to_jsondict of OFPActionSetField is returnd.
This patch fixes this problem.

Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Minoru TAKAHASHI 2016-02-10 13:10:12 +09:00 committed by FUJITA Tomonori
parent 00c7d2918d
commit 4dc709d90d
18 changed files with 81 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ryu/ofproto/ofproto_v1_2_parser.py
View File

@ -1569,7 +1569,9 @@ class OFPActionSetField(OFPAction):
o = self
return {
self.__class__.__name__: {
'field': ofproto.oxm_to_jsondict(self.key, self.value)
'field': ofproto.oxm_to_jsondict(self.key, self.value),
"len": self.len,
"type": self.type
}
}

4
ryu/ofproto/ofproto_v1_3_parser.py
View File

@ -3285,7 +3285,9 @@ class OFPActionSetField(OFPAction):
o = self
return {
self.__class__.__name__: {
'field': ofproto.oxm_to_jsondict(self.key, self.value)
'field': ofproto.oxm_to_jsondict(self.key, self.value),
"len": self.len,
"type": self.type
}
}

4
ryu/ofproto/ofproto_v1_4_parser.py
View File

@ -4908,7 +4908,9 @@ class OFPActionSetField(OFPAction):
def to_jsondict(self):
return {
self.__class__.__name__: {
'field': ofproto.oxm_to_jsondict(self.key, self.value)
'field': ofproto.oxm_to_jsondict(self.key, self.value),
"len": self.len,
"type": self.type
}
}

4
ryu/ofproto/ofproto_v1_5_parser.py
View File

@ -5781,7 +5781,9 @@ class OFPActionSetField(OFPAction):
def to_jsondict(self):
return {
self.__class__.__name__: {
'field': ofproto.oxm_to_jsondict(self.key, self.value)
'field': ofproto.oxm_to_jsondict(self.key, self.value),
"len": self.len,
"type": self.type
}
}

8
ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json
View File

@ -19,7 +19,9 @@
"mask": null,
"value": 258
}
}
},
"len": 16,
"type": 25
}
},
{
@ -46,7 +48,9 @@
"mask": null,
"value": "01:02:03:04:05:06"
}
}
},
"len": 16,
"type": 25
}
}
],

12
ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json
View File

@ -139,7 +139,9 @@
"mask": null,
"value": 258
}
}
},
"len": 16,
"type": 25
}
},
{
@ -264,7 +266,9 @@
"mask": null,
"value": "01:02:03:04:05:06"
}
}
},
"len": 16,
"type": 25
}
},
{
@ -275,7 +279,9 @@
"mask": null,
"value": 1
}
}
},
"len": 16,
"type": 25
}
}
],

12
ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json
View File

@ -19,7 +19,9 @@
"mask": null,
"value": 258
}
}
},
"len": 16,
"type": 25
}
},
{
@ -144,7 +146,9 @@
"mask": null,
"value": "01:02:03:04:05:06"
}
}
},
"len": 16,
"type": 25
}
},
{
@ -155,7 +159,9 @@
"mask": null,
"value": 1
}
}
},
"len": 16,
"type": 25
}
}
],

4
ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json
View File

@ -25,7 +25,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
},
{

4
ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
View File

@ -25,7 +25,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
}
],

4
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_ct_exec.packet.json
View File

@ -22,7 +22,9 @@
"mask": null,
"value": 6636321
}
}
},
"len": 16,
"type": 25
}
}
],

4
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_learn.packet.json
View File

@ -25,7 +25,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
},
{

12
ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json
View File

@ -143,7 +143,9 @@
"mask": null,
"value": 258
}
}
},
"len": 16,
"type": 25
}
},
{
@ -285,7 +287,9 @@
"mask": null,
"value": "01:02:03:04:05:06"
}
}
},
"len": 16,
"type": 25
}
},
{
@ -296,7 +300,9 @@
"mask": null,
"value": 1
}
}
},
"len": 16,
"type": 25
}
}
],

12
ryu/tests/unit/ofproto/json/of14/5-2-ofp_flow_mod.packet.json
View File

@ -20,7 +20,9 @@
"mask": null,
"value": 258
}
}
},
"len": 16,
"type": 25
}
},
{
@ -153,7 +155,9 @@
"mask": null,
"value": "01:02:03:04:05:06"
}
}
},
"len": 16,
"type": 25
}
},
{
@ -164,7 +168,9 @@
"mask": null,
"value": 1
}
}
},
"len": 16,
"type": 25
}
}
],

4
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
View File

@ -30,7 +30,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
},
{

4
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
View File

@ -26,7 +26,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
},
{

4
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
View File

@ -26,7 +26,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
}
],

4
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_mod.packet.json
View File

@ -20,7 +20,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
}
],

4
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-requestforward.packet.json
View File

@ -22,7 +22,9 @@
"mask": null,
"value": "192.168.2.9"
}
}
},
"len": 16,
"type": 25
}
}
],