| Message ID | 3efe55e3-de27-b56a-b8e6-6487921ae23c@gmail.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [ovs-dev,1/2] ovs: dump bucket id when doing dump-group-stats | expand |
On Fri, Mar 22, 2019 at 06:26:33PM +0800, solomon wrote: > The bucket id field is added to the ofp11_bucket_counter structure. > So, adjust the corresponding testcases. > > > Signed-off-by: solomon <liwei.solomon@gmail.com> See, you even broke OVS itself. These tests are designed to make sure that doesn't happen.
On 22/03/2019 12:26, solomon wrote: > The bucket id field is added to the ofp11_bucket_counter structure. > So, adjust the corresponding testcases. > > > Signed-off-by: solomon <liwei.solomon@gmail.com> > --- > tests/ofp-print.at | 48 ++++++++++++++++++++++++------------------------ > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/tests/ofp-print.at b/tests/ofp-print.at > index e38ca4ae5..93aa7ec3f 100644 > --- a/tests/ofp-print.at > +++ b/tests/ofp-print.at > @@ -2171,18 +2171,18 @@ AT_CLEANUP > AT_SETUP([NXST_GROUP reply - OF1.0]) > AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) > AT_CHECK([ovs-ofctl ofp-print "\ > -01 11 00 b8 00 00 00 04 ff ff 00 00 00 00 23 20 00 00 00 07 00 00 00 00 \ > -00 58 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ > +01 11 00 e0 00 00 00 04 ff ff 00 00 00 00 23 20 00 00 00 07 00 00 00 00 \ > +00 70 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ > 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ > 00 00 00 12 1d cd 65 00 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ > -00 48 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ > +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 02 00 00 00 00 00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ > +00 58 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ > 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ > 00 00 00 10 1d cd 65 00 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > "], [0], [dnl > NXST_GROUP reply (xid=0x4): > group_id=2271560481,duration=18.500s,ref_count=4,packet_count=34952,byte_count=7829367,bucket0:packet_count=4369,byte_count=2236962,bucket1:packet_count=4369,byte_count=2236962,bucket2:packet_count=26214,byte_count=3355443 > @@ -2193,16 +2193,16 @@ AT_CLEANUP > AT_SETUP([OFPST_GROUP reply - OF1.1]) > AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) > AT_CHECK([ovs-ofctl ofp-print "\ > -02 13 00 a0 00 00 00 02 00 06 00 00 00 00 00 00 \ > -00 50 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ > +02 13 00 c8 00 00 00 02 00 06 00 00 00 00 00 00 \ > +00 68 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ > 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ > -00 40 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ > +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 02 00 00 00 00 00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ > +00 50 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ > 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > "], [0], [dnl > OFPST_GROUP reply (OF1.1) (xid=0x2): > group_id=2271560481,ref_count=4,packet_count=34952,byte_count=7829367,bucket0:packet_count=4369,byte_count=2236962,bucket1:packet_count=4369,byte_count=2236962,bucket2:packet_count=26214,byte_count=3355443 > @@ -2213,18 +2213,18 @@ AT_CLEANUP > AT_SETUP([OFPST_GROUP reply - OF1.3]) > AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) > AT_CHECK([ovs-ofctl ofp-print "\ > -04 13 00 b0 00 00 00 02 00 06 00 00 00 00 00 00 \ > -00 58 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ > +04 13 00 d8 00 00 00 02 00 06 00 00 00 00 00 00 \ > +00 70 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ > 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ > 00 00 00 12 1d cd 65 00 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ > -00 48 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ > +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 02 00 00 00 00 00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ > +00 58 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ > 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ > 00 00 00 10 1d cd 65 00 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ > "], [0], [dnl > OFPST_GROUP reply (OF1.3) (xid=0x2): > group_id=2271560481,duration=18.500s,ref_count=4,packet_count=34952,byte_count=7829367,bucket0:packet_count=4369,byte_count=2236962,bucket1:packet_count=4369,byte_count=2236962,bucket2:packet_count=26214,byte_count=3355443 > Hi, the title of the patch has non utf8 chars after the word 'tests'. can you check please. I see it as ovs: tests???Adjust the test cases about group stats Thanks, Roi
Roi Dayan wrote> > > Hi, > > the title of the patch has non utf8 chars after the word 'tests'. > can you check please. > > I see it as > > ovs: tests???Adjust the test cases about group stats yes, there is a Chinese colon in original title. > > Thanks, > Roi > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/tests/ofp-print.at b/tests/ofp-print.at index e38ca4ae5..93aa7ec3f 100644 --- a/tests/ofp-print.at +++ b/tests/ofp-print.at @@ -2171,18 +2171,18 @@ AT_CLEANUP AT_SETUP([NXST_GROUP reply - OF1.0]) AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) AT_CHECK([ovs-ofctl ofp-print "\ -01 11 00 b8 00 00 00 04 ff ff 00 00 00 00 23 20 00 00 00 07 00 00 00 00 \ -00 58 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ +01 11 00 e0 00 00 00 04 ff ff 00 00 00 00 23 20 00 00 00 07 00 00 00 00 \ +00 70 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ 00 00 00 12 1d cd 65 00 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ -00 48 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 02 00 00 00 00 00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ +00 58 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ 00 00 00 10 1d cd 65 00 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ "], [0], [dnl NXST_GROUP reply (xid=0x4): group_id=2271560481,duration=18.500s,ref_count=4,packet_count=34952,byte_count=7829367,bucket0:packet_count=4369,byte_count=2236962,bucket1:packet_count=4369,byte_count=2236962,bucket2:packet_count=26214,byte_count=3355443 @@ -2193,16 +2193,16 @@ AT_CLEANUP AT_SETUP([OFPST_GROUP reply - OF1.1]) AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) AT_CHECK([ovs-ofctl ofp-print "\ -02 13 00 a0 00 00 00 02 00 06 00 00 00 00 00 00 \ -00 50 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ +02 13 00 c8 00 00 00 02 00 06 00 00 00 00 00 00 \ +00 68 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ -00 40 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 02 00 00 00 00 00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ +00 50 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ "], [0], [dnl OFPST_GROUP reply (OF1.1) (xid=0x2): group_id=2271560481,ref_count=4,packet_count=34952,byte_count=7829367,bucket0:packet_count=4369,byte_count=2236962,bucket1:packet_count=4369,byte_count=2236962,bucket2:packet_count=26214,byte_count=3355443 @@ -2213,18 +2213,18 @@ AT_CLEANUP AT_SETUP([OFPST_GROUP reply - OF1.3]) AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) AT_CHECK([ovs-ofctl ofp-print "\ -04 13 00 b0 00 00 00 02 00 06 00 00 00 00 00 00 \ -00 58 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ +04 13 00 d8 00 00 00 02 00 06 00 00 00 00 00 00 \ +00 70 00 00 87 65 43 21 00 00 00 04 00 00 00 00 \ 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ 00 00 00 12 1d cd 65 00 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ -00 48 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 02 00 00 00 00 00 00 00 00 00 00 66 66 00 00 00 00 00 33 33 33 \ +00 58 00 00 00 00 00 05 00 00 00 02 00 00 00 00 \ 00 00 00 00 00 00 88 88 00 00 00 00 00 77 77 77 \ 00 00 00 10 1d cd 65 00 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ -00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ +00 00 00 01 00 00 00 00 00 00 00 00 00 00 11 11 00 00 00 00 00 22 22 22 \ "], [0], [dnl OFPST_GROUP reply (OF1.3) (xid=0x2): group_id=2271560481,duration=18.500s,ref_count=4,packet_count=34952,byte_count=7829367,bucket0:packet_count=4369,byte_count=2236962,bucket1:packet_count=4369,byte_count=2236962,bucket2:packet_count=26214,byte_count=3355443
The bucket id field is added to the ofp11_bucket_counter structure. So, adjust the corresponding testcases. Signed-off-by: solomon <liwei.solomon@gmail.com> --- tests/ofp-print.at | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)