X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofproto.at;h=f41bfc385d636f6ec514957af7f242114307f434;hb=4d5f814dfb737aae820b8ce70ff0a8b94c291ec3;hp=fe6836312af52d0e49f9a5c324fbb9abd5d5f1ae;hpb=b21eb1dac009d976a7b858b25f0a7bafdbedd227;p=sliver-openvswitch.git diff --git a/tests/ofproto.at b/tests/ofproto.at index fe6836312..f41bfc385 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -61,7 +61,7 @@ OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -vwarn dump-ports br0], [0], [stdout]) AT_CHECK([STRIP_XIDS stdout], [0], [dnl OFPST_PORT reply: 1 ports - port 65534: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0 + port LOCAL: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0 tx pkts=0, bytes=0, drop=0, errs=0, coll=0 ]) OVS_VSWITCHD_STOP @@ -72,7 +72,7 @@ OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn dump-ports br0], [0], [stdout]) AT_CHECK([STRIP_XIDS stdout], [0], [dnl OFPST_PORT reply (OF1.2): 1 ports - port 65534: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0 + port LOCAL: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0 tx pkts=0, bytes=0, drop=0, errs=0, coll=0 ]) OVS_VSWITCHD_STOP @@ -1332,7 +1332,7 @@ echo >>expout "OFPT_ROLE_REPLY (OF1.2) (xid=0x2): role=equal" # Become slave (generation_id is initially undefined, so 2^63+2 should not be stale) ovs-appctl -t ovs-ofctl ofctl/send 031800180000000300000003000000008000000000000002 echo >>expout "send: OFPT_ROLE_REQUEST (OF1.2) (xid=0x3): role=slave generation_id=9223372036854775810" -echo >>expout "OFPT_ROLE_REPLY (OF1.2) (xid=0x3): role=slave" +echo >>expout "OFPT_ROLE_REPLY (OF1.2) (xid=0x3): role=slave generation_id=9223372036854775810" # Try to become the master using a stale generation ID ovs-appctl -t ovs-ofctl ofctl/send 031800180000000400000002000000000000000000000002 @@ -1343,7 +1343,7 @@ echo >>expout "OFPT_ROLE_REQUEST (OF1.2) (xid=0x4): role=master generation_id=2" # Become master using a valid generation ID ovs-appctl -t ovs-ofctl ofctl/send 031800180000000500000002000000000000000000000001 echo >>expout "send: OFPT_ROLE_REQUEST (OF1.2) (xid=0x5): role=master generation_id=1" -echo >>expout "OFPT_ROLE_REPLY (OF1.2) (xid=0x5): role=master" +echo >>expout "OFPT_ROLE_REPLY (OF1.2) (xid=0x5): role=master generation_id=1" ovs-appctl -t ovs-ofctl ofctl/barrier echo >>expout "OFPT_BARRIER_REPLY (OF1.2) (xid=0x3):"