summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2015-05-15 11:03:39 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-05-19 15:39:28 +0900
commitaf5d973c2e1e2d92b8debe5bad571d4074cd5100 (patch)
tree895bc1e50d7df0d387d26f7e05b95cf3c39848e5
parentf6e2134f29e530d8de71373b31abd37ed8dd4aaa (diff)
test_parser: Add some expected json representations
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/libofproto-OFP13-flow_mod.packet.json79
-rw-r--r--ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json79
-rw-r--r--ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json79
3 files changed, 234 insertions, 3 deletions
diff --git a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json
index 1428c5d0..23812142 100644
--- a/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod.packet.json
@@ -27,9 +27,86 @@
}
}
}
+ },
+ {
+ "NXActionLearn": {
+ "cookie": 0,
+ "experimenter": 8992,
+ "fin_hard_timeout": 0,
+ "fin_idle_timeout": 0,
+ "flags": 0,
+ "hard_timeout": 300,
+ "idle_timeout": 0,
+ "len": 96,
+ "priority": 1,
+ "specs": [
+ {
+ "NXFlowSpecMatch": {
+ "dst": [
+ "vlan_vid",
+ 0
+ ],
+ "n_bits": 12,
+ "src": [
+ "vlan_vid",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecMatch": {
+ "dst": [
+ "eth_dst_nxm",
+ 0
+ ],
+ "n_bits": 48,
+ "src": [
+ "eth_src_nxm",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecLoad": {
+ "dst": [
+ "vlan_vid",
+ 0
+ ],
+ "n_bits": 12,
+ "src": 0
+ }
+ },
+ {
+ "NXFlowSpecLoad": {
+ "dst": [
+ "tunnel_id_nxm",
+ 0
+ ],
+ "n_bits": 64,
+ "src": [
+ "tunnel_id_nxm",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecOutput": {
+ "dst": "",
+ "n_bits": 32,
+ "src": [
+ "in_port",
+ 0
+ ]
+ }
+ }
+ ],
+ "subtype": 16,
+ "table_id": 99,
+ "type": 65535
+ }
}
],
- "len": 32,
+ "len": 128,
"type": 4
}
},
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
index 7e6fcf55..60106984 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-bundle_add.packet.json
@@ -32,9 +32,86 @@
}
}
}
+ },
+ {
+ "NXActionLearn": {
+ "cookie": 0,
+ "experimenter": 8992,
+ "fin_hard_timeout": 0,
+ "fin_idle_timeout": 0,
+ "flags": 0,
+ "hard_timeout": 300,
+ "idle_timeout": 0,
+ "len": 96,
+ "priority": 1,
+ "specs": [
+ {
+ "NXFlowSpecMatch": {
+ "dst": [
+ "vlan_vid",
+ 0
+ ],
+ "n_bits": 12,
+ "src": [
+ "vlan_vid",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecMatch": {
+ "dst": [
+ "eth_dst_nxm",
+ 0
+ ],
+ "n_bits": 48,
+ "src": [
+ "eth_src_nxm",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecLoad": {
+ "dst": [
+ "vlan_vid",
+ 0
+ ],
+ "n_bits": 12,
+ "src": 0
+ }
+ },
+ {
+ "NXFlowSpecLoad": {
+ "dst": [
+ "tunnel_id_nxm",
+ 0
+ ],
+ "n_bits": 64,
+ "src": [
+ "tunnel_id_nxm",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecOutput": {
+ "dst": "",
+ "n_bits": 32,
+ "src": [
+ "in_port",
+ 0
+ ]
+ }
+ }
+ ],
+ "subtype": 16,
+ "table_id": 99,
+ "type": 65535
+ }
}
],
- "len": 32,
+ "len": 128,
"type": 4
}
},
diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
index d4cef972..8a028426 100644
--- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod.packet.json
@@ -28,9 +28,86 @@
}
}
}
+ },
+ {
+ "NXActionLearn": {
+ "cookie": 0,
+ "experimenter": 8992,
+ "fin_hard_timeout": 0,
+ "fin_idle_timeout": 0,
+ "flags": 0,
+ "hard_timeout": 300,
+ "idle_timeout": 0,
+ "len": 96,
+ "priority": 1,
+ "specs": [
+ {
+ "NXFlowSpecMatch": {
+ "dst": [
+ "vlan_vid",
+ 0
+ ],
+ "n_bits": 12,
+ "src": [
+ "vlan_vid",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecMatch": {
+ "dst": [
+ "eth_dst_nxm",
+ 0
+ ],
+ "n_bits": 48,
+ "src": [
+ "eth_src_nxm",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecLoad": {
+ "dst": [
+ "vlan_vid",
+ 0
+ ],
+ "n_bits": 12,
+ "src": 0
+ }
+ },
+ {
+ "NXFlowSpecLoad": {
+ "dst": [
+ "tunnel_id_nxm",
+ 0
+ ],
+ "n_bits": 64,
+ "src": [
+ "tunnel_id_nxm",
+ 0
+ ]
+ }
+ },
+ {
+ "NXFlowSpecOutput": {
+ "dst": "",
+ "n_bits": 32,
+ "src": [
+ "in_port",
+ 0
+ ]
+ }
+ }
+ ],
+ "subtype": 16,
+ "table_id": 99,
+ "type": 65535
+ }
}
],
- "len": 32,
+ "len": 128,
"type": 4
}
},