Signed-off-by: IWAMOTO Toshihiro <[email protected]>
---
...bofproto-OFP13-flow_mod_conjunction.packet.json | 100 +++++++++++++++++++
...ibofproto-OFP13-flow_mod_match_conj.packet.json | 64 +++++++++++++
...bofproto-OFP15-flow_mod_conjunction.packet.json | 101 ++++++++++++++++++++
...ibofproto-OFP15-flow_mod_match_conj.packet.json | 65 +++++++++++++
4 files changed, 330 insertions(+)
create mode 100644
ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
create mode 100644
ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
create mode 100644
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
create mode 100644
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
diff --git
a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
new file mode 100644
index 0000000..209067e
--- /dev/null
+++
b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
@@ -0,0 +1,100 @@
+{
+ "OFPFlowMod": {
+ "buffer_id": 0,
+ "command": 0,
+ "cookie": 1311768467463790320,
+ "cookie_mask": 18446744073709551615,
+ "flags": 0,
+ "hard_timeout": 0,
+ "idle_timeout": 0,
+ "instructions": [
+ {
+ "OFPInstructionActions": {
+ "actions": [
+ {
+ "NXActionConjunction": {
+ "clause": 1,
+ "experimenter": 8992,
+ "id": 11259375,
+ "len": 16,
+ "n_clauses": 2,
+ "subtype": 34,
+ "type": 65535
+ }
+ }
+ ],
+ "len": 24,
+ "type": 4
+ }
+ }
+ ],
+ "match": {
+ "OFPMatch": {
+ "length": 70,
+ "oxm_fields": [
+ {
+ "OXMTlv": {
+ "field": "in_port",
+ "mask": null,
+ "value": 43981
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "eth_dst",
+ "mask": null,
+ "value": "aa:bb:cc:99:88:77"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "eth_type",
+ "mask": null,
+ "value": 2048
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "vlan_vid",
+ "mask": null,
+ "value": 5095
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "ipv4_dst",
+ "mask": null,
+ "value": "192.168.2.1"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tunnel_id",
+ "mask": null,
+ "value": 50000
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_src",
+ "mask": null,
+ "value": "192.168.2.3"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_dst",
+ "mask": null,
+ "value": "192.168.2.4"
+ }
+ }
+ ],
+ "type": 1
+ }
+ },
+ "out_group": 0,
+ "out_port": 0,
+ "priority": 0,
+ "table_id": 4
+ }
+}
diff --git
a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
new file mode 100644
index 0000000..89c3a22
--- /dev/null
+++
b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
@@ -0,0 +1,64 @@
+{
+ "OFPFlowMod": {
+ "buffer_id": 0,
+ "command": 0,
+ "cookie": 1311768467463790320,
+ "cookie_mask": 18446744073709551615,
+ "flags": 0,
+ "hard_timeout": 0,
+ "idle_timeout": 0,
+ "instructions": [
+ {
+ "OFPInstructionActions": {
+ "actions": [
+ {
+ "OFPActionPopVlan": {
+ "len": 8,
+ "type": 18
+ }
+ },
+ {
+ "OFPActionSetField": {
+ "field": {
+ "OXMTlv": {
+ "field": "ipv4_dst",
+ "mask": null,
+ "value": "192.168.2.9"
+ }
+ }
+ }
+ }
+ ],
+ "len": 32,
+ "type": 4
+ }
+ },
+ {
+ "OFPInstructionGotoTable": {
+ "len": 8,
+ "table_id": 100,
+ "type": 1
+ }
+ }
+ ],
+ "match": {
+ "OFPMatch": {
+ "length": 12,
+ "oxm_fields": [
+ {
+ "OXMTlv": {
+ "field": "conj_id",
+ "mask": null,
+ "value": 11259375
+ }
+ }
+ ],
+ "type": 1
+ }
+ },
+ "out_group": 0,
+ "out_port": 0,
+ "priority": 0,
+ "table_id": 3
+ }
+}
diff --git
a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
new file mode 100644
index 0000000..6ca74d5
--- /dev/null
+++
b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
@@ -0,0 +1,101 @@
+{
+ "OFPFlowMod": {
+ "buffer_id": 0,
+ "command": 0,
+ "cookie": 1311768467463790320,
+ "cookie_mask": 18446744073709551615,
+ "flags": 0,
+ "hard_timeout": 0,
+ "idle_timeout": 0,
+ "importance": 39032,
+ "instructions": [
+ {
+ "OFPInstructionActions": {
+ "actions": [
+ {
+ "NXActionConjunction": {
+ "clause": 1,
+ "experimenter": 8992,
+ "id": 11259375,
+ "len": 16,
+ "n_clauses": 2,
+ "subtype": 34,
+ "type": 65535
+ }
+ }
+ ],
+ "len": 24,
+ "type": 4
+ }
+ }
+ ],
+ "match": {
+ "OFPMatch": {
+ "length": 70,
+ "oxm_fields": [
+ {
+ "OXMTlv": {
+ "field": "in_port",
+ "mask": null,
+ "value": 43981
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "eth_dst",
+ "mask": null,
+ "value": "aa:bb:cc:99:88:77"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "eth_type",
+ "mask": null,
+ "value": 2048
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "vlan_vid",
+ "mask": null,
+ "value": 5095
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "ipv4_dst",
+ "mask": null,
+ "value": "192.168.2.1"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tunnel_id",
+ "mask": null,
+ "value": 50000
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_src",
+ "mask": null,
+ "value": "192.168.2.3"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_dst",
+ "mask": null,
+ "value": "192.168.2.4"
+ }
+ }
+ ],
+ "type": 1
+ }
+ },
+ "out_group": 0,
+ "out_port": 0,
+ "priority": 0,
+ "table_id": 4
+ }
+}
diff --git
a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
new file mode 100644
index 0000000..2355577
--- /dev/null
+++
b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json
@@ -0,0 +1,65 @@
+{
+ "OFPFlowMod": {
+ "buffer_id": 0,
+ "command": 0,
+ "cookie": 1311768467463790320,
+ "cookie_mask": 18446744073709551615,
+ "flags": 0,
+ "hard_timeout": 0,
+ "idle_timeout": 0,
+ "importance": 39032,
+ "instructions": [
+ {
+ "OFPInstructionActions": {
+ "actions": [
+ {
+ "OFPActionPopVlan": {
+ "len": 8,
+ "type": 18
+ }
+ },
+ {
+ "OFPActionSetField": {
+ "field": {
+ "OXMTlv": {
+ "field": "ipv4_dst",
+ "mask": null,
+ "value": "192.168.2.9"
+ }
+ }
+ }
+ }
+ ],
+ "len": 32,
+ "type": 4
+ }
+ },
+ {
+ "OFPInstructionGotoTable": {
+ "len": 8,
+ "table_id": 100,
+ "type": 1
+ }
+ }
+ ],
+ "match": {
+ "OFPMatch": {
+ "length": 12,
+ "oxm_fields": [
+ {
+ "OXMTlv": {
+ "field": "conj_id",
+ "mask": null,
+ "value": 11259375
+ }
+ }
+ ],
+ "type": 1
+ }
+ },
+ "out_group": 0,
+ "out_port": 0,
+ "priority": 0,
+ "table_id": 3
+ }
+}
--
1.7.10.4
------------------------------------------------------------------------------
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
