X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fofproto.at;h=e6def3ec7ce0510cb37b6b4b1bc9d02e42a55082;hb=c3729ee42dc25a8240cee6c0041b7db3e4070414;hp=713cc769589ba34a72a949a16c5bca8a0a468828;hpb=007948177581f3b3dad188221593d0e4bdca6ba0;p=openvswitch diff --git a/tests/ofproto.at b/tests/ofproto.at index 713cc769..e6def3ec 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -42,20 +42,50 @@ done OFPROTO_STOP AT_CLEANUP -AT_SETUP([ofproto - basic flow_mod commands]) +AT_SETUP([ofproto - basic flow_mod commands (NXM)]) OFPROTO_START AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS], [0], [NXST_FLOW reply: ]) AT_CHECK([echo 'in_port=1,actions=0' | ovs-ofctl add-flows br0 -]) AT_CHECK([ovs-ofctl add-flow br0 in_port=0,actions=1]) +# Check that a table_id is really sent: +AT_CHECK([ovs-ofctl -F nxm add-flow br0 table=1,in_port=0,actions=1 2>&1 | STRIP_XIDS | sed 1q], [0], [dnl +OFPT_ERROR: type OFPET_FLOW_MOD_FAILED, code NXFMFC_BAD_TABLE_ID +]) AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], [0], [dnl - cookie=0x0, duration=?s, table_id=0, n_packets=0, n_bytes=0, in_port=0 actions=output:1 - cookie=0x0, duration=?s, table_id=0, n_packets=0, n_bytes=0, in_port=1 actions=output:0 - cookie=0x0, duration=?s, table_id=0, n_packets=0, n_bytes=0, in_port=65534 actions=output:1 + cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=0 actions=output:1 + cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 actions=output:0 NXST_FLOW reply: ]) +AT_CHECK([ovs-ofctl dump-aggregate br0 | STRIP_XIDS], [0], [dnl +NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2 +]) AT_CHECK([ovs-ofctl del-flows br0]) AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS], [0], [NXST_FLOW reply: ]) OFPROTO_STOP AT_CLEANUP + +AT_SETUP([ofproto - basic flow_mod commands (OpenFlow 1.0)]) +OFPROTO_START +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS], [0], [OFPST_FLOW reply: +]) +AT_CHECK([echo 'in_port=1,actions=0' | ovs-ofctl -F openflow10 add-flows br0 -]) +AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 in_port=0,actions=1]) +# Check that a table_id is really sent: +AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 table=1,in_port=0,actions=1 2>&1 | STRIP_XIDS | sed 1q], [0], [dnl +OFPT_ERROR: type OFPET_FLOW_MOD_FAILED, code NXFMFC_BAD_TABLE_ID +]) +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], [0], [dnl + cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=0 actions=output:1 + cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 actions=output:0 +OFPST_FLOW reply: +]) +AT_CHECK([ovs-ofctl -F openflow10 dump-aggregate br0 | STRIP_XIDS], [0], [dnl +OFPST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2 +]) +AT_CHECK([ovs-ofctl -F openflow10 del-flows br0]) +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS], [0], [OFPST_FLOW reply: +]) +OFPROTO_STOP +AT_CLEANUP