[ovs-git] [openvswitch/ovs] 0cb2fe: ofp-actions: Make encap action really require OF1.3+.

Ben Pfaff noreply at github.com
Sun Jun 9 23:22:13 UTC 2019


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 0cb2fe2f6e87bc1a3ca15d1a8ab9317fc2b6a9e6
      https://github.com/openvswitch/ovs/commit/0cb2fe2f6e87bc1a3ca15d1a8ab9317fc2b6a9e6
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M lib/ofp-actions.c

  Log Message:
  -----------
  ofp-actions: Make encap action really require OF1.3+.

This action is only supported in OpenFlow 1.3 and later, but the parser
from text allowed it in earlier versions, which could cause confusion,
e.g.:

$ ovs-ofctl parse-flow 'actions=encap(ethernet())'
usable protocols: any
chosen protocol: OpenFlow10-table_id
2019-04-30T20:19:59Z|00001|ofp_actions|WARN|unknown OpenFlow10 action for vendor 0x2320 and type 46
2019-04-30T20:19:59Z|00002|ofp_actions|WARN|bad action at offset 0 (OFPBAC_BAD_VENDOR_TYPE):
00000000  ff ff 00 10 00 00 23 20-00 2e 00 00 00 00 00 00
OFPT_FLOW_MOD (xid=0x1): ***decode error: OFPBAC_BAD_VENDOR_TYPE***
00000000  01 0e 00 58 00 00 00 01-00 38 20 ff 00 00 00 00 |...X.....8 .....|
00000010  00 00 00 00 00 00 00 00-00 00 00 00 00 00 00 00 |................|
00000020  00 00 00 00 00 00 00 00-00 00 00 00 00 00 00 00 |................|
00000030  00 00 00 00 00 00 00 00-00 00 00 00 00 00 80 00 |................|
00000040  ff ff ff ff ff ff 00 00-ff ff 00 10 00 00 23 20 |..............# |
00000050  00 2e 00 00 00 00 00 00-                        |........        |

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 1ca203571a82a05e9d21c3c2360875b215b3990f
      https://github.com/openvswitch/ovs/commit/1ca203571a82a05e9d21c3c2360875b215b3990f
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M lib/ofp-actions.c

  Log Message:
  -----------
  ofp-actions: Make decap action format output match parsed input.

The action expects 'type' as a parameter name so it should use 'type' when
it formats actions too.

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: dca97ce8eeaef7ff11f601a85137e312261b4dbc
      https://github.com/openvswitch/ovs/commit/dca97ce8eeaef7ff11f601a85137e312261b4dbc
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M lib/ofp-actions.c

  Log Message:
  -----------
  ofp-actions: Enforce minimum length for packet truncation during parsing.

Otherwise, specifying something like output(port=1,max_len=5) would parse
OK and then cause a failure when it was received by the switch.

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 2e7ac3e0f9bdde325ec25bb0895dbd38c534300a
      https://github.com/openvswitch/ovs/commit/2e7ac3e0f9bdde325ec25bb0895dbd38c534300a
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M lib/ofp-actions.c
    M tests/classifier.at

  Log Message:
  -----------
  ofp-actions: Improve error messages for verification failures in parsing.

Verification can fail for a variety of reasons but the code here always
reported "Incorrect instruction ordering".

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 4e7a226b231b52f75df7ea121ef14297bba786fe
      https://github.com/openvswitch/ovs/commit/4e7a226b231b52f75df7ea121ef14297bba786fe
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M lib/ofp-actions.c

  Log Message:
  -----------
  ofp-actions: Eliminate redundant error messages from ofpacts_parse__().

These duplicate messages emitted by ofpacts_verify(), so drop them.

These were previously useful because ofpacts_verify()'s error messages were
not as good as those emitted by ofpacts_parse__(), but that's been fixed
now.

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 9f0721e989fcaee69882130e31bc4ce223d7f59d
      https://github.com/openvswitch/ovs/commit/9f0721e989fcaee69882130e31bc4ce223d7f59d
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M lib/multipath.c
    M lib/ofp-actions.c

  Log Message:
  -----------
  ofp-actions: Improve a few error messages.

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 4304fd986e11a889af4b8f50e052279b602e5c2a
      https://github.com/openvswitch/ovs/commit/4304fd986e11a889af4b8f50e052279b602e5c2a
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M lib/ofp-group.c
    M utilities/ovs-ofctl.c

  Log Message:
  -----------
  ovs-ofctl: New testing command "parse-group".

This will be used in an upcoming test.

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 70ed59cb589a1d8281daa4a7007aaa74dc9863bd
      https://github.com/openvswitch/ovs/commit/70ed59cb589a1d8281daa4a7007aaa74dc9863bd
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2019-06-09 (Sun, 09 Jun 2019)

  Changed paths:
    M tests/multipath.at
    M tests/ofp-actions.at

  Log Message:
  -----------
  tests: Add negative tests for action and instruction parsing.

This adds a negative test for almost all of the error messages that
parsing an action or instruction can produce.

This commit removes now-redundant tests from multipath.at.

Acked-by: Numan Siddique <nusiddiq at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/b1986b08b97c...70ed59cb589a


More information about the git mailing list