diff options
| author | Yi Yang <yi.y.yang@intel.com> | 2018-01-06 13:47:51 +0800 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-01-08 13:19:14 -0800 |
| commit | f59cb331c481d08f9a851c07cf31e9d826650485 (patch) | |
| tree | 4aacb2db30cd80a9a7f43f733fa29d49db0ffd65 /ofproto/ofproto-dpif-ipfix.c | |
| parent | d3b8483300532167ece1307252b441de24f07dfa (diff) | |
| download | openvswitch-f59cb331c481d08f9a851c07cf31e9d826650485.tar.gz | |
nsh: rework NSH netlink keys and actions
This patch changes OVS_KEY_ATTR_NSH
to nested attribute and adds three new NSH sub attribute keys:
OVS_NSH_KEY_ATTR_BASE: for length-fixed NSH base header
OVS_NSH_KEY_ATTR_MD1: for length-fixed MD type 1 context
OVS_NSH_KEY_ATTR_MD2: for length-variable MD type 2 metadata
Its intention is to align to NSH kernel implementation.
NSH match fields, set and PUSH_NSH action all use the below
nested attribute format:
OVS_KEY_ATTR_NSH begin
OVS_NSH_KEY_ATTR_BASE
OVS_NSH_KEY_ATTR_MD1
OVS_KEY_ATTR_NSH end
or
OVS_KEY_ATTR_NSH begin
OVS_NSH_KEY_ATTR_BASE
OVS_NSH_KEY_ATTR_MD2
OVS_KEY_ATTR_NSH end
In addition, NSH encap and decap actions are renamed as push_nsh
and pop_nsh to meet action naming convention.
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/ofproto-dpif-ipfix.c')
| -rw-r--r-- | ofproto/ofproto-dpif-ipfix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 4d168784b..2a4353720 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -2822,8 +2822,8 @@ dpif_ipfix_read_actions(const struct flow *flow, case OVS_ACTION_ATTR_POP_MPLS: case OVS_ACTION_ATTR_PUSH_ETH: case OVS_ACTION_ATTR_POP_ETH: - case OVS_ACTION_ATTR_ENCAP_NSH: - case OVS_ACTION_ATTR_DECAP_NSH: + case OVS_ACTION_ATTR_PUSH_NSH: + case OVS_ACTION_ATTR_POP_NSH: case OVS_ACTION_ATTR_UNSPEC: case __OVS_ACTION_ATTR_MAX: default: |