summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2014-10-14 12:28:44 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-10-14 13:34:26 +0900
commitf473308b3711a74641c6c6d114a6f5ccca7fde3b (patch)
tree305e8e969d413e41e48a0ede635d631e5d334bee
parentc93cafbd2c071f6ff5ad6718c8ce035f1e35d3a8 (diff)
test_parser: Update expected json representations
Update after tun_ipv4_src/tun_ipv4_dst changes. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json16
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json16
-rw-r--r--ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json18
3 files changed, 46 insertions, 4 deletions
diff --git a/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json
index 1e84f7b5..c5837d26 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json
@@ -5,7 +5,7 @@
"data": "",
"match": {
"OFPMatch": {
- "length": 335,
+ "length": 351,
"oxm_fields": [
{
"OXMTlv": {
@@ -286,6 +286,20 @@
"mask": null,
"value": 1
}
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_src",
+ "mask": null,
+ "value": "1.2.3.4"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_dst",
+ "mask": null,
+ "value": "1.2.3.4"
+ }
}
],
"type": 1
diff --git a/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json
index 2ac6568e..1c594e8f 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json
@@ -10,7 +10,7 @@
"instructions": [],
"match": {
"OFPMatch": {
- "length": 335,
+ "length": 351,
"oxm_fields": [
{
"OXMTlv": {
@@ -291,6 +291,20 @@
"mask": null,
"value": 1
}
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_src",
+ "mask": null,
+ "value": "1.2.3.4"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_dst",
+ "mask": null,
+ "value": "1.2.3.4"
+ }
}
],
"type": 1
diff --git a/ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json b/ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json
index ab4ea277..c5e166d8 100644
--- a/ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/4-63-onf_flow_monitor_request.packet.json
@@ -23,7 +23,7 @@
"id": 999,
"match": {
"OFPMatch": {
- "length": 335,
+ "length": 351,
"oxm_fields": [
{
"OXMTlv": {
@@ -304,12 +304,26 @@
"mask": null,
"value": 1
}
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_src",
+ "mask": null,
+ "value": "1.2.3.4"
+ }
+ },
+ {
+ "OXMTlv": {
+ "field": "tun_ipv4_dst",
+ "mask": null,
+ "value": "1.2.3.4"
+ }
}
],
"type": 1
}
},
- "match_len": 331,
+ "match_len": 347,
"out_port": 4294967295,
"table_id": 255
}