From 3edfee0cd6b4da5cdc08531203d9c6b7e22ca6d5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 18 Dec 2019 19:44:04 +0100
Subject: [PATCH] Retire repository

Fuel repositories are all retired in openstack namespace, retire
remaining fuel repos in x namespace since they are unused now.

This change removes all content from the repository and adds the usual
README file to point out that the repository is retired following the
process from
https://docs.openstack.org/infra/manual/drivers.html#retiring-a-project

See also
http://lists.openstack.org/pipermail/openstack-discuss/2019-December/011675.html

A related change is: https://review.opendev.org/699752 .

Change-Id: Ia8e2df72f78f661b8b72c1960030de0c16cd1ab3
---
 .gitignore                                    |    2 -
 LICENSE                                       |  202 --
 README.md                                     |  134 -
 README.rst                                    |   10 +
 demo/00_bootstrap.sh                          |    9 -
 demo/01_setup_redsocks.sh                     |   47 -
 demo/02_install_packages.sh                   |   38 -
 demo/03_setup_vnc.sh                          |   26 -
 demo/04_setup_fuel.sh                         |  100 -
 demo/94_destroy_fuel.sh                       |   13 -
 demo/README.DPDK.md                           |   29 -
 demo/README.md                                |   56 -
 demo/fuel-master.xml                          |   94 -
 demo/fuel-slave-dpdk.xml                      |  104 -
 demo/fuel-slave.xml                           |   87 -
 deployment_scripts/install.sh                 |   22 -
 .../puppet/manifests/ovs-install.pp           |   17 -
 .../puppet/manifests/ovs-update-flavors.pp    |    9 -
 deployment_scripts/update_flavors.sh          |   10 -
 deployment_tasks.yaml                         |   10 -
 environment_config.yaml                       |   11 -
 metadata.yaml                                 |   32 -
 ovs_build/Dockerfile                          |   11 -
 ovs_build/build-ovs-dpdk.sh                   |   96 -
 ovs_build/build-ovs-nsh.sh                    |   60 -
 .../dpdk_16.07.fuel/debian/README.source      |   42 -
 ovs_build/dpdk_16.07.fuel/debian/changelog    |  528 ---
 ovs_build/dpdk_16.07.fuel/debian/compat       |    1 -
 ovs_build/dpdk_16.07.fuel/debian/control      |  747 ----
 .../dpdk_16.07.fuel/debian/control.modules.in |   14 -
 ovs_build/dpdk_16.07.fuel/debian/copyright    |  136 -
 .../debian/dpdk-dev.lintian-overrides         |    3 -
 .../debian/dpdk-doc.README.Debian             |   64 -
 .../debian/dpdk-doc.lintian-overrides         |    1 -
 .../debian/dpdk-igb-uio-dkms.dkms             |    7 -
 ovs_build/dpdk_16.07.fuel/debian/dpdk-init    |  251 --
 .../debian/dpdk-rte-kni-dkms.dkms             |    7 -
 .../dpdk_16.07.fuel/debian/dpdk-sdk-env.sh.in |    4 -
 ovs_build/dpdk_16.07.fuel/debian/dpdk.conf    |   54 -
 ovs_build/dpdk_16.07.fuel/debian/dpdk.init    |   57 -
 ovs_build/dpdk_16.07.fuel/debian/dpdk.install |    2 -
 .../dpdk_16.07.fuel/debian/dpdk.interfaces    |   19 -
 ovs_build/dpdk_16.07.fuel/debian/dpdk.service |   12 -
 .../dpdk_16.07.fuel/debian/kernel-version     |   61 -
 .../dpdk_16.07.fuel/debian/libdpdk.pc.in      |   10 -
 .../dpdk_16.07.fuel/debian/libethdev4.symbols |  116 -
 .../debian/librte-acl2.symbols                |   15 -
 .../debian/librte-cfgfile2.symbols            |   13 -
 .../debian/librte-cmdline2.symbols            |   68 -
 .../debian/librte-cryptodev1.symbols          |   32 -
 .../debian/librte-distributor1.symbols        |   11 -
 .../debian/librte-eal2.symbols                |  136 -
 .../debian/librte-hash2.symbols               |   28 -
 .../debian/librte-ip-frag1.symbols            |    9 -
 .../debian/librte-jobstats1.symbols           |   17 -
 .../debian/librte-kni2.symbols                |   13 -
 .../debian/librte-kvargs1.symbols             |    6 -
 .../debian/librte-lpm2.symbols                |   27 -
 .../debian/librte-mbuf2.symbols               |   11 -
 .../debian/librte-mempool2.symbols            |   31 -
 .../debian/librte-meter1.symbols              |    4 -
 .../debian/librte-pdump1.symbols              |    9 -
 .../debian/librte-pipeline3.symbols           |   28 -
 .../debian/librte-pmd-af-packet1.symbols      |    4 -
 .../debian/librte-pmd-bnxt1.symbols           |    4 -
 .../debian/librte-pmd-bond1.symbols           |   29 -
 .../debian/librte-pmd-cxgbe1.symbols          |    4 -
 .../debian/librte-pmd-e1000-1.symbols         |    4 -
 .../debian/librte-pmd-ena1.symbols            |    4 -
 .../debian/librte-pmd-enic1.symbols           |    4 -
 .../debian/librte-pmd-fm10k1.symbols          |    4 -
 .../debian/librte-pmd-i40e1.symbols           |    4 -
 .../debian/librte-pmd-ixgbe1.symbols          |    4 -
 .../debian/librte-pmd-null-crypto1.symbols    |    4 -
 .../debian/librte-pmd-null1.symbols           |    4 -
 .../debian/librte-pmd-pcap1.symbols           |    4 -
 .../debian/librte-pmd-ring2.symbols           |    5 -
 .../debian/librte-pmd-vhost1.symbols          |    6 -
 .../debian/librte-pmd-virtio1.symbols         |    4 -
 .../debian/librte-pmd-vmxnet3-uio1.symbols    |    4 -
 .../debian/librte-pmd-xenvirt1.symbols        |    3 -
 .../debian/librte-port3.symbols               |   25 -
 .../debian/librte-power1.symbols              |   14 -
 .../debian/librte-reorder1.symbols            |    9 -
 .../debian/librte-ring1.symbols               |   11 -
 .../debian/librte-sched1.symbols              |   22 -
 .../debian/librte-table2.symbols              |   19 -
 .../debian/librte-timer1.symbols              |   11 -
 .../debian/librte-vhost3.symbols              |   18 -
 ...-fix-old-dpdk-nic-bind.py-references.patch |  126 -
 ...ip_pipeline-fix-pmd-driver-parameter.patch |   39 -
 ...ool-guides-in-their-own-subdirectory.patch |  528 ---
 ...dering-and-installation-of-man-pages.patch |   56 -
 ...sic-invocation-info-for-dpdk-pmdinfo.patch |   88 -
 ...sic-invocation-info-for-dpdk-devbind.patch |  190 -
 ...dev-v2-kni-fix-build-with-kernel-4.8.patch |   35 -
 .../patches/fix-double-license-info.patch     | 1324 -------
 .../patches/fix-unusual-interpreter.patch     |   35 -
 .../fix-vhost-user-socket-permission.patch    |  371 --
 ...l-config-not-to-appear-as-executable.patch |   86 -
 .../patches/rte-compile-pre-cppflags.patch    |   48 -
 .../debian/patches/rte-devel-build-env.patch  |   37 -
 .../dpdk_16.07.fuel/debian/patches/series     |   13 -
 ovs_build/dpdk_16.07.fuel/debian/prep-modules |  118 -
 ovs_build/dpdk_16.07.fuel/debian/rules        |  247 --
 .../dpdk_16.07.fuel/debian/source/format      |    1 -
 .../dpdk_16.07.fuel/debian/source/options     |    1 -
 .../debian/tests/check-dpdk-supported-arch.sh |   12 -
 .../dpdk_16.07.fuel/debian/tests/control      |   13 -
 .../dpdk_16.07.fuel/debian/tests/test-dkms    |   22 -
 .../debian/tests/test-initscripts             |  143 -
 .../dpdk_16.07.fuel/debian/tests/test-linkage |   51 -
 ovs_build/dpdk_16.07.fuel/debian/watch        |    2 -
 .../debian/automake.mk                        |   19 -
 .../openvswitch_2.6-dpdk_16.07/debian/compat  |    1 -
 .../openvswitch_2.6-dpdk_16.07/debian/control |   54 -
 .../debian/copyright                          |  716 ----
 .../debian/copyright.in                       |  716 ----
 .../openvswitch-switch-dpdk.README.Debian     |   42 -
 .../debian/openvswitch-switch-dpdk.postinst   |   11 -
 .../debian/openvswitch-switch-dpdk.prerm      |   10 -
 .../debian/ovs-monitor-ipsec                  |  494 ---
 .../debian/patches/series                     |    1 -
 .../openvswitch_2.6-dpdk_16.07/debian/rules   |   68 -
 .../debian/source/format                      |    1 -
 .../debian/tests/common                       |   23 -
 .../debian/tests/control                      |    4 -
 .../debian/tests/kernel                       |    5 -
 .../debian/tests/openflow                     |    7 -
 .../debian/tests/openflow.py                  |   66 -
 .../openvswitch_2.6-dpdk_16.07/debian/watch   |    2 -
 ...xLAN-gpe-work-and-meet-NSH-requireme.patch |  614 ----
 ...-in-kernel-and-userspace-data-planes.patch | 3147 -----------------
 .../0003-Fix-too-large-stack-frame-size.patch |  259 --
 ...4-Fix-vxlangpe-issues-on-DPDK-netdev.patch |  127 -
 ...ld-IDs-and-action-IDs-to-adapt-to-OD.patch |  197 --
 .../0006-To-be-compatible-with-vpp_nsh.patch  |   31 -
 ...007-Fix-struct-ovs_gso_cb-size-issue.patch |   67 -
 ...-set-udp-dst-port-in-tunnel-metadata.patch |   84 -
 pre_build_hook                                |   37 -
 tasks.yaml                                    |    1 -
 vagrant/Vagrantfile                           |   21 -
 vagrant/build_fuel_plugin.sh                  |    9 -
 143 files changed, 10 insertions(+), 14461 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 LICENSE
 delete mode 100644 README.md
 create mode 100644 README.rst
 delete mode 100755 demo/00_bootstrap.sh
 delete mode 100755 demo/01_setup_redsocks.sh
 delete mode 100755 demo/02_install_packages.sh
 delete mode 100755 demo/03_setup_vnc.sh
 delete mode 100755 demo/04_setup_fuel.sh
 delete mode 100755 demo/94_destroy_fuel.sh
 delete mode 100644 demo/README.DPDK.md
 delete mode 100644 demo/README.md
 delete mode 100644 demo/fuel-master.xml
 delete mode 100644 demo/fuel-slave-dpdk.xml
 delete mode 100644 demo/fuel-slave.xml
 delete mode 100755 deployment_scripts/install.sh
 delete mode 100644 deployment_scripts/puppet/manifests/ovs-install.pp
 delete mode 100644 deployment_scripts/puppet/manifests/ovs-update-flavors.pp
 delete mode 100755 deployment_scripts/update_flavors.sh
 delete mode 100644 deployment_tasks.yaml
 delete mode 100644 environment_config.yaml
 delete mode 100644 metadata.yaml
 delete mode 100644 ovs_build/Dockerfile
 delete mode 100755 ovs_build/build-ovs-dpdk.sh
 delete mode 100755 ovs_build/build-ovs-nsh.sh
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/README.source
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/changelog
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/compat
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/control
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/control.modules.in
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/copyright
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk-dev.lintian-overrides
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.README.Debian
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.lintian-overrides
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk-igb-uio-dkms.dkms
 delete mode 100755 ovs_build/dpdk_16.07.fuel/debian/dpdk-init
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk-rte-kni-dkms.dkms
 delete mode 100755 ovs_build/dpdk_16.07.fuel/debian/dpdk-sdk-env.sh.in
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk.conf
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk.init
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk.install
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk.interfaces
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/dpdk.service
 delete mode 100755 ovs_build/dpdk_16.07.fuel/debian/kernel-version
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/libdpdk.pc.in
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/libethdev4.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-acl2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-cfgfile2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-cmdline2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-cryptodev1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-distributor1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-eal2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-hash2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-ip-frag1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-jobstats1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-kni2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-kvargs1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-lpm2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-mbuf2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-mempool2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-meter1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pdump1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pipeline3.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-af-packet1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bnxt1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bond1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-cxgbe1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-e1000-1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ena1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-enic1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-fm10k1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-i40e1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ixgbe1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null-crypto1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-pcap1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ring2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vhost1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-virtio1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vmxnet3-uio1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-pmd-xenvirt1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-port3.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-power1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-reorder1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-ring1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-sched1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-table2.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-timer1.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/librte-vhost3.symbols
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-1-4-doc-move-tool-guides-in-their-own-subdirectory.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/fix-double-license-info.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/fix-unusual-interpreter.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/fix-vhost-user-socket-permission.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/rte-compile-pre-cppflags.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/rte-devel-build-env.patch
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/patches/series
 delete mode 100755 ovs_build/dpdk_16.07.fuel/debian/prep-modules
 delete mode 100755 ovs_build/dpdk_16.07.fuel/debian/rules
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/source/format
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/source/options
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/tests/check-dpdk-supported-arch.sh
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/tests/control
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/tests/test-dkms
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/tests/test-initscripts
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/tests/test-linkage
 delete mode 100644 ovs_build/dpdk_16.07.fuel/debian/watch
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/automake.mk
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/compat
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/control
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright.in
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.README.Debian
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.postinst
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.prerm
 delete mode 100755 ovs_build/openvswitch_2.6-dpdk_16.07/debian/ovs-monitor-ipsec
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/patches/series
 delete mode 100755 ovs_build/openvswitch_2.6-dpdk_16.07/debian/rules
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/source/format
 delete mode 100755 ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/common
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/control
 delete mode 100755 ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/kernel
 delete mode 100755 ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow
 delete mode 100755 ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow.py
 delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/watch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0001-Enable-current-VxLAN-gpe-work-and-meet-NSH-requireme.patch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0002-Add-NSH-support-in-kernel-and-userspace-data-planes.patch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0003-Fix-too-large-stack-frame-size.patch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0004-Fix-vxlangpe-issues-on-DPDK-netdev.patch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0006-To-be-compatible-with-vpp_nsh.patch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0007-Fix-struct-ovs_gso_cb-size-issue.patch
 delete mode 100644 ovs_build/ovs_nsh_patches/v2.6.1/0008-tunnel-set-udp-dst-port-in-tunnel-metadata.patch
 delete mode 100755 pre_build_hook
 delete mode 100644 tasks.yaml
 delete mode 100644 vagrant/Vagrantfile
 delete mode 100755 vagrant/build_fuel_plugin.sh

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5f5f7f4..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.build
-.vagrant
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index e06d208..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/README.md b/README.md
deleted file mode 100644
index 660fc1f..0000000
--- a/README.md
+++ /dev/null
@@ -1,134 +0,0 @@
-Openvswitch Plugin for Fuel
-================================
-
-Openvswitch plugin
------------------------
-
-Overview
---------
-
-Fuel plugin fuel-plugin-ovs is developed to deploy OVS with NSH
-
-Requirements
-------------
-
-| Requirement                      | Version/Comment |
-|----------------------------------|-----------------|
-| Mirantis OpenStack compatibility | 10.0            |
-
-Recommendations
----------------
-
-None.
-
-Limitations
------------
-
-None.
-
-Installation Guide
-==================
-
-Openvswitch plugin installation
-----------------------------------------
-
-1. Clone the fuel-plugin-ovs repo from stackforge:
-
-        git clone https://github.com/openstack/fuel-plugin-ovs
-
-2. Install the Fuel Plugin Builder:
-
-        pip install fuel-plugin-builder
-
-3. Build Openvswitch Fuel plugin:
-
-        fpb --build fuel-plugin-ovs/
-
-4. The *fuel-plugin-ovs-[x.x.x].rpm* plugin package will be created in the plugin folder.
-
-5. Move this file to the Fuel Master node with secure copy (scp):
-
-        scp fuel-plugin-ovs-[x.x.x].rpm root@<the_Fuel_Master_node_IP address>:/tmp
-
-6. While logged in Fuel Master install the Openvswitch plugin:
-
-        fuel plugins --install fuel-plugin-ovs-[x.x.x].rpm
-
-7. Check if the plugin was installed successfully:
-
-        fuel plugins
-
-        id | name            | version | package_version
-        ---|-----------------|---------|----------------
-        1  | fuel-plugin-ovs | 1.0.0   | 4.0.0
-
-8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
-
-
-User Guide
-==========
-
-Openvswitch plugin configuration
----------------------------------------------
-
-1. Create a new environment with the Fuel UI wizard.
-2. Click on the Settings tab of the Fuel web UI.
-3. Scroll down the page, select the plugin checkbox.
-
-
-Build options
--------------
-
-It is possible to modify process of building plugin by setting environment variables. Look into [pre_build_hook file](pre_build_hook) for more details.
-
-Dependencies
-------------
-
-If you plan to use plugin in environment without internet access or/and CentOS environment modify build command:
-
-     INCLUDE_DEPENDENCIES=true fpb --build fuel-plugin-ovs/
-
-Pre build script will try download required dependencies so it become part of the compiled plugin.
-
-Note: List of packages for [ubuntu](ovs_package/ubuntu/dependencies.txt) and [centos](ovs_package/centos/dependencies.txt) may need to be modified if packages in centos or ubuntu repositories will change.
-
-Testing
--------
-
-None.
-
-Known issues
-------------
-
-None.
-
-
-Development
-===========
-
-The *OpenStack Development Mailing List* is the preferred way to communicate,
-emails should be sent to `openstack-dev@lists.openstack.org` with the subject
-prefixed by `[fuel][plugins][ovs]`.
-
-Reporting Bugs
---------------
-
-Bugs should be filled on the [Launchpad fuel-plugins project](
-https://bugs.launchpad.net/fuel-plugins) (not GitHub) with the tag `ovs`.
-
-
-Contributing
-------------
-
-If you would like to contribute to the development of this Fuel plugin you must
-follow the [OpenStack development workflow](
-http://docs.openstack.org/infra/manual/developers.html#development-workflow).
-
-Patch reviews take place on the [OpenStack gerrit](
-https://review.openstack.org/#/q/status:open+project:stackforge/fuel-plugin-ovs,n,z)
-system.
-
-Contributors
-------------
-
-* ling.y.yu@intel.com,ruijing.guo@intel.com
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..86e34d6
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,10 @@
+This project is no longer maintained.
+
+The contents of this repository are still available in the Git
+source code management system.  To see the contents of this
+repository before it reached its end of life, please check out the
+previous commit with "git checkout HEAD^1".
+
+For any further questions, please email
+openstack-discuss@lists.openstack.org or join #openstack-dev on
+Freenode.
diff --git a/demo/00_bootstrap.sh b/demo/00_bootstrap.sh
deleted file mode 100755
index d1f820d..0000000
--- a/demo/00_bootstrap.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-HTTP_PROXY=${HTTP_PROXY:-http://127.0.0.1:1080}
-cat <<EOF | sudo tee /etc/apt/apt.conf
-Acquire::http::Proxy "$HTTP_PROXY";
-EOF
-
-sudo apt-get update -y
-sudo apt-get install -y openssh-server git redsocks
diff --git a/demo/01_setup_redsocks.sh b/demo/01_setup_redsocks.sh
deleted file mode 100755
index abb8b85..0000000
--- a/demo/01_setup_redsocks.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-SOCKS5_IP=${SOCKS5_IP:-127.0.0.1}
-SOCKS5_PORT=${SOCKS5:-1080}
-RED_TCPORT=${RED_TCPORT:-6666}
-
-cat <<EOF | sudo tee /etc/redsocks.conf
-base {
- log_debug = on;
- log_info = on;
- log = "file:/root/proxy.log";
- daemon = on;
- redirector = iptables;
-}
-
-redsocks {
- local_ip = 0.0.0.0;
- local_port = ${RED_TCPORT};
- ip = $SOCKS5_IP;
- port = $SOCKS5_PORT;
- type = socks5;
-}
-
-EOF
-
-sudo apt-get install iptables -y
-
-echo  1 | sudo tee /proc/sys/net/ipv4/ip_forward
-
-sudo iptables -t filter -F
-sudo iptables -t mangle -F
-sudo iptables -t nat -F
-
-sudo iptables -t nat -N REDSOCKS
-sudo iptables -t nat -A REDSOCKS -d 0.0.0.0/8 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 10.0.0.0/8 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 127.0.0.0/8 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 169.254.0.0/16 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 172.16.0.0/12 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 192.168.0.0/16 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 224.0.0.0/4 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 240.0.0.0/4 -j RETURN
-sudo iptables -t nat -A REDSOCKS -p tcp -j REDIRECT --to-ports ${RED_TCPORT}
-sudo iptables -t nat -A OUTPUT -p tcp  -j REDSOCKS
-sudo iptables -t nat -A PREROUTING -p tcp  -j REDSOCKS
-
-sudo service redsocks restart
diff --git a/demo/02_install_packages.sh b/demo/02_install_packages.sh
deleted file mode 100755
index d606490..0000000
--- a/demo/02_install_packages.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-user=`whoami`
-
-cat << EOF | sudo tee /etc/sudoers.d/${user}
-${user} ALL = (root) NOPASSWD:ALL
-EOF
-
-sudo apt-get update -y
-sudo apt-get install openssh-server git -y
-
-#install vnc
-sudo apt-get install gnome-session gnome-panel gnome-settings-daemon metacity nautilus gnome-terminal vnc4server -y
-
-#install libvirt/qemu
-sudo apt-get install virt-manager libvirt-bin qemu-system -y
-sudo virsh net-destroy default
-sudo virsh net-undefine default
-sudo rm -rf /etc/libvirt/qemu/networks/autostart/default.xml
-cat << EOF | sudo tee /etc/libvirt/qemu.conf
-user = "root"
-group = "root"
-EOF
-
-sudo service libvirt-bin restart
-sudo ifconfig virbr0 down
-sudo brctl delbr virbr0
-sudo apt-get install putty-tools -y
-
-#install ntp
-sudo service ntp stop
-sudo apt-get autoremove ntp -y
-sudo apt-get install ntp -y --force-yes
-cat << EOF | sudo tee /etc/ntp.conf
-server 127.127.1.0
-fudge  127.127.1.0 stratum 10
-EOF'
-sudo service ntp restart
diff --git a/demo/03_setup_vnc.sh b/demo/03_setup_vnc.sh
deleted file mode 100755
index cf95a84..0000000
--- a/demo/03_setup_vnc.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-rm -rf ~/.vnc; mkdir ~/.vnc
-echo "123456\n123456\n" | vncpasswd
-
-cat << EOF > ~/.vnc/xstartup
-#!/bin/bash
-export LC_ALL="en_US.UTF-8"
-DESK_TYPE=gnome
-export XKL_XMODMAP_DISABLE=1
-unset SESSION_MANAGER
-unset DBUS_SESSION_BUS_ADDRESS
-[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup [ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
-xsetroot -solid grey
-vncconfig -iconic &
-vncconfig -nowin &
-gnome-session &
-gnome-panel &
-gnome-settings-daemon &
-metacity &
-nautilus -n &
-gnome-terminal &
-EOF
-
-chmod 755 ~/.vnc/xstartup
-vnc4server -geometry 1650x950 -depth 16 &
-echo "vnc password is 123456"
diff --git a/demo/04_setup_fuel.sh b/demo/04_setup_fuel.sh
deleted file mode 100755
index 729f204..0000000
--- a/demo/04_setup_fuel.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-DNS_SERVER=${DNS_SERVER:-10.248.2.1}
-SUPPORT_DPDK=${SUPPORT_DPDK:-false}
-
-ls *.iso &> /dev/null || (echo "pls download fuel iso here" && exit 0)
-
-#setup ntp server
-sudo service ntp restart
-
-#setup network
-
-sudo ifconfig br-eth0 down
-sudo brctl delbr br-eth0
-sudo brctl addbr br-eth0
-sudo ifconfig br-eth0 10.20.0.1/24 up
-
-sudo ifconfig br-eth1 down
-sudo brctl delbr br-eth1
-sudo brctl addbr br-eth1
-sudo ifconfig br-eth1 172.16.0.1/24 up
-
-if [ $SUPPORT_DPDK = 'true' ]
-then
-    sudo ifconfig br-dpdk down
-    sudo brctl delbr br-dpdk
-    sudo brctl addbr br-dpdk
-    sudo ifconfig br-dpdk up
-fi
-
-sudo iptables -t nat -D PREROUTING  -j PRE_FUEL
-sudo iptables -t nat -N PRE_FUEL
-sudo iptables -t nat -F PRE_FUEL
-sudo iptables -t nat -A PRE_FUEL -p udp --dport 53  -j DNAT --to-destination $DNS_SERVER
-sudo iptables -t nat -A PRE_FUEL -p udp --dport 123 -j DNAT --to-destination 10.20.0.1
-sudo iptables -t nat -A PREROUTING  -j PRE_FUEL
-
-sudo iptables -t nat -D POSTROUTING  -j POST_FUEL
-sudo iptables -t nat -N POST_FUEL
-sudo iptables -t nat -F POST_FUEL
-sudo iptables -t nat -A POST_FUEL -s 10.20.0.0/24 -j MASQUERADE
-sudo iptables -t nat -A POST_FUEL -s 172.16.0.0/24 -j MASQUERADE
-sudo iptables -t nat -A POSTROUTING  -j POST_FUEL
-
-#setup master
-
-sudo virt-manager
-sudo virsh destroy fuel-master
-sudo rm -rf /var/lib/libvirt/images/fuel-master.img
-sudo qemu-img create -f qcow2 /var/lib/libvirt/images/fuel-master.img 200G
-
-mkdir -p vms
-
-iso=`pwd`/`ls *.iso`
-sed  "s~ISO_FILE~$iso~g" fuel-master.xml > vms/fuel-master.xml
-
-sudo virsh create vms/fuel-master.xml
-
-#login fuel master
-sleep 30
-rm -rf ~/.ssh/known_hosts
-sudo rm -rf ~/.putty
-inprog=1
-while [ $inprog -ne 0 ]
-do
-   echo "y\n" | plink -ssh -pw r00tme root@10.20.0.2 "echo y" >& /dev/null
-   inprog=$?
-   sleep 20
-done
-
-plink -ssh  -pw r00tme root@10.20.0.2 "cat /etc/fuel/astute.yaml" > astute.yaml
-sed -i "/.*FEATURE_GROUPS.*/s/\[\]/\n \- \"experimental\"/" astute.yaml
-cat astute.yaml | plink -ssh  -pw r00tme root@10.20.0.2 "dd of=/etc/fuel/astute.yaml"
-plink -ssh  -pw r00tme root@10.20.0.2 "pkill fuelmenu"
-
-inprog=1
-while [ $inprog -ne 0 ]
-do
-   echo "y\n" | plink -ssh -pw r00tme root@10.20.0.2 "grep 'Fuel node deployment complete' /var/log/puppet/bootstrap_admin_node.log "  >& /dev/null
-   inprog=$?
-   sleep 20
-done
-
-if [ $SUPPORT_DPDK = 'true' ]
-then
-    fuel_slave_xml='fuel-slave-dpdk.xml'
-else
-    fuel_slave_xml='fuel-slave.xml'
-fi
-#setup slave
-for i in {1..4}; do
-    sudo virsh destroy fuel-slave-$i
-    sudo rm -rf /var/lib/libvirt/images/fuel-slave-${i}.img
-    sudo qemu-img create -f qcow2 /var/lib/libvirt/images/fuel-slave-${i}.img 200G
-    sed "s/FUEL_SLAVE/fuel-slave-$i/g" $fuel_slave_xml > vms/fuel-slave-${i}.xml
-    sudo virsh create vms/fuel-slave-${i}.xml
-done
-
-#setup web browser
-firefox https://10.20.0.2:8443 >& /dev/null &
diff --git a/demo/94_destroy_fuel.sh b/demo/94_destroy_fuel.sh
deleted file mode 100755
index 53946c7..0000000
--- a/demo/94_destroy_fuel.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-sudo virt-manager
-
-#destroy master
-sudo virsh destroy fuel-master
-sudo rm -rf /var/lib/libvirt/images/fuel-master.img
-
-#destroy slave
-for i in {1..4}; do
-    sudo virsh destroy fuel-slave-$i
-    sudo rm -rf /var/lib/libvirt/images/fuel-slave-${i}.img
-done
diff --git a/demo/README.DPDK.md b/demo/README.DPDK.md
deleted file mode 100644
index b7395bc..0000000
--- a/demo/README.DPDK.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Fuel OVS + DPDK Plugin Demo
-===========================
-
-Overview
---------
-
-How to enable OVS + DPDK plugin in fuel 9.0
-
-How to enalbe
--------------
-
-1. ssh to the master node
-2. Edit FEATURE_GROUPS field in /etc/nailgun/settings.yaml as:
- FEATURE_GROUPS:
-   - "experimental"
-3. Restart Nailgun
-   systemctl restart nailgun.
-   delete cluster nodes from fuel DB as fuel node --node-id 1,2 --delete-from-db --force.
-   Boot cluster nodes.
-4. set OVS plugin
-
-5. Follow document[1] 
-
-6. Enable Hugepages for Guest VM
-   nova flavor-key m1.tiny set hw:mem_page_size=2048
-
-Related Documents
----------------
-[1] http://github.com/openstack/fuel-specs/blob/master/specs/9.0/support-dpdk.rst
diff --git a/demo/README.md b/demo/README.md
deleted file mode 100644
index d23e699..0000000
--- a/demo/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-Fuel OVS Plugin Demo Script
-===========================
-
-Overview
---------
-
-This directory includes scripts to setup fuel ovs plugin demo.
-
-The scripts are ONLY tested in new installation of Ubuntu 14.04.03 Desktop
-64bit in server:
-a. 16G Memory
-b. 1T Disk
-c. virtualization support
-
-Extra configuration or Extra packages such as virtualbox may break
-functionality. All packages or network configuration are provided by the
-the following scripts.
-
-Scripts
--------
-
-0. 00_bootstrap.sh
-   a. copy from https://raw.githubusercontent.com/openstack/fuel-plugin-ovs/master/demo/00_bootstrap.sh
-   b. change HTTP_PROXY
-   c. run the script
-
-1. 01_setup_network.sh
-
-The script is to setup socks5 proxy. You may change the script to support
-NAT. The following network setting is updated before running the script:
-
-a. SOCK5_IP:  socks5 proxy for fuel VM
-b. SOCK5_PORT: socks5 proxy for fuel VM
-b. RED_TCPORT: redsocks tcp port
-
-2. 02_install_packages.sh
-
-The script is to install all packages
-
-3. 03_setup_vnc.sh
-
-The script is to setup vnc. Default vnc password is 123456.
-
-4. 04_setup_fuel.sh
-
-The script is to create 1 master VM and 4 slave VMs:
-
-a. change DNS_SERVER
-b. download ISO in fuel-plugin-ovs/demo
-   Examle1: wget http://seed-us1.fuel-infra.org/fuelweb-community-release/fuel-community-9.0.iso.
-   Examle2: wget http://artifacts.opnfv.org/fuel/opnfv-2016-08-03_23-58-37.iso
-c. run the script
-
-5. 94_destroy_fuel.sh
-
-The script is to destroy 1 master VM and 4 slave VMs.
diff --git a/demo/fuel-master.xml b/demo/fuel-master.xml
deleted file mode 100644
index 647beca..0000000
--- a/demo/fuel-master.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<domain type='kvm' id='5'>
-  <name>fuel-master</name>
-  <memory unit='KiB'>4194304</memory>
-  <currentMemory unit='KiB'>4194304</currentMemory>
-  <vcpu placement='static'>4</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-trusty'>hvm</type>
-    <boot dev='hd'/>
-    <boot dev='cdrom'/>
-    <bootmenu enable='yes'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/fuel-master.img'/>
-      <target dev='hda' bus='ide'/>
-      <alias name='ide0-0-0'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='qemu' type='raw'/>
-      <source file='ISO_FILE' />
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <alias name='ide0-1-0'/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <controller type='usb' index='0'>
-      <alias name='usb0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'>
-      <alias name='pci.0'/>
-    </controller>
-    <controller type='ide' index='0'>
-      <alias name='ide0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
-    <interface type='bridge'>
-      <source bridge='br-eth0'/>
-      <target dev='vnet0'/>
-      <model type='virtio'/>
-      <alias name='net0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <serial type='pty'>
-      <source path='/dev/pts/16'/>
-      <target port='0'/>
-      <alias name='serial0'/>
-    </serial>
-    <console type='pty' tty='/dev/pts/16'>
-      <source path='/dev/pts/16'/>
-      <target type='serial' port='0'/>
-      <alias name='serial0'/>
-    </console>
-    <input type='tablet' bus='usb'>
-      <alias name='input0'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-    </graphics>
-    <sound model='ich6'>
-      <alias name='sound0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </sound>
-    <video>
-      <model type='cirrus' vram='9216' heads='1'/>
-      <alias name='video0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </video>
-    <memballoon model='virtio'>
-      <alias name='balloon0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'>
-  </seclabel>
-</domain>
-
diff --git a/demo/fuel-slave-dpdk.xml b/demo/fuel-slave-dpdk.xml
deleted file mode 100644
index 2dee24a..0000000
--- a/demo/fuel-slave-dpdk.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<domain type='kvm' id='75'>
-  <name>FUEL_SLAVE</name>
-  <memory unit='KiB'>4194304</memory>
-  <currentMemory unit='KiB'>4194304</currentMemory>
-  <vcpu placement='static'>4</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-trusty'>hvm</type>
-    <boot dev='network'/>
-    <boot dev='hd'/>
-    <bootmenu enable='no' />
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>SandyBridge</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='aes'/>
-    <feature policy='require' name='avx'/>
-    <feature policy='require' name='avx2'/>
-    <feature policy='require' name='f16c'/>
-    <feature policy='require' name='fsgsbase'/>
-    <feature policy='require' name='pclmuldq'/>
-    <feature policy='require' name='rdrand'/>
-    <feature policy='require' name='sse'/>
-    <feature policy='require' name='sse2'/>
-    <feature policy='require' name='ssse3'/>
-    <feature policy='require' name='sse4.1'/>
-    <feature policy='require' name='sse4.2'/>
-    <feature policy='require' name='vmx'/>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/FUEL_SLAVE.img'/>
-      <target dev='vda' bus='virtio'/>
-      <alias name='virtio-disk0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0'>
-      <alias name='usb0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'>
-      <alias name='pci.0'/>
-    </controller>
-    <interface type='bridge'>
-      <source bridge='br-eth0'/>
-      <model type='e1000' />
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='br-eth1'/>
-      <model type='e1000' />
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='br-dpdk'/>
-      <model type='e1000' />
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
-    </interface>
-    <serial type='pty'>
-      <source path='/dev/pts/20'/>
-      <target port='0'/>
-      <alias name='serial0'/>
-    </serial>
-    <console type='pty' tty='/dev/pts/20'>
-      <source path='/dev/pts/20'/>
-      <target type='serial' port='0'/>
-      <alias name='serial0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-    </graphics>
-    <sound model='ich6'>
-      <alias name='sound0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </sound>
-    <video>
-      <model type='cirrus' vram='9216' heads='1'/>
-      <alias name='video0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </video>
-    <memballoon model='virtio'>
-      <alias name='balloon0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'>
-  </seclabel>
-</domain>
-
diff --git a/demo/fuel-slave.xml b/demo/fuel-slave.xml
deleted file mode 100644
index 3c82026..0000000
--- a/demo/fuel-slave.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<domain type='kvm' id='75'>
-  <name>FUEL_SLAVE</name>
-  <memory unit='KiB'>4194304</memory>
-  <currentMemory unit='KiB'>4194304</currentMemory>
-  <vcpu placement='static'>4</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-i440fx-trusty'>hvm</type>
-    <boot dev='network'/>
-    <boot dev='hd'/>
-    <bootmenu enable='no' />
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>SandyBridge</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vmx'/>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='/var/lib/libvirt/images/FUEL_SLAVE.img'/>
-      <target dev='vda' bus='virtio'/>
-      <alias name='virtio-disk0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0'>
-      <alias name='usb0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'>
-      <alias name='pci.0'/>
-    </controller>
-    <interface type='bridge'>
-      <source bridge='br-eth0'/>
-      <model type='e1000' />
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <source bridge='br-eth1'/>
-      <model type='e1000' />
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
-    </interface>
-    <serial type='pty'>
-      <source path='/dev/pts/20'/>
-      <target port='0'/>
-      <alias name='serial0'/>
-    </serial>
-    <console type='pty' tty='/dev/pts/20'>
-      <source path='/dev/pts/20'/>
-      <target type='serial' port='0'/>
-      <alias name='serial0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-    </graphics>
-    <sound model='ich6'>
-      <alias name='sound0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </sound>
-    <video>
-      <model type='cirrus' vram='9216' heads='1'/>
-      <alias name='video0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </video>
-    <memballoon model='virtio'>
-      <alias name='balloon0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </memballoon>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'>
-  </seclabel>
-</domain>
-
diff --git a/deployment_scripts/install.sh b/deployment_scripts/install.sh
deleted file mode 100755
index 3c941a1..0000000
--- a/deployment_scripts/install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-set -eux
-
-INSTALL_HOME=/tmp/ovs-nshdpdk
-rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
-cd $INSTALL_HOME
-
-host=$1
-nsh=$2
-deb_arch=$(dpkg --print-architecture)
-
-if [ $nsh = 'true' ]; then
-    ovs="ovs-nsh_${deb_arch}.tar.gz"
-    apt-get install -y --allow-unauthenticated dkms
-    curl  http://$host:8080/plugins/fuel-plugin-ovs-1.0/repositories/ubuntu/${ovs} | tar -xzv
-    dpkg -i openvswitch-datapath-dkms_*.deb
-    dpkg -i openvswitch-common_*.deb
-    dpkg -i openvswitch-switch_*.deb
-    dpkg -i python-openvswitch_*.deb
-fi
-
-rm -rf $INSTALL_HOME
diff --git a/deployment_scripts/puppet/manifests/ovs-install.pp b/deployment_scripts/puppet/manifests/ovs-install.pp
deleted file mode 100644
index dff5b31..0000000
--- a/deployment_scripts/puppet/manifests/ovs-install.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-notice('MODULAR: ovs-install.pp')
-# get options
-$master_ip      = hiera('master_ip')
-$ovs_settings   = hiera('fuel-plugin-ovs')
-
-$install_nsh    = $ovs_settings['install_nsh']
-$install_dpdk   = 'false'
-
-if $operatingsystem == 'Ubuntu' {
-  if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
-      exec { 'install ovs_nsh_dpdk':
-          command => "/etc/fuel/plugins/fuel-plugin-ovs-1.0/install.sh ${master_ip} ${install_nsh} ${install_dpdk}",
-          path    => '/usr/bin:/usr/sbin:/bin:/sbin',
-      }
-    }
-} elsif $operatingsystem == 'CentOS' {
-}
diff --git a/deployment_scripts/puppet/manifests/ovs-update-flavors.pp b/deployment_scripts/puppet/manifests/ovs-update-flavors.pp
deleted file mode 100644
index d3117c8..0000000
--- a/deployment_scripts/puppet/manifests/ovs-update-flavors.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-notice('MODULAR: ovs-update-flavors')
-
-if $operatingsystem == 'Ubuntu' {
-    exec { 'update flavors':
-        command => "/etc/fuel/plugins/fuel-plugin-ovs-1.0/update_flavors.sh",
-        path    => '/usr/bin:/usr/sbin:/bin:/sbin',
-    }
-} elsif $operatingsystem == 'CentOS' {
-}
diff --git a/deployment_scripts/update_flavors.sh b/deployment_scripts/update_flavors.sh
deleted file mode 100755
index f4ea479..0000000
--- a/deployment_scripts/update_flavors.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -eux
-
-. /root/openrc
-
-#foreach nova flavor name set it to have it's memory backed with large pages
-#so that it will run with DPDK-enabled OVS.
-for i in `nova flavor-list | tail -n +4 | head --lines=-1 | awk {'print $4'}`; do
-    nova flavor-key $i set "hw:mem_page_size=large"
-done
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
deleted file mode 100644
index 59b2de0..0000000
--- a/deployment_tasks.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- id: ovs_install
-  type: puppet
-  version: 2.1.0
-  groups: [compute, primary-controller, controller]
-  requires: [setup_repositories]
-  required_for: [netconfig]
-  parameters:
-    puppet_manifest: puppet/manifests/ovs-install.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
diff --git a/environment_config.yaml b/environment_config.yaml
deleted file mode 100644
index f04d641..0000000
--- a/environment_config.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-attributes:
-    install_nsh:
-      type: "checkbox"
-      weight: 20
-      value: false
-      label: "Install NSH"
-    install_on_controller:
-      type: "checkbox"
-      weight: 20
-      value: false
-      label: "Install same OVS version on the Controller"
diff --git a/metadata.yaml b/metadata.yaml
deleted file mode 100644
index d0a1c9a..0000000
--- a/metadata.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Plugin name
-name: fuel-plugin-ovs
-# Human-readable name for your plugin
-title: Install Open vSwitch with NSH
-# Plugin version
-version: '1.0.0'
-# Description
-description: 'This plugin provides to deploy Open vSwitch with NSH'
-# Required fuel version
-fuel_version: ['10.0']
-# Specify license of your plugin
-licenses: ['Apache License Version 2.0']
-# Specify author or company name
-authors: ['ruijing.guo@intel.com']
-# A link to the plugin's page
-homepage: 'https://github.com/openstack/fuel-plugin-ovs'
-# Specify a group which your plugin implements, possible options:
-# network, storage, storage::cinder, storage::glance, hypervisor
-groups: ['network']
-
-# The plugin is compatible with releases in the list
-releases:
-  - os: ubuntu
-    version: newton-10.0
-    mode: ['ha']
-    deployment_scripts_path: deployment_scripts/
-    repository_path: repositories/ubuntu
-
-# Version of plugin package
-package_version: '4.0.0'
-
-is_hotpluggable: false
diff --git a/ovs_build/Dockerfile b/ovs_build/Dockerfile
deleted file mode 100644
index 82add5f..0000000
--- a/ovs_build/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-FROM ubuntu:16.04
-
-RUN apt-get update -y
-RUN apt-get install -y sudo
-RUN rm -rf /lib/modules
-RUN apt-get install -y linux-headers-4.4.0-45-generic
-RUN ln -s /lib/modules/4.4.0-45-generic /lib/modules/`uname -r`
-
-ADD ./ /ovs_build
diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
deleted file mode 100755
index 7ce2a62..0000000
--- a/ovs_build/build-ovs-dpdk.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-OVS_COMMIT=92043ab8ffd449dfd50c3e716d6db06d04af70d7
-OVS_VER=${OVS_VER:-2.6.90}
-BUILD_DEST=${BUILD_DEST:-/deb}
-BUILD_SRC="$(dirname `readlink -f $0`)"
-BUILD_HOME=${BUILD_HOME:-/tmp/ovs-dpdk}
-DEB_ARCH="$(dpkg --print-architecture)"
-
-export DEB_BUILD_OPTIONS='parallel=8 nocheck'
-
-sudo apt-get update
-sudo apt-get -y --force-yes install devscripts dpkg-dev git wget dkms
-
-rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME}/deb
-
-cd ${BUILD_HOME}
-wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz
-xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar
-cd dpdk-16.07
-cp -r ${BUILD_SRC}/dpdk_16.07.fuel/debian .
-cat << EOF > debian/changelog
-dpdk (16.07-0ubuntu5~u1604+fuel10) xenial; urgency=low
-
-  * Rebuild debian package
-  * update librte-eal2.symbols
-
- -- Ruijing Guo <ruijing.guo@intel.com>  $(date --rfc-2822)
-EOF
-
-# copy from debian/control
-sudo apt-get install -y --force-yes debhelper \
-               dh-python \
-               dh-systemd \
-               doxygen  \
-               graphviz  \
-               inkscape  \
-               libcap-dev  \
-               libpcap-dev  \
-               libxen-dev  \
-               libxenstore3.0  \
-               python  \
-               python-sphinx  \
-               texlive-fonts-recommended  \
-               texlive-latex-extra
-debian/rules build; fakeroot debian/rules binary
-
-cd ${BUILD_HOME}
-sudo apt-get install -y --force-yes hwdata
-sudo dpkg -i *.deb
-mv *.deb ${BUILD_DEST}
-
-# copy from debian/control
-sudo apt-get install -y --force-yes autoconf \
-               automake \
-               bzip2 \
-               debhelper \
-               dh-autoreconf \
-               dh-systemd \
-               graphviz \
-               libdpdk-dev \
-               libfuse-dev \
-               libssl-dev \
-               libtool \
-               openssl \
-               procps \
-               python-all \
-               python-qt4 \
-               python-twisted-conch \
-               python-zopeinterface \
-               python-six
-
-git clone https://github.com/openvswitch/ovs.git
-cd ovs; git checkout ${OVS_COMMIT}; rm -rf .git
-cd ${BUILD_HOME}; cp -r ovs ovs-dpdk
-
-cd ovs-dpdk
-cp -r ${BUILD_SRC}/openvswitch_2.6-dpdk_16.07/debian .
-cat << EOF > debian/changelog
-openvswitch-dpdk (${OVS_VER}-1) unstable; urgency=low
-  [ Open vSwitch team ]
-  * support OVS with DPDK 16.07
-
- -- Open vSwitch team <dev@openvswitch.org>  $(date --rfc-2822)
-EOF
-
-debian/rules build; fakeroot debian/rules binary
-
-cd ${BUILD_HOME}/ovs
-debian/rules build; fakeroot debian/rules binary
-
-cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
-cd ${BUILD_HOME}/deb
-tar czvf ${BUILD_DEST}/ovs-dpdk_${DEB_ARCH}.tar.gz .;
diff --git a/ovs_build/build-ovs-nsh.sh b/ovs_build/build-ovs-nsh.sh
deleted file mode 100755
index dbebdb2..0000000
--- a/ovs_build/build-ovs-nsh.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-OVS_COMMIT=f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3
-OVS_VER=${OVS_VER:-2.6.1}
-BUILD_DEST=${BUILD_DEST:-/deb}
-BUILD_SRC="$(dirname `readlink -f $0`)"
-BUILD_HOME=${BUILD_HOME:-/tmp/ovs-nsh}
-DEB_ARCH="$(dpkg --print-architecture)"
-
-export DEB_BUILD_OPTIONS='parallel=8 nocheck'
-
-sudo apt-get update
-sudo apt-get -y --force-yes install devscripts dpkg-dev git wget dkms
-
-rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME}/deb
-
-cd ${BUILD_HOME}
-
-# copy from debian/control
-sudo apt-get install -y --force-yes autoconf \
-               automake \
-               bzip2 \
-               debhelper \
-               dh-autoreconf \
-               dh-systemd \
-               graphviz \
-               libdpdk-dev \
-               libfuse-dev \
-               libssl-dev \
-               libtool \
-               openssl \
-               procps \
-               python-all \
-               python-qt4 \
-               python-twisted-conch \
-               python-zopeinterface \
-               python-six
-
-git clone https://github.com/openvswitch/ovs.git
-cd ovs; git checkout ${OVS_COMMIT}; rm -rf .git
-PATCHES=$(cd ${BUILD_SRC}/ovs_nsh_patches/v2.6.1/; echo *patch)
-for patch in ${PATCHES}
-do
-    patch -p1 < ${BUILD_SRC}/ovs_nsh_patches/v2.6.1/${patch}
-done
-
-cat << EOF > debian/changelog
-openvswitch (${OVS_VER}-1.nsh) unstable; urgency=low
-  [ Open vSwitch team ]
-  * support NSH
-
- -- Open vSwitch team <dev@openvswitch.org>  $(date --rfc-2822)
-EOF
-debian/rules build; fakeroot debian/rules binary
-
-cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
-cd ${BUILD_HOME}/deb
-tar czvf ${BUILD_DEST}/ovs-nsh_${DEB_ARCH}.tar.gz .;
diff --git a/ovs_build/dpdk_16.07.fuel/debian/README.source b/ovs_build/dpdk_16.07.fuel/debian/README.source
deleted file mode 100644
index a21f5ee..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/README.source
+++ /dev/null
@@ -1,42 +0,0 @@
-How to build the package - for CI systems, etc
-
-1 - install all the build-dependencies as listed in the debian/control file.
-    From the repo top-level directory:
-
-apt-get install `dpkg-checkbuilddeps |& sed "s/.*://g" |& sed "s/(...[0-9]*)//g"`
-
-2 - run debuild (the flags will avoid signing the built packages):
-    From the repo top-level directory:
-
-debuild -uc -us
-
-***************
-
-quilt patches format
-
-Note that we use the dquilt format for patches as outlined on Debian's wiki:
-https://www.debian.org/doc/manuals/maint-guide/modify.en.html#quiltrc
-
-Please consider using the same format to avoid excessive churn when adding or
-refreshing patches.
-
-Add the following to your ~/.bashrc (or equivalent):
-
-alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
-complete -F _quilt_completion $_quilt_complete_opt dquilt
-
-And then create a new ~/.quiltrc-dpkg file with content:
-
-d=. ; while [ ! -d $d/debian -a `readlink -e $d` != / ]; do d=$d/..; done
-if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then
-    # if in Debian packaging tree with unset $QUILT_PATCHES
-    QUILT_PATCHES="debian/patches"
-    QUILT_PATCH_OPTS="--reject-format=unified"
-    QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto"
-    QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
-    QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"
-    if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi
-fi
-
-Open a new terminal or souce ~/.bashrc, and then you will be able to use
-dquilt.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/changelog b/ovs_build/dpdk_16.07.fuel/debian/changelog
deleted file mode 100644
index faa1026..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/changelog
+++ /dev/null
@@ -1,528 +0,0 @@
-dpdk (16.07-0ubuntu5~u1604+mos1) mos; urgency=low
-
-  * Rebuild debian package.
-  * Add fake dpdk-dkms package
-
- -- Ivan Suzdal <mos-linux@mirantis.com>  Thu, 08 Dec 2016 15:06:10 +0000
-
-dpdk (16.07-0ubuntu5~cloud0) xenial-newton; urgency=medium
-
-  * New update for the Ubuntu Cloud Archive.
-
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Tue, 04 Oct 2016 12:12:07 +0000
-
-dpdk (16.07-0ubuntu5) yakkety; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * Fix component mismatch by dropping the optional dpdk-pmdinfo tool
-    (LP: #1630073).
-
-  [ Gowrishankar Muthukrishnan ]
-  * update d/p/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch to
-    fix dlopen issue (LP: #1630119)
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 04 Oct 2016 09:27:54 +0200
-
-dpdk (16.07-0ubuntu4) yakkety; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * merge of latest deb_dpdk packaging
-  * Fix d/p/fix-vhost-user-socket-permission.patch for dpdk 16.07
-    server/client sockets (LP: #1625542).
-  * d/rules utilize RTE_EAL_PMD_PATH to autoload pmd drivers (LP: #1628419)
-    - d/dpdk-doc.README.Debian document usage of RTE_EAL_PMD_PATH
-    - d/control let the runtime of dpdk recommend the pmd drivers to make
-      them available for auto-probing devices
-  * d/control add python-elftools and hwdata dependencies to dpdk for the tool
-    dpdk-pmdinfo (LP: #1628410).
-
-  [ Luca Boccassi ]
-  * Fix d/watch file to point to fast.dpdk.org/rel
-  * Allow DPDK_CONFIG, RTE_MACHINE, RTE_TARGET overrides via DEB_BUILD_OPTIONS
-  * Use ?= to allow env var overrides in d/rules
-
-  [ Santiago RR ]
-  * debian/control:
-    - dpdk: recommends dkms packages (dpdk-igb-uio-dkms, dpdk-rte-kni-dkms) on
-      arm64 and suggest for other architectures.
-
-  [ Gowrishankar Muthukrishnan ]
-  * d/p/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch to make
-    ip_pipeline work properly with -d eal parameter (LP: #1629186)
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 29 Sep 2016 17:19:05 +0200
-
-dpdk (16.07-0ubuntu3) yakkety; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * merge of latest deb_dpdk packaging for dpdk 16.07 (LP: #1625009)
-    - excluding ppc enablement due to being post-FF
-    - mix and match of changelogs as it is not yet uploaded to Debian
-  * add man pages for installed binaries
-    - add backport of patches from upstream
-    - call generation of man pages in d/rules
-  * d/t/test-dkms retain dkms logs for debugging (LP: #1625028)
-  * fix rte_kni dkms build with kernel >= 4.8 (LP: #1625021)
-    - d/p/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch replaced macro with
-      its value in kni ethtool drivers.
-
-  [ Luca Boccassi ]
-  * Add optional binary kernel modules package, disabled by default (build with
-    DEB_BUILD_OPTIONS=kernel_modules to enable). If enabled will build kernel
-    modules against the local, current kernel version (override by adding
-    ksrc=<path/to/kernel/sources> to DEB_BUILD_OPTIONS) into a
-    dpdk-modules-<kernel version> package
-  * Set HOST_/EXTRA/CPP/C/LDFLAGS in d/rules so that all built objects pick up
-    all flags set by the dpkg environment, like hardening flags
-  * Add rte-compile-pre-cppflags.patch to make all DPDK objects pick up the
-    user specified or environment specified CPP/C/LDFLAGS.
-    Fixes Lintian warning:
-    - W: dpdk-dev: hardening-no-relro
-         usr/share/dpdk/x86_64-default-linuxapp-gcc/app/dpdk-pmdinfogen
-  * Add a brief HOWTO to debian/README.source with instructions to build the
-    packages, for CI systems and the like.
-  * Build with RTE_DEVEL_BUILD=n to avoid building test pmds with an rpath
-    hardcoded to the package build PATH. Fixes Lintian Error:
-    - E: dpdk: binary-or-shlib-defines-rpath usr/bin/dpdk-pdump
-         /home/lboccass/git/dpdk_deb/debian/build/shared-root/lib
-
-  [ Santiago RR ]
-  * improve debian/copyright
-  * remove duplicate entries from d/control
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Mon, 19 Sep 2016 08:49:44 +0200
-
-dpdk (16.07-0ubuntu2) yakkety; urgency=medium
-
-  * d/t/test-initscripts fix false positive in adt
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Fri, 12 Aug 2016 12:56:07 +0200
-
-dpdk (16.07-0ubuntu1) yakkety; urgency=medium
-
-  * release current state of deb_dpdk packaging into yakkety
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 11 Aug 2016 10:09:10 +0200
-
-dpdk (16.07-0) UNRELEASED; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * Merge with upstream DPDK 16.07 release
-  * Cleanup Lintian Warnings
-    - d/p/fix-unusual-interpreter.patch fixes "W: dpdk-doc:
-      unusual-interpreter"
-    - d/p/fix-double-license-info.patch fixes "W: dpdk-rte-kni-dkms:
-      extra-license-file"
-  * Renamed d/p/ubuntu-fix-vhost-user-socket-permission.patch to
-    d/p/fix-vhost-user-socket-permission.patch
-  * Add lintian-overrides for: E: dpdk-dev: arch-dependent-file-in-usr-share
-    These binaries are part of the sdk and meant to be shipped with the sdk.
-  * d/p/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch to fix the
-    docs in regard to 16.07 changes renaming dpdk_nic_bind
-  * d/p/make-load-devel-config-not-to-appear-as-executable.patch to avoid
-    accidentially executing as script and to fix unusual-interpreter lintian
-    warning.
-
-  [ Anders Roxell ]
-  * debian/control: add pciutils to the dpdk depends list, since lspci is used
-    by the devbind script
-
-  [ Luca Boccassi ]
-  * Add ${shlib:Depends} to dpdk-dev dependencies
-  * Install api and guides in dpdk-doc
-  * Convert debian/rules to new style DH targets
-  * Add Recommends: python to dpdk-doc since it ships python scripts among the
-    examples, fixes Lintian warning about missing python dependencies
-  * Fix typo in dpdk-doc.README.Debian, fixes "W: dpdk-doc:
-    spelling-error-in-readme-debian to to (duplicate word) to"
-  * Fix upstream rc versions by using "~" instead of "-". 16.07-rc1 evaluates
-    as newer than 16.07 which causes issues with Debian tools and Lintian
-    errors and warnings:
-    - W: libethdev4: latest-debian-changelog-entry-without-new-version
-    - E: libethdev4: symbols-file-contains-current-version-with-debian-revision
-      on symbol DPDK_16.04@DPDK_16.04 and 114 others
-  * Add lintian-overrides for: "W: dpdk-doc: embedded-javascript-library"
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Fri, 29 Jul 2016 08:18:50 +0200
-
-dpdk (16.07~rc5-1) UNRELEASED; urgency=medium
-
-  [ Ricardo Salveti de Araujo ]
-  * Merge with upstream DPDK 16.07-rc5 release
-
-  [ Luca Boccassi ]
-  * Generate pkgconfig and ship it in libdpdk-dev
-  * Document use of dquilt for patches in debian/README.source
-
- -- Ricardo Salveti de Araujo <rsalveti@rsalveti.net>  Tue, 26 Jul 2016 14:13:38 -0300
-
-dpdk (16.07~rc4-1) UNRELEASED; urgency=medium
-
-  * Merge with upstream DPDK 16.07-rc4 release
-    - Tools renamed, dpdk_nic_bind is now dpdk-devbind
-  * Adapt d/p/ubuntu-fix-vhost-user-socket-permission.patch for dpdk 16.07-rc4
-
- -- Ricardo Salveti de Araujo <rsalveti@rsalveti.net>  Mon, 25 Jul 2016 13:38:13 -0300
-
-dpdk (16.07~rc3-1) UNRELEASED; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * Merge with upstream DPDK 16.07-rc3 release
-  * droping patches/backports that are already upstream in DPDK 16.07-rc3
-    - d/p/ubuntu-fix-bond-symbol-export.patch
-    - d/p/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch
-  * adapt d/p/ubuntu-fix-vhost-user-socket-permission.patch for dpdk 16.07-rc3
-  * update symbols
-
-  [ Ricardo Salveti de Araujo ]
-  * debian/rules:
-    - Allow all make commands to be verbose
-    - Fix libdpdk-dev headers path
-  * Renaming package librte-pmd-e10001 to librte-pmd-e1000-1, to avoid mixing
-    package name with soversion (lintian package-name-doesnt-match-sonames)
-  * Adding package librte-pmd-bnxt1
-  * Merging symbols files, handling the arch differences inline instead
-
-  [ Anders Roxell ]
-  * debian/control: add libpcap-dev to libdpdk-dev's Depends list
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 19 Jul 2016 08:32:06 +0200
-
-dpdk (16.07~rc1-1) UNRELEASED; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * Merge with upstream DPDK 16.07-rc1 release
-  * droping patches/backports that are already upstream in DPDK 16.07
-    - d/p/ubuntu-backport-39-lpm-fix-freeing-in-compatibility-mode.patch
-      This was formerly part of a combined patch that we dropped because the
-      majority is upstream (d/p/ubuntu-fix-lpm-use-after-free-and-leak.patch).
-    - d/p/ubuntu-backport-40-linking-fixes-stage-[1-4]-4.patch
-      d/p/ubuntu-backport-44-linking-cleanup.patch
-      Fixing underlinking and overlinking issues in apps and libraries.
-    - d/p/ubuntu-backport-41-fix-install-tar-1.29.patch
-      Fix issues with tar >=1.29 (Yakkety)
-    - d/p/ubuntu-backport-42-increase-default-logging-level.patch
-      avoid default debug messages causing a perf degradation
-    - d/p/ubuntu-backport-43-fix-level-type-retrieving.patch
-      Fix type retrieving which was broken in standard threads
-    - d/p/ubuntu-fix-xenvirt-support-dynamic-page-size.patch: fix build
-      failure on arm64
-  * droping patches/backports that are no more applicable
-    - d/p/ubuntu-backport-38-* was never accepted despite looking good.
-      Upstream discussion around proper successor started.
-  * keeping patches:
-    - d/p/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch
-      Was never accepted, Upstream discussion around proper successor started.
-  * adapt debian/* to upstream changes
-    - update symbols and ABI versions
-    - add librte-pdump1
-  * adding changes
-   - fix exported symbols of librte_pmd_bond (sent upstream, can be dropped
-     later)
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 06 Jul 2016 09:40:49 +0200
-
-dpdk (16.04-1) UNRELEASED; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * Merge with upstream DPDK 16.04 release
-  * droping patches/backports that are already upstream in DPDK 16.04
-    - d/p/ubuntu-fix-doc-installpath.patch
-    - d/p/ubuntu-fix-testpmd-without-xen.patch
-    - d/p/ubuntu-fix-lpm-use-after-free-and-leak.patch
-    - d/p/ubuntu-backport-[01-32,34-35] backports for stability
-    - d/p/ubuntu-backport-[36-37] but keep doc and example changes in d/*
-  * droping patches for soname / linking fixups.
-    - Upstream now goes with proper soname/abi/api handling per sublib plus a
-      linker script.
-    - dropped d/p/ubuntu-combined-shared-lib-abiversion.patch
-    - dropped d/p/ubuntu-fix-library-linkage.patch
-  * keeping patches:
-    - d/p/ubuntu-backport-38-* fix for memory leak
-      this now applies as is, so changed from a modified backport to match the
-      post 16.04 upstream commit now.
-    - d/p/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch
-    - doc and example changes that were related to d/p/ubuntu-backport-[36-37]
-    - d/p/ubuntu-fix-vhost-user-socket-permission.patch adapted for dpdk-16.04:
-      In the new build system with sublibs the exposed function needs to be
-      listed in lib/librte_eal/linuxapp/eal/rte_eal_version.map
-  * adding upstream backports - can be dropped when merging DPDK 16.07.
-    - d/p/ubuntu-backport-39-lpm-fix-freeing-in-compatibility-mode.patch
-      This was formerly part of a combined patch that we dropped because the
-      majority is upstream (d/p/ubuntu-fix-lpm-use-after-free-and-leak.patch).
-    - d/p/ubuntu-backport-40-linking-fixes-stage-[1-4]-4.patch
-      d/p/ubuntu-backport-44-linking-cleanup.patch
-      Fixing underlinking and overlinking issues in apps and libraries.
-    - d/p/ubuntu-backport-41-fix-install-tar-1.29.patch
-      Fix issues with tar >=1.29 (Yakkety)
-    - d/p/ubuntu-backport-42-increase-default-logging-level.patch
-      avoid default debug messages causing a perf degradation
-    - d/p/ubuntu-backport-43-fix-level-type-retrieving.patch
-      Fix type retrieving which was broken in standard threads
-  * adapt to new build system
-    - drop enabling the following build config symbols as they no more exist
-        CONFIG_RTE_BUILD_COMBINE_LIBS
-    - Sub-Libraries are now packaged in a versioned package per library. That
-      allows consumers of dpdk to just depend on what they need. As well as
-      installation of multiple .so versions concurrently.
-    - added the hidden dependency of librte_eal to librte_mempool
-    - use dpkg-buildflags and properly enable hardening
-  * Adding DKMS package for rte_kni (LP: #1592786)
-
-  [ Ricardo Salveti ]
-  * Adding support for ARM64:
-    - debian/control: adding arm64 to the supported architecture list
-    - debian/rules: supporting dpdk config and machine for arm64
-    - d/p/ubuntu-fix-xenvirt-support-dynamic-page-size.patch: fix build
-      failure on arm64
-    - debian/dpdk-sdk-env.sh: generating the right RTE_TARGET during build
-      time, so we can also make it compatible with ARM64
-    - debian/tests: also making tests compatible with ARM64
-  * Adding DKMS package for igb_uio
-  * Build static dpdk with -fPIC so it can be used by shared libraries
-  * debian/copyright: fixing Canonical's copyright entry
-  * Renaming symbol files so they can match the right package
-  * Drop the arch specific symbol files, as they are identical
-
-  [ Anders Roxell ]
-  * debian/dpdk.init: add remote_fs (lintian)
-  * debian/control: fixing week-library-dev-dependency (lintian)
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 17 May 2016 14:23:21 +0200
-
-dpdk (2.2.0-0ubuntu9) yakkety; urgency=medium
-
-  * d/p/ubuntu-backport-[36-37] fix virtio issues (LP: #1570195):
-    - don't let DPDK initialize virtio devices still in use by the kernel
-    - this avoids conflicts between kernel and dpdk usage of those devices
-    - an admin now has to unbind/bind devices as on physical hardware
-    - this is in the dpdk 16.04 release and delta can then be dropped
-    - d/dpdk-doc.README.Debian update for changes in virtio-pci handling
-    - d/dpdk.interfaces update for changes in virtio-pci handling
-  * d/p/ubuntu-backport-38... fix for memory leak (LP: #1570466):
-    - call vhost_destroy_device on removing vhost user ports to fix memory leak
-    - this likely is in the dpdk 16.07 release and delta can then be dropped
-  * d/p/ubuntu-fix-vhost-user-socket-permission.patch fox (LP: #1546565):
-    - when vhost_user sockets are created they are owner:group of the process
-    - the DPDK api to create those has no way to specify owner:group
-    - to fix that without breaking the API and potential workaround code in
-      consumers of the library like openvswitch 2.6 for example. This patch
-      adds an EAL commandline option to specify user:group created vhost_user
-      sockets should have.
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 27 Apr 2016 07:52:48 -0500
-
-dpdk (2.2.0-0ubuntu7) xenial; urgency=medium
-
-  * Increase max_map_count after setting huge pages (LP: #1507921):
-    - The default config of 65530 would cause issues as soon as about 64GB or
-      more are used as 2M huge pages for dpdk.
-    - Increase this value to base+2*#hugepages to avoid issues on huge systems.
-  * d/p/ubuntu-backport-[28-32,34-35] backports for stability (LP: #1568838):
-     - these will be in the 16.04 dpdk release, delta can then be dropped.
-     - 5 fixes that do not change api/behaviour but fix serious issues.
-        - 01 f82f705b lpm: fix allocation of an existing object
-        - 02 f9bd3342 hash: fix multi-process support
-        - 03 1aadacb5 hash: fix allocation of an existing object
-        - 04 5d7bfb73 hash: fix race condition at creation
-        - 05 fe671356 vfio: fix resource leak
-        - 06 356445f9 port: fix ring writer buffer overflow
-        - 07 52f7a5ae port: fix burst size mask type
-  * d/p/ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch
-     - this will likely be in dpdk release 16.07 and delta can then be dropped.
-     - fixes a crash on using fd's >1023 (LP: #1566874)
-  * d/p/ubuntu-fix-lpm-use-after-free-and-leak.patch fix lpm_free (LP: #1569375)
-     - the old patches had an error freeing a pointer which had no meta data
-     - that lead to a crash on any lpm_free call
-     - folded into the fix that generally covers the lpm allocation and free
-       weaknesses already (also there this particular mistake was added)
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 12 Apr 2016 16:13:47 +0200
-
-dpdk (2.2.0-0ubuntu6) xenial; urgency=medium
-
-  * d/dpdk-init fix handling of multiple huge page sizes (LP: #1557532):
-     - dpdk-init now ensures non-default-hugepage-size mountpoints are
-       available as well.
-     - extra mountpoints are only created if requested in dpdk.conf and not yet
-       available (e.g. by the admin).
-  * d/dpdk-init fix issues with unassigned devices (LP: #1558485):
-     - dpdk-init no more checks /sys/.../driver of the device unconditionally
-     - removed the superfluous tr call in that path
-  * d/p/ubuntu-fix-lpm-use-after-free-and-leak.patch lpm/lpm6 (LP: #1554009):
-     - lpm/lpm6 fix use after free on lpm[6]_create
-     - lpm/lpm6 fix missing frees of rules_tbl substructure
-     - lpm/lpm6 fix missing free of lpm due to early exit
-     - make RTE_LOG messages of the failed allocation unique
-  * d/p/ubuntu-backport-[01-26] backport for stability (LP: #1559981):
-     - these will be in the following dpdk release and delta can then be dropped
-     - 26 fixes that do not change api/behaviour but fix serious issues
-        - 01 d3a274ce app/testpmd: handle SIGINT and SIGTERM
-        - 02 308df2bf Handle SIGINT and SIGTERM in l3fwd.
-        - 03 da82ee17 tools: fix unbinding failure handling
-        - 04 16c1814c tools: support Python 3 in bind script
-        - 05 bb9f4085 tools: support binding to built-in kernel modules
-        - 06 6e7caa1a eal/linux: support built-in kernel modules
-        - 07 86f36ff9 mempool: fix leak when creation fails
-        - 08 ca67ed28 vhost: fix leak of fds and mmaps
-        - 09 fa11a8a7 port: fix crash for ring writer nodrop
-        - 10 04f36690 port: fix crash for ethdev writer nodrop
-        - 11 c7a4ff80 i40e: fix overflow
-        - 12 097e920c i40e: fix inverted check for no refcount
-        - 13 330aa319 i40e: fix VLAN filtering
-        - 14 9f44dd3d i40e/base: fix missing check for stopped admin queue
-        - 15 8a880736 i40e/base: fix driver load failure
-        - 16 7656a546 fm10k: fix VLAN flag in scattered Rx
-        - 17 c6fb0e55 pcap: fix captured frame length
-        - 18 6e027237 bonding: fix detach of bonded device
-        - 19 df3e8ad7 bonding: fix detach of slave devices
-        - 20 786c990a bonding: copy entire config structure in mode 4
-        - 21 6698820b bonding: do not ignore multicast in mode 4
-        - 22 8997a10b bonding: fix active slaves with no primary
-        - 23 7a7122ed bonding: do not activate slave twice
-        - 24 2186fff3 bonding: fix crash when no slave device
-        - 25 c680a4a8 virtio: fix crash in statistics functions
-        - 26 3b1e3e4e virtio: fix descriptors pointing to the same buffer
-  * d/p/ubuntu-backport-27-virtio-fix-restart.patch for (LP: #1559981):
-     - fixing re-initializing the ethdev as openvswitch-dpdk does in the
-       virtio pmd driver by moving the detection of already being initialized
-       from virtio_dev_close to virtio_dev_start/stop
-     - this will be in the following dpdk release and delta can then be dropped
-  * d/rules build with debuginfo (LP: #1560839):
-     - exporting CFLAGS for all dpdk build processes
-     - dh_strip will automatically and create -dbgsym packages accordingly
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 23 Mar 2016 10:34:50 +0100
-
-dpdk (2.2.0-0ubuntu5) xenial; urgency=medium
-
-  * d/t/test-initscripts fix issues regarding 1G hugepages
-     - the dep8 was already taking care of 1G hugepages being not supported in
-       some environments. But it was failing when supported, but not enough
-       memory available.
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 09 Mar 2016 17:19:24 +0000
-
-dpdk (2.2.0-0ubuntu4) xenial; urgency=medium
-
-  * harden d/dpdk-init for configuration issues (LP: #1551601):
-     - detect and warn about bad bus specifications.
-     - detect and warn about incomplete device specifications.
-     - detect and warn about non existing pci IDs.
-     - avoid failing when working with unassigned devices.
-     - d/t/test-initscripts now testing various misconfigs.
-     - d/t/test-initscripts now also verifying service status.
-  * d/dpdk-init d/dpdk.conf now also support 1G hugepages (LP: #1551767):
-     - detect and warn if 1G pages are not available but configured.
-     - d/t/test-initscripts now also testing hugepage allocations.
-     - d/dpdk.conf has an option to drop caches to incease the likeliness of
-       successful 1G hugepage allocations (default off).
-  * d/rules replaced uname -m with DEB_HOST_GNU_CPU (LP: #1551796):
-  * fix testpmd to run without Xen environment (LP: #1551752):
-     - upstream discussion is slow, but we need a fix now. We can drop this
-       and change to the upstream solution when it is available.
-  * avoid errors due to missing modules (LP: #1554397):
-     - d/dpdk-init gracefully warns about missing modules.
-     - d/control now suggests linux-image-generic.
-     - d/dpdk.interfaces has a comment that makes the user aware.
-  * d/dpdk-init fix failure loading vfio-pci (LP: #1554214):
-     - d/dpdk-init no more converts "-" to "_" to make vfio-pci work
-     - d/dpdk.interfaces enhanced comments and updated examples
-     - d/dpdk-doc.README.debian got extra notes about using some modules
-  * unify whitespace/tabs in packaging and scripts
-     - tabs/spaces to just spaces in d/dpdk-init and d/dpdk.init.
-     - few remaining spaces to tabs in d/rules
-  * d/t/test-* now satisfy shellcheck
-  * d/* fix various comments and guides to be more readable
-  * d/dpdk-init and d/copyright updated copyright information
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 09 Mar 2016 08:48:58 +0000
-
-dpdk (2.2.0-0ubuntu3) xenial; urgency=medium
-
-  * Guard dep8 tests against non supported platforms (LP: #1551158):
-    - d/t/control now avoids failing due to "dependencies are unsatisfiable"
-      when fetching packages. The packages architecture restrictions got added
-      to avoid that.
-    - d/t/check-dpdk-supported-arch.sh is called by all DPDK tests to ensure
-      the platform is supported. If not it skips the test.
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Mon, 29 Feb 2016 11:03:39 +0000
-
-dpdk (2.2.0-0ubuntu2) xenial; urgency=medium
-
-  [ Christian Ehrhardt ]
-  * fix libdpdk.so library linking (LP: #1547517)
-    - libdpdk.so now has proper linkage information (was underlinked)
-      Note: this can be dropped when moving to DPDK 2.3 with linker script
-            instead of combined shared lib.
-    - remove reference to extra linkage needed when building against -ldpdk
-      in dpdk-doc README.
-    - add dep8 d/t/test-linkage to verify linking dpdk works as expected.
-  * d/control remove ${shlibs:Depends} on package with no linked binary
-    avoiding dpkg-gencontrol build warning about unknown ${shlibs:Depends}.
-  * d/dpdk-doc.README.debian fix path to DPDK build environment variable
-    helper script in README file.
-  * Update VCS Info in d/control to include our repositories.
-
-  [  James Page ]
-  * d/*: wrap-and-sort.
-  * d/control: Trim trailing whitespace.
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 25 Feb 2016 16:07:21 +0000
-
-dpdk (2.2.0-0ubuntu1) xenial; urgency=low
-
-  * Merge from Upstream to DPDK 2.2
-    Remaining changes:
-    - Set soabi for the combined shared library
-  * Drop changes:
-    - configuring RTE_LIBNAME to dpdk as it is the upstream default now
-    - enabled formerly non building components as they build properly in 2.2
-    - d/p/ubunut-avoid-texlive-fonts-extra, d/control:
-      Replace use of DejaVuSansMono is no more needed as upstream changed the
-      font. Thereby we can drop our delta.
-    - d/p/ubuntu-fix-gcc5-ftbs.patch no more needed with DPDK 2.2
-  * Added changes
-    - Disable CONFIG_RTE_NEXT_ABI as required for packaging (git 506f51cc)
-    - Enable LIBRTE_PMD_PCAP which is useful for some DPDK testcase examples
-      this adds a build dependency to libpcap-dev
-    - Fully support DH_VERBOSE for build debugging convenience
-    - adapt to new make infrastructure of dpdk 2.2
-    - d/README.debian: convert into d/dpdk-doc.README.debian
-    - d/dpdk-doc.README.debian: update recommendations about sdk env variables
-    - d/dpdk-sdk-env.sh: now deployed in /usr/share/dpdk to be opt in
-    - enable XEN support for dpdk (LP: #1521289).
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 17 Feb 2016 09:29:28 +0100
-
-dpdk (2.0.0-0ubuntu3) xenial; urgency=medium
-
-  * Only generate HTML documentation, easing backports to 14.04 and
-    reducing the time to build and size of the -doc package (LP: #1524700).
-
- -- James Page <james.page@ubuntu.com>  Thu, 10 Dec 2015 10:23:51 +0000
-
-dpdk (2.0.0-0ubuntu2) xenial; urgency=low
-
-  * d/p/ubunut-avoid-texlive-fonts-extra, d/control:
-    Replace use of DejaVuSansMono by courier and drop dependency on the
-    texlive-fonts-extra package (which is in universe).
-  * d/watch added to allow use of uscan to check for upstream releases.
-  * d/dpdk-init: fix error if bash variables could not be resolved that
-    appeared as "[: -gt: unexpected operator" (had no functional impact)
-  * d/dpdk-init:
-    Replace use of head and cut (in /usr/bin) commands with sed (in /bin)
-    while also adding /usr/bin to the PATH used on direct /etc/init.d/dpdk
-    invocation. The PATH is only updated to be on the safe side, there
-    should be no other commands from /usr/bin used (LP: #1516543).
-  * d/t/test-mountpoint: add dep8 test to cover the issue of LP #1517075.
-  * d/dpdk-dev.install: Copy the SDK makefiles into place (LP: #1517075).
-
- -- Stefan Bader <stefan.bader@canonical.com>  Tue, 17 Nov 2015 11:50:15 +0100
-
-dpdk (2.0.0-0ubuntu1) wily; urgency=low
-
-  * Initial release (LP: #1487538)
-
- -- Stefan Bader <stefan.bader@canonical.com>  Mon, 01 Jun 2015 18:46:38 +0200
diff --git a/ovs_build/dpdk_16.07.fuel/debian/compat b/ovs_build/dpdk_16.07.fuel/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ovs_build/dpdk_16.07.fuel/debian/control b/ovs_build/dpdk_16.07.fuel/debian/control
deleted file mode 100644
index a42a4fa..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/control
+++ /dev/null
@@ -1,747 +0,0 @@
-Source: dpdk
-Priority: optional
-Maintainer: MOS Linux Team <mos-linux@mirantis.com>
-XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: debhelper (>= 9),
-               dh-python,
-               dh-systemd (>= 1.5),
-               dkms,
-               doxygen,
-               graphviz,
-               inkscape,
-               libcap-dev,
-               libpcap-dev,
-               libxen-dev,
-               libxenstore3.0,
-               python,
-               python-sphinx,
-               texlive-fonts-recommended,
-               texlive-latex-extra
-Standards-Version: 3.9.8
-Section: libs
-Homepage: http://www.dpdk.org
-Vcs-Git: https://gerrit.fd.io/r/deb_dpdk
-Vcs-Browser: https://gerrit.fd.io/r/gitweb?p=deb_dpdk.git
-
-Package: dpdk
-Section: admin
-Architecture: amd64 arm64 i386
-Depends: lsb-base (>= 3.2-14),
-         pciutils,
-         hwdata,
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends}
-Recommends: dpdk-igb-uio-dkms (= ${binary:Version}) [arm64], dpdk-rte-kni-dkms (= ${binary:Version}) [arm64],
-         librte-pmd-af-packet1 (= ${binary:Version}),
-         librte-pmd-bnxt1 (= ${binary:Version}),
-         librte-pmd-bond1 (= ${binary:Version}),
-         librte-pmd-cxgbe1 (= ${binary:Version}),
-         librte-pmd-e1000-1 (= ${binary:Version}),
-         librte-pmd-ena1 (= ${binary:Version}),
-         librte-pmd-enic1 (= ${binary:Version}) [amd64 arm64 i386],
-         librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386],
-         librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386],
-         librte-pmd-ixgbe1 (= ${binary:Version}) [amd64 arm64 i386],
-         librte-pmd-null-crypto1 (= ${binary:Version}),
-         librte-pmd-null1 (= ${binary:Version}),
-         librte-pmd-pcap1 (= ${binary:Version}),
-         librte-pmd-ring2 (= ${binary:Version}),
-         librte-pmd-vhost1 (= ${binary:Version}),
-         librte-pmd-virtio1 (= ${binary:Version}),
-         librte-pmd-vmxnet3-uio1 (= ${binary:Version}) [amd64 arm64 i386],
-         librte-pmd-xenvirt1 (= ${binary:Version}) [amd64 arm64 i386],
-Suggests: linux-image-generic, dpdk-igb-uio-dkms (= ${binary:Version}), dpdk-rte-kni-dkms (= ${binary:Version})
-Description: Data Plane Development Kit (runtime)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime environment to run DPDK applications.
-
-Package: dpdk-dev
-Section: devel
-Architecture: amd64 arm64 i386
-Depends: libdpdk-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: Data Plane Development Kit (development files)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains examples and the upstream build environment. It is
- not strictly required in order to build external applications.
-
-Package: dpdk-doc
-Section: doc
-Architecture: all
-Homepage: http://dpdk.org/doc/guides/index.html
-Depends: libjs-jquery, libjs-underscore, ${misc:Depends}, ${python:Depends}
-Recommends: python, ${python:Recommends}
-Description: Data Plane Development Kit (documentation)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the complete set of documentation and guides.
-
-Package: dpdk-igb-uio-dkms
-Section: kernel
-Architecture: amd64 arm64 i386
-Depends: dkms,
-         dpdk-dev (= ${binary:Version}),
-         libdpdk-dev (= ${binary:Version}),
-         make,
-         ${misc:Depends}
-Description: Data Plane Development Kit (igb uio dkms)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the source code for the igb_uio kernel module.
-
-Package: dpdk-rte-kni-dkms
-Section: kernel
-Architecture: amd64 arm64 i386
-Depends: dkms,
-         dpdk-dev (= ${binary:Version}),
-         libdpdk-dev (= ${binary:Version}),
-         make,
-         ${misc:Depends}
-Description: Data Plane Development Kit (rte kni dkms)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the source code for the rte_kni kernel module.
-
-Package: libdpdk-dev
-Section: libdevel
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         libpcap-dev,
-         libethdev4 (= ${binary:Version}),
-         librte-acl2 (= ${binary:Version}),
-         librte-cfgfile2 (= ${binary:Version}),
-         librte-cmdline2 (= ${binary:Version}),
-         librte-cryptodev1 (= ${binary:Version}),
-         librte-distributor1 (= ${binary:Version}),
-         librte-eal2 (= ${binary:Version}),
-         librte-hash2 (= ${binary:Version}),
-         librte-ip-frag1 (= ${binary:Version}),
-         librte-jobstats1 (= ${binary:Version}),
-         librte-kni2 (= ${binary:Version}) [amd64 arm64],
-         librte-kvargs1 (= ${binary:Version}),
-         librte-lpm2 (= ${binary:Version}),
-         librte-mbuf2 (= ${binary:Version}),
-         librte-mempool2 (= ${binary:Version}),
-         librte-meter1 (= ${binary:Version}),
-         librte-pdump1 (= ${binary:Version}),
-         librte-pipeline3 (= ${binary:Version}),
-         librte-pmd-af-packet1 (= ${binary:Version}),
-         librte-pmd-bnxt1 (= ${binary:Version}),
-         librte-pmd-bond1 (= ${binary:Version}),
-         librte-pmd-cxgbe1 (= ${binary:Version}),
-         librte-pmd-e1000-1 (= ${binary:Version}),
-         librte-pmd-ena1 (= ${binary:Version}),
-         librte-pmd-enic1 (= ${binary:Version}),
-         librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386],
-         librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386],
-         librte-pmd-ixgbe1 (= ${binary:Version}),
-         librte-pmd-null-crypto1 (= ${binary:Version}),
-         librte-pmd-null1 (= ${binary:Version}),
-         librte-pmd-pcap1 (= ${binary:Version}),
-         librte-pmd-ring2 (= ${binary:Version}),
-         librte-pmd-vhost1 (= ${binary:Version}),
-         librte-pmd-virtio1 (= ${binary:Version}),
-         librte-pmd-vmxnet3-uio1 (= ${binary:Version}),
-         librte-pmd-xenvirt1 (= ${binary:Version}),
-         librte-port3 (= ${binary:Version}),
-         librte-power1 (= ${binary:Version}),
-         librte-reorder1 (= ${binary:Version}),
-         librte-ring1 (= ${binary:Version}),
-         librte-sched1 (= ${binary:Version}),
-         librte-table2 (= ${binary:Version}),
-         librte-timer1 (= ${binary:Version}),
-         librte-vhost3 (= ${binary:Version})
-Description: Data Plane Development Kit (basic development files)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the basic headers and library files required to
- build external applications which will also require at least SSE3 support
- when running.
-
-Package: libethdev4
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__ethdev_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (libethdev runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for libethdev.
-
-Package: librte-acl2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__ethdev_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-acl runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_acl.
-
-Package: librte-cfgfile2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__cfgfile_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-cfgfile runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_cfgfile.
-
-Package: librte-cmdline2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-cmdline runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_cmdline.
-
-Package: librte-cryptodev1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__cryptodev_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-cryptodev runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_cryptodev.
-
-Package: librte-distributor1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__distributor_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-distributor runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_distributor.
-
-Package: librte-eal2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__eal_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-eal runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_eal.
-
-Package: librte-hash2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__hash_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-hash runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_hash.
-
-Package: librte-ip-frag1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__ip__frag_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-ip-frag runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_ip_frag.
-
-Package: librte-jobstats1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__jobstats_8h_source.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-jobstats runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_jobstats.
-
-Package: librte-kni2
-Architecture: amd64 arm64
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__kni_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-kni runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_kni.
-
-Package: librte-kvargs1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__kvargs_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-kvargs runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_kvargs.
-
-Package: librte-lpm2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__lpm_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-lpm runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_lpm.
-
-Package: librte-mbuf2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__mbuf_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-mbuf2 runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_mbuf.
-
-Package: librte-mempool2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__mempool_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-mempool runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_mempool.
-
-Package: librte-meter1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__meter_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-meter runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_meter.
-
-Package: librte-pipeline3
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__pipeline_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pipeline runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pipeline.
-
-Package: librte-pmd-af-packet1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/browse/dpdk/tree/drivers/net/af_packet
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-af-packet runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_af_packet.
-
-Package: librte-pmd-bnxt1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-bnxt runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_bnxt.
-
-Package: librte-pmd-bond1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-bond runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_bond.
-
-Package: librte-pmd-cxgbe1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/cxgbe.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-cxgbe runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_cxgbe.
-
-Package: librte-pmd-e1000-1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/e1000em.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-e1000 runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_e1000.
-
-Package: librte-pmd-ena1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/ena.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-ena runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_ena.
-
-Package: librte-pmd-enic1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/enic.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-enic runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_enic.
-
-Package: librte-pmd-fm10k1
-Architecture: amd64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/fm10k.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-fm10k runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_fm10k.
-
-Package: librte-pmd-i40e1
-Architecture: amd64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/i40e.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-i40e runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_i40e.
-
-Package: librte-pmd-ixgbe1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/ixgbe.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-ixgbe runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_ixgbe.
-
-Package: librte-pmd-null-crypto1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/cryptodevs/null.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-null-crypto runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_null_crypto.
-
-Package: librte-pmd-null1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/browse/dpdk/tree/drivers/net/null
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-null runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_null.
-
-Package: librte-pmd-pcap1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/pcap_ring.html#libpcap-based-pmd
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-pcap runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_pcap.
-
-Package: librte-pmd-ring2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/pcap_ring.html#rings-based-pmd
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-ring runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_ring.
-
-Package: librte-pmd-vhost1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/vhost.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-vhost runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_vhost.
-
-Package: librte-pmd-virtio1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/virtio.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-virtio runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_virtio.
-
-Package: librte-pmd-vmxnet3-uio1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/nics/vmxnet3.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-vmxnet3-uio runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_vmxnet3_uio.
-
-Package: librte-pmd-xenvirt1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/guides/xen/pkt_switch.html#xen-pmd-frontend-prerequisites
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-xenvirt runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pmd_xenvirt.
-
-Package: librte-port3
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__port_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-port runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_port.
-
-Package: librte-power1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__power_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-power runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_power.
-
-Package: librte-reorder1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__reorder_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-reorder runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_reorder.
-
-Package: librte-ring1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__ring_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_ring runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_ring.
-
-Package: librte-sched1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__sched_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_sched runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_sched.
-
-Package: librte-table2
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__table_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_table runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_table.
-
-Package: librte-timer1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__timer_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_timer runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_timer.
-
-Package: librte-vhost3
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Homepage: http://dpdk.org/doc/api/rte__virtio__net_8h.html
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_vhost runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_vhost.
-
-Package: librte-pdump1
-Architecture: amd64 arm64 i386
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_pdump runtime library)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- .
- This package contains the runtime libraries for librte_pdump.
-
-Package: dpdk-dkms
-Architecture: amd64 arm64 i386 ppc64el
-Depends: dpdk-igb-uio-dkms (= ${binary:Version}), dpdk-rte-kni-dkms (= ${binary:Version})
-Multi-Arch: same
-Conflicts: libdpdk0
-Breaks: dpdk-dkms (< ${binary:Version})
-Description: Metapackage provides backward compatibility for
- installing dpdk-dkms modules.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/control.modules.in b/ovs_build/dpdk_16.07.fuel/debian/control.modules.in
deleted file mode 100644
index dd1d9f8..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/control.modules.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: dpdk-modules-#KVERS#
-Section: kernel
-Architecture: amd64 arm64 i386
-Provides: dpdk-modules
-Recommends: linux-image-#KVERS#
-Conflicts: dpdk-igb-uio-dkms, dpdk-rte-kni-dkms
-Built-Using: ${built:using:kernel}
-Description: Data Plane Development Kit (rte kni, igb uio modules)
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- This package contains the source code for the igb_uio kernel module.
- .
- This package provides the kernel drivers for userspace networking.
- Includes Intel DPDK kernel modules.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/copyright b/ovs_build/dpdk_16.07.fuel/debian/copyright
deleted file mode 100644
index 2408879..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/copyright
+++ /dev/null
@@ -1,136 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: dpdk
-Source: http://dpdk.org
-
-Files: *
-Copyright: 2008-2014 Cisco Systems, Inc.
-           2012-2014 6WIND S.A.
-           1999-2016 Intel Corporation.
-           2010-2013 Tilera Corporation.
-           2012-2016 Mellanox.
-           2007      VMware, Inc.
-           2007      Nuova Systems, Inc.
-           2014      IBM Corporation.
-           and many other contributors.
-License: BSD-3-clause
-
-Files: lib/librte_eal/linuxapp/*
-Copyright: 2007-2016, Intel Corporation
-           2006-2007 Myricom, Inc. for some LRO specific code
-License: GPL-2
-
-Files: drivers/net/enic/*
-Copyright: 2007, Nuova Systems, Inc.
-           2008-2016, Cisco Systems, Inc.
-License: BSD-2-clause
-
-Files:
- lib/librte_eal/common/include/rte_pci_dev_*.h
- lib/librte_eal/linuxapp/xen_dom0/*
- lib/librte_vhost/eventfd_link/eventfd_link.h
- drivers/crypto/qat/qat_adf/*
-Copyright: 2010-2016, Intel Corporation.
-License: BSD-3-clause or GPL-2
-
-Files:
- lib/librte_eal/bsdapp/eal/include/exec-env/rte_dom0_common.h
- lib/librte_eal/linuxapp/eal/include/exec-env/rte_dom0_common.h
- lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
-Copyright: 2007-2014, Intel Corporation.
-License: BSD-3-clause or LGPL-2.1
-
-Files: lib/librte_compat/rte_compat.h
- drivers/net/vmxnet3/base/upt1_defs.h
- drivers/net/vmxnet3/base/vmxnet3_defs.h
- scripts/validate-abi.sh
-Copyright: 2015, Neil Horman <nhorman@tuxdriver.com>
-           2007, VMware, Inc.
-License: BSD-2-clause
-
-Files: buildtools/pmdinfogen/*
-Copyright: 2016, Neil Horman <nhorman@tuxdriver.com>
-License: GPL-2
-
-Files: debian/*
-Copyright: 2015, 2016 Canonical Ltd.
-License: GPL-3
-
-Files: debian/kernel-version
-       debian/prep-modules
-Copyright: 2009-2016 Andreas Beckmann <anbe@debian.org>
-           2010-2016 Russ Allbery <rra@debian.org>
-License: GPL-2.0+
-
-License: GPL-2
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: GPL-2.0+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- On Debian systems, the complete text of the GNU General Public
- License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: GPL-3
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-License: LGPL-2.1
- On Debian systems, the complete text of the GNU Library General Public
- License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
- * Neither the name of Intel Corporation nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk-dev.lintian-overrides b/ovs_build/dpdk_16.07.fuel/debian/dpdk-dev.lintian-overrides
deleted file mode 100644
index 2d24d92..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk-dev.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Upstream distributes it like this, these are binaries which are
-# part of the sdk which is shipped in dpdk-dev.
-dpdk-dev: arch-dependent-file-in-usr-share
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.README.Debian b/ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.README.Debian
deleted file mode 100644
index 0e3866a..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.README.Debian
+++ /dev/null
@@ -1,64 +0,0 @@
-dpdk for Debian
----------------
-
-This package is currently compiled for the lowest possible CPU requirements.
-Which still requires at least SSE3 to be supported by the CPU.
-
-dpdk (runtime) / libdpdk0:
-
-For runtime /etc/dpdk/interfaces holds a list of PCI devices to be assigned
-to DPDK compatible drivers and /etc/dpdk/dpdk.conf allows one to define the
-number of hugepages to be reserved at boot.
-The runtime environment is not required to build applications that use
-DPDK but if those applications get packaged they should depend on the
-runtime.
-
-Since DPDK technically would be able to use all of your compatible card/driver
-combination it is required that you take care of blacklisting / whitelisting
-network cards to tell dpdk which it has to initialize (especially true for
-virtio-pci as the normal kernel driver is considered compatible).
-
-If you are working with virtio-pci network cards it isn't a hard requirement to
-assign them to a dpdk compatible userspace driver like uio_pci_generic. But you
-have to at least unbind them from the default kernel driver (virtio-pci) to
-avoid bugs by dpdk and the kernel working on them simultaneously. It is
-recommended to reassign them to dpdk compatible drivers using
-/etc/dpdk/interfaces (just as you would with any physical card).
-
-libdpdk0 contains the shared object needed to run a program in terms of symbol
-resolution, but none of the other runtime environment pieces.
-
-dpdk-dev / libdpdk-dev:
-
-The minimum requirement for developing external applications is libdpdk-dev,
-which brings the headers and library files.
-
-In dpdk-dev is the upstream makefile environment. Sample applications, which
-are shipped in dpdk-doc, are providing makefiles.
-Those makefiles need to find the dpdk build system. To do so they need some
-environment variables defined:
- export RTE_TARGET="$(uname -m)-default-linuxapp-gcc"
- export RTE_SDK="/usr/share/dpdk/"
- export RTE_INCLUDE="/usr/include/dpdk"
-Those can be set by the user to overwrite with a custom path/config. If no
-custom environment is used it is recommended to source the file
-/usr/share/dpdk/dpdk-sdk-env.sh which comes with dpdk-dev.
-If the paths ever change or there will be more/less variables needed to build
-against dpdk-dev that file will be adjusted for you.
-
-Alternatively /usr/include/dpdk/rte_config.h has to be pre-included:
-CFLAGS  += -I/usr/include/dpdk -irte_config.h
-
-librte-pmd-* and DPDK PMD autoloading:
-
-PMD driver autoloading. DPDK since its split into several libraries does not
-have all PMD drivers available by default. One always can use EAL argument -d
-to provide a path to an extra .so file.
-TO ease daily usage RTE_EAL_PMD_PATH is set to
-/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/dpdk-pmds/.
-Each librte-pmd-* package will place a symlink in there which makes DPDK load
-and register it as PMD on startup.
-This can also be used to globally enable extra PMD drivers as you can link
-self-provided .so files in there to be considered.
-
- -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 29 Sep 2016 13:04:47 +0200
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.lintian-overrides b/ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.lintian-overrides
deleted file mode 100644
index 7da34da..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk-doc.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-dpdk-doc: embedded-javascript-library
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk-igb-uio-dkms.dkms b/ovs_build/dpdk_16.07.fuel/debian/dpdk-igb-uio-dkms.dkms
deleted file mode 100644
index 10dfecc..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk-igb-uio-dkms.dkms
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_NAME="dpdk-igb-uio"
-PACKAGE_VERSION="#MODULE_VERSION#"
-BUILT_MODULE_NAME[0]="igb_uio"
-MAKE="source /usr/share/dpdk/dpdk-sdk-env.sh; make MODULE_CFLAGS='-I/usr/include/dpdk -include /usr/include/dpdk/rte_config.h'"
-CLEAN="source /usr/share/dpdk/dpdk-sdk-env.sh; make clean"
-DEST_MODULE_LOCATION[0]="/updates/dkms"
-AUTOINSTALL="YES"
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk-init b/ovs_build/dpdk_16.07.fuel/debian/dpdk-init
deleted file mode 100755
index 2872e49..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk-init
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# dpdk-init: startup script to initialize a dpdk runtime environment
-#
-# Copyright 2015-2016 Canonical Ltd.
-# Autor: Stefan Bader <stefan.bader@canonical.com>
-# Autor: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3,
-#    as published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-set -e
-
-DPDK_BIND="/sbin/dpdk-devbind"
-DPDK_INTERF="/etc/dpdk/interfaces"
-
-
-# pagesize supports [G|g]/[M|m]/[K|k]
-get_kbytes() {
-    local unit
-    local num
-    unit=$(echo "${1}" | sed 's/[0-9]*//g')
-    num=$(echo "${1}" | sed 's/[^0-9]*//g')
-    case ${unit} in
-    *g | *G)
-        echo $((num*1024*1024))
-        ;;
-    *m | *M)
-        echo $((num*1024))
-        ;;
-    *k | *K)
-        echo $((num))
-        ;;
-    *)
-        echo $((num/1024))
-        ;;
-    esac
-}
-
-get_default_hpgsz() {
-    default_hpgsz=$(grep "Hugepagesize:" /proc/meminfo \
-        | sed 's/^Hugepagesize:\s*//g' | sed 's/\s*kB$//g')
-    echo "${default_hpgsz}"
-}
-
-get_hugetlbfs_mountpoint() {
-    local requested_hpgsz
-    local mp_hpgsz
-    requested_hpgsz=$(get_kbytes "${1}")
-
-    grep hugetlbfs /proc/mounts | while read \
-        mntfrom mntpoint mntfstype mntopt mntdump mntfsck; do
-
-        # check if the current muntpoint is of the requested huge page size
-        case ${mntopt} in
-        *pagesize=*)
-            mp_hpgsz=$(echo "${mntopt}" | sed 's/.*pagesize=//g' | sed 's/,.*//g')
-            mp_hpgsz=$(get_kbytes "${mp_hpgsz}")
-            ;;
-        *)
-            mp_hpgsz=$(get_default_hpgsz)
-            ;;
-        esac
-        if [ "${requested_hpgsz}" -eq "${mp_hpgsz}" ]; then
-            echo "${mntpoint}"
-            return
-        fi
-    done
-}
-
-_mount_hugetlbfs() {
-    local MNT="/dev/hugepages"
-    local MNTOPTS=""
-    local requested_hpgsz
-    local default_hpgsz
-    requested_hpgsz=$(get_kbytes "${1}")
-    default_hpgsz=$(get_default_hpgsz)
-
-    # kernel might not support the requested size
-    if [ ! -d "/sys/kernel/mm/hugepages/hugepages-${requested_hpgsz}kB" ]; then
-        echo "WARNING: requested page size of ${requested_hpgsz}kB " \
-             "not supported by the kernel"
-        return 0
-    fi
-
-    # special case if this is not the default huge page size
-    if [ "${requested_hpgsz}" -ne "${default_hpgsz}" ]; then
-        MNT="${MNT}-${requested_hpgsz}"
-        MNTOPTS="pagesize=${requested_hpgsz}K"
-    fi
-
-    if [ ! -e "${MNT}" ]; then
-        mkdir "${MNT}"
-        if [ $? -ne 0 ]; then
-            echo "Could not create directory ${MNT}!" >&2
-            return 1
-        fi
-    fi
-    mount -thugetlbfs hugetlbfs "${MNT}" -o "${MNTOPTS}"
-    return $?
-}
-
-#
-# The DPDK library will use the first mounted instance it finds for a given
-# page size. so if there is already one for a given size there is no need to
-# create another for the same huge page size.
-#
-mount_hugetlbfs() {
-    if [ ! -r /etc/dpdk/dpdk.conf ]; then
-        return 1
-    fi
-    . /etc/dpdk/dpdk.conf
-
-    # if a page size is requested, there has to be a mountpoint for that size
-    if [ -n "${NR_2M_PAGES}" -a -z "$(get_hugetlbfs_mountpoint '2M')" ]; then
-        _mount_hugetlbfs 2M
-    fi
-    if [ -n "${NR_1G_PAGES}" -a -z "$(get_hugetlbfs_mountpoint '1G')" ]; then
-        _mount_hugetlbfs 1G
-    fi
-}
-
-_setup_hugepages() {
-    MMDIR="/sys/kernel/mm/hugepages/${1}"
-    PAGES=${2}
-
-    if [ "$PAGES" != "" ]; then
-        if [ "$PAGES" -gt 0 ]; then
-            if [ -d "$MMDIR" -a -w "$MMDIR/nr_hugepages" ]; then
-                # increases the chance to allocate enough huge pages
-                # configurable, since it comes at a perf penality
-                if [ "$DROPCACHE_BEFORE_HP_ALLOC" = "1" ]; then
-                    echo 3 > /proc/sys/vm/drop_caches
-                fi
-
-                echo "$PAGES" > "$MMDIR/nr_hugepages"
-
-                GOTPAGES=$(cat "$MMDIR/nr_hugepages")
-                if [ "$GOTPAGES" -lt "$PAGES" ]; then
-                    echo "WARNING: could not allocate $PAGES at " \
-                         "$MMDIR/nr_hugepages (only got $GOTPAGES)."
-                fi
-            else
-                echo "WARNING: $MMDIR/nr_hugepages not found/writable"
-            fi
-        fi
-    fi
-}
-
-#
-# Reserve a certain amount of hugepages (defined in /etc/dpdk.conf)
-#
-setup_hugepages() {
-    if [ ! -r /etc/dpdk/dpdk.conf ]; then
-        return 1
-    fi
-    . /etc/dpdk/dpdk.conf
-
-    _setup_hugepages "hugepages-2048kB" "$NR_2M_PAGES"
-    _setup_hugepages "hugepages-1048576kB" "$NR_1G_PAGES"
-
-    # dpdk uses 2*#hugepages mappings, increase for huge systems LP #1507921
-    if [ -d /sys/kernel/mm/hugepages ]; then
-        max_map_count=$(awk -v pad=65530 '{tot+=$1}END{print tot*2+pad}' \
-            /sys/kernel/mm/hugepages/hugepages-*/nr_hugepages)
-        sysctl -q vm.max_map_count="${max_map_count:-65530}"
-    fi
-
-    return 0
-}
-
-#
-# Allow NICs to be automatically bound to DPDK compatible drivers on boot.
-#
-bind_interfaces() {
-    if [ ! -r "$DPDK_INTERF" ]; then
-        return 0
-    fi
-    grep -v '^[ \t]*#' "$DPDK_INTERF" | while read BUS ID MOD; do
-        if [ "$BUS" = "" -o "$ID" = "" -o "$MOD" = "" ]; then
-            echo "WARNING: incomplete spec in $DPDK_INTERF" \
-                " - BUS '$BUS' ID '$ID' MOD '$MOD'"
-            continue
-        fi
-        if [ "$BUS" != "pci" ]; then
-            echo "WARNING: incompatible bus '$BUS' in $DPDK_INTERF"
-            continue
-        fi
-
-        SYSFSPATH="/sys/bus/$BUS/devices/$ID"
-        if [ ! -e "$SYSFSPATH" ]; then
-            echo "WARNING: invalid pci ID '$ID' in $DPDK_INTERF" \
-                " - '$SYSFSPATH' does not exist"
-            continue
-        fi
-        if [ -L "$SYSFSPATH/driver" ]; then
-            CUR=$(readlink "$SYSFSPATH/driver")
-            CUR=$(basename "$CUR")
-        else
-            # device existing, but currently unregistered
-            CUR=""
-        fi
-        if [ "$MOD" != "$CUR" ]; then
-            modprobe -q "$MOD" || true
-            # cloud img have no linux-image-extra initially (uip_pci_generic)
-            # so check if the module is available (loadable/built in)
-            if [ -e "/sys/bus/pci/drivers/${MOD}" ]; then
-                echo "Reassigning pci:$ID to $MOD"
-                $DPDK_BIND -b "$MOD" "$ID"
-            else
-                echo "Warning: failed assigning pci:$ID," \
-                     " module $MOD not available"
-            fi
-        else
-            echo "pci:$ID already assigned to $MOD"
-        fi
-    done
-}
-
-
-
-case "$1" in
-start)
-    mount_hugetlbfs
-    setup_hugepages
-    bind_interfaces
-    ;;
-stop)
-    ;;
-reload|force-reload)
-    setup_hugepages
-    bind_interfaces
-    ;;
-status)
-    $DPDK_BIND --status
-    ;;
-*)
-    echo "Usage: $0 {start|stop|reload|force-reload|status}"
-    exit 1
-    ;;
-esac
-
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk-rte-kni-dkms.dkms b/ovs_build/dpdk_16.07.fuel/debian/dpdk-rte-kni-dkms.dkms
deleted file mode 100644
index efccf1f..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk-rte-kni-dkms.dkms
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_NAME="dpdk-rte-kni"
-PACKAGE_VERSION="#MODULE_VERSION#"
-BUILT_MODULE_NAME[0]="rte_kni"
-MAKE="source /usr/share/dpdk/dpdk-sdk-env.sh; make MODULE_CFLAGS='-I/usr/include/dpdk -include /usr/include/dpdk/rte_config.h -I$source_tree/dpdk-rte-kni-#MODULE_VERSION#/ethtool/ixgbe -I$source_tree/dpdk-rte-kni-#MODULE_VERSION#/ethtool/igb'"
-CLEAN="source /usr/share/dpdk/dpdk-sdk-env.sh; make clean"
-DEST_MODULE_LOCATION[0]="/updates/dkms"
-AUTOINSTALL="YES"
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk-sdk-env.sh.in b/ovs_build/dpdk_16.07.fuel/debian/dpdk-sdk-env.sh.in
deleted file mode 100755
index aa8550f..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk-sdk-env.sh.in
+++ /dev/null
@@ -1,4 +0,0 @@
-export RTE_TARGET=SDK_TARGET
-export RTE_SDK="/usr/share/dpdk/"
-export RTE_INCLUDE="/usr/include/dpdk"
-export RTE_KERNELDIR="/lib/modules/${kernelver}/build"
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk.conf b/ovs_build/dpdk_16.07.fuel/debian/dpdk.conf
deleted file mode 100644
index fb4572d..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# The number of 2M hugepages to reserve on system boot
-#
-# Default is 0
-# To e.g. let it reserve 64x 2M Hugepages set:
-# NR_2M_PAGES=64
-
-#
-# The number of 1G hugepages to reserve on system boot
-#
-# Default is 0
-# To e.g. let it reserve 2x 1G Hugepages set:
-# NR_1G_PAGES=2
-
-#
-# Dropping slab and pagecache can help to successfully allocate hugepages,
-# especially later in the lifecycle of a system.
-# This comes at the cost of loosing all slab and pagecache on (re)start
-# of the dpdk service - therefore the default is off.
-#
-# Default is 0
-# Set to 1 to enable it
-#DROPCACHE_BEFORE_HP_ALLOC=0
-
-# The DPDK library will use the first mounted hugetlbfs.
-# The init scripts try to ensure there is at least one default hugetlbfs
-# mountpoint on start.
-# If you have multiple hugetlbfs mountpoints for a complex (e.g. specific numa
-# policies) setup it should be controlled by the admin instead of this init
-# script. In that case specific mountpoints can be provided as parameters to
-# the DPDK library.
-
-# Hardware may support other granularities of hugepages (like 4M). But the
-# larger the hugepages the earlier those should be allocated.
-# Note: the dpdk init scripts will report warnings, but not fail if they could
-# not allocate the requested amount of hugepages.
-# The more or the larger the hugepages to be allocated are, the more it is
-# recommended to do the reservation as kernel commandline arguments.
-# To do so edit /etc/default/grub: GRUB_CMDLINE_LINUX_DEFAULT
-# and add [hugepagesz=xx] hugepages=yy ...
-#
-# Kernel commandline config:
-# hugepagesz sets the size for the next hugepages reservation (default 2M)
-# hugepages  reserves the given number of hugepages of the size set before
-#
-# After modifying /etc/default/grub, the command "update-grub" has to be
-# run in order to re-generate the grub config files. The new values will
-# be used after next reboot.
-#
-# example:
-# GRUB_CMDLINE_LINUX_DEFAULT="... hugepages=16 hugepagesz=1G hugepages=2"
-#
-# If the system supports it, this will reserve 16x 2M pages and 2x 1G pages.
-#
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk.init b/ovs_build/dpdk_16.07.fuel/debian/dpdk.init
deleted file mode 100644
index 01b4784..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk.init
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          dpdk
-# Required-Start:    $remote_fs $local_fs
-# Required-Stop:     $remote_fs $local_fs
-# Default-Start:     S
-# Default-Stop:      0 1 6
-# Short-Description: start dpdk runtime environment
-### END INIT INFO
-
-set -e
-
-PATH="/sbin:/bin:/usr/bin"
-
-[ -d /lib/dpdk ] || exit 0
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-error=0
-case "$1" in
-start)
-    log_action_begin_msg "Starting DPDK environment" "dpdk"
-    output=$(/lib/dpdk/dpdk-init start 2>&1) || error="$?"
-    if [ ! -z "$output" ]; then
-        echo "$output" | while read line; do
-            log_action_cont_msg "$line"
-        done
-    fi
-    log_action_end_msg $error
-    exit $error
-    ;;
-stop)
-    ;;
-restart|force-reload)
-    ;;
-status)
-    output=$(/lib/dpdk/dpdk-init --status 2>&1) || error="$?"
-    if [ ! -z "$output" ]; then
-        echo "$output" | while read line; do
-            log_action_cont_msg "$line"
-        done
-    fi
-    log_action_end_msg $error
-    exit $error
-    ;;
-*)
-    echo "Usage: $0 {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
-
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk.install b/ovs_build/dpdk_16.07.fuel/debian/dpdk.install
deleted file mode 100644
index 24c8d45..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/dpdk-init	lib/dpdk/
-debian/dpdk.conf	etc/dpdk/
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk.interfaces b/ovs_build/dpdk_16.07.fuel/debian/dpdk.interfaces
deleted file mode 100644
index 3442343..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk.interfaces
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# <bus>		Currently only "pci" is supported
-# <id>		Device ID on the specified bus
-# <driver>	Driver to bind against (vfio-pci, uio_pci_generic, igb_uio or
-#               rte_kni)
-#
-# Be aware that the two dpdk compatible drivers uio_pci_generic and vfio-pci are
-# part of linux-image-extra-<VERSION> package.
-# This package is not always installed by default - for example in cloud-images.
-# So please install it in case you run into missing module issues.
-#
-# For the module igb_uio, please install the dpdk-igb-uio-dkms package.
-# For the module rte_kni, please install the dpdk-rte-kni-dkms package.
-#
-# <bus>	<id>		<driver>
-# pci	0000:04:00.0	vfio-pci
-# pci	0000:04:00.1	uio_pci_generic
-# pci	0000:05:00.0	igb_uio
-# pci	0000:06:00.0	rte_kni
diff --git a/ovs_build/dpdk_16.07.fuel/debian/dpdk.service b/ovs_build/dpdk_16.07.fuel/debian/dpdk.service
deleted file mode 100644
index 09ef8be..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/dpdk.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=DPDK runtime environment
-DefaultDependencies=false
-After=network-pre.target local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/lib/dpdk/dpdk-init start
-
-[Install]
-WantedBy=multi-user.target
diff --git a/ovs_build/dpdk_16.07.fuel/debian/kernel-version b/ovs_build/dpdk_16.07.fuel/debian/kernel-version
deleted file mode 100755
index 16ab01b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/kernel-version
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (c)  2009-2016 Andreas Beckmann <anbe@debian.org>
-#                2010-2016 Russ Allbery <rra@debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this script.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This program comes from:
-# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/kernel-version?view=markup
-# The original copyright and license (GPL2+) can be found at:
-# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright?view=markup
-#
-# Extract the kernel version from the kernel version header file.  Takes the
-# kernel source path as its only argument.  If the version header couldn't be
-# found, print nothing and exit quietly.
-
-use warnings;
-
-my $ksrc = shift;
-unless ($ksrc && (-f "$ksrc/include/linux/version.h" || -f "$ksrc/include/generated/uapi/linux/version.h")) {
-    exit 0;
-}
-my $found = 0;
-my $line;
-if (open (VERSION, "$ksrc/include/linux/version.h")) {
-    if (defined(VERSION) && ($line = <VERSION>)) {
-        if ($line =~ /"(.+)"/) {
-            print "$1\n";
-            $found = 1;
-        }
-    }
-}
-exit 0 if $found;
-if (open (VERSION, "$ksrc/include/generated/utsrelease.h")) {
-    if (defined(VERSION) && ($line = <VERSION>)) {
-        if ($line =~ /UTS_RELEASE *"(.+)"/) {
-            print "$1\n";
-            $found = 1;
-        }
-    }
-}
-exit 0 if $found;
-# kernel.release is no longer useful since 3.1.0
-unless (open (VERSION, "$ksrc/include/config/kernel.release")) {
-    exit 0;
-}
-if (defined(VERSION) && ($line = <VERSION>)) {
-    print "$line";
-}
-exit 0;
diff --git a/ovs_build/dpdk_16.07.fuel/debian/libdpdk.pc.in b/ovs_build/dpdk_16.07.fuel/debian/libdpdk.pc.in
deleted file mode 100644
index eff4f18..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/libdpdk.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: dpdk
-Description: Data Plane Development Kit library
-Version: @VERSION@
-Libs: -L${libdir} @DPDK_LIBS@ -ldl -lm -lpthread -lz
-Cflags: -I${includedir}/dpdk -include ${includedir}/dpdk/rte_config.h
diff --git a/ovs_build/dpdk_16.07.fuel/debian/libethdev4.symbols b/ovs_build/dpdk_16.07.fuel/debian/libethdev4.symbols
deleted file mode 100644
index 426fc15..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/libethdev4.symbols
+++ /dev/null
@@ -1,116 +0,0 @@
-libethdev.so.4 libethdev4 #MINVER#
- DPDK_16.04@DPDK_16.04 16.07~rc1
- DPDK_16.07@DPDK_16.07 16.07~rc1
- DPDK_2.2@DPDK_2.2 16.07~rc1
- _rte_eth_dev_callback_process@DPDK_2.2 16.07~rc1
- rte_eth_add_first_rx_callback@DPDK_16.07 16.07~rc1
- rte_eth_add_rx_callback@DPDK_2.2 16.07~rc1
- rte_eth_add_tx_callback@DPDK_2.2 16.07~rc1
- rte_eth_allmulticast_disable@DPDK_2.2 16.07~rc1
- rte_eth_allmulticast_enable@DPDK_2.2 16.07~rc1
- rte_eth_allmulticast_get@DPDK_2.2 16.07~rc1
- rte_eth_copy_pci_info@DPDK_2.2 16.07~rc1
- rte_eth_dev_allocate@DPDK_2.2 16.07~rc1
- rte_eth_dev_allocated@DPDK_2.2 16.07~rc1
- rte_eth_dev_attach@DPDK_2.2 16.07~rc1
- rte_eth_dev_callback_register@DPDK_2.2 16.07~rc1
- rte_eth_dev_callback_unregister@DPDK_2.2 16.07~rc1
- rte_eth_dev_close@DPDK_2.2 16.07~rc1
- rte_eth_dev_configure@DPDK_2.2 16.07~rc1
- rte_eth_dev_count@DPDK_2.2 16.07~rc1
- rte_eth_dev_default_mac_addr_set@DPDK_2.2 16.07~rc1
- rte_eth_dev_detach@DPDK_2.2 16.07~rc1
- rte_eth_dev_filter_ctrl@DPDK_2.2 16.07~rc1
- rte_eth_dev_filter_supported@DPDK_2.2 16.07~rc1
- rte_eth_dev_flow_ctrl_get@DPDK_2.2 16.07~rc1
- rte_eth_dev_flow_ctrl_set@DPDK_2.2 16.07~rc1
- rte_eth_dev_get_dcb_info@DPDK_2.2 16.07~rc1
- rte_eth_dev_get_eeprom@DPDK_2.2 16.07~rc1
- rte_eth_dev_get_eeprom_length@DPDK_2.2 16.07~rc1
- rte_eth_dev_get_mtu@DPDK_2.2 16.07~rc1
- rte_eth_dev_get_name_by_port@DPDK_16.07 16.07~rc1
- rte_eth_dev_get_port_by_name@DPDK_16.07 16.07~rc1
- rte_eth_dev_get_reg_info@DPDK_2.2 16.07~rc1
- rte_eth_dev_get_supported_ptypes@DPDK_16.04 16.07~rc1
- rte_eth_dev_get_vlan_offload@DPDK_2.2 16.07~rc1
- rte_eth_dev_info_get@DPDK_2.2 16.07~rc1
- rte_eth_dev_is_valid_port@DPDK_2.2 16.07~rc1
- rte_eth_dev_l2_tunnel_eth_type_conf@DPDK_16.04 16.07~rc1
- rte_eth_dev_l2_tunnel_offload_set@DPDK_16.04 16.07~rc1
- rte_eth_dev_mac_addr_add@DPDK_2.2 16.07~rc1
- rte_eth_dev_mac_addr_remove@DPDK_2.2 16.07~rc1
- rte_eth_dev_priority_flow_ctrl_set@DPDK_2.2 16.07~rc1
- rte_eth_dev_release_port@DPDK_2.2 16.07~rc1
- rte_eth_dev_rss_hash_conf_get@DPDK_2.2 16.07~rc1
- rte_eth_dev_rss_hash_update@DPDK_2.2 16.07~rc1
- rte_eth_dev_rss_reta_query@DPDK_2.2 16.07~rc1
- rte_eth_dev_rss_reta_update@DPDK_2.2 16.07~rc1
- rte_eth_dev_rx_intr_ctl@DPDK_2.2 16.07~rc1
- rte_eth_dev_rx_intr_ctl_q@DPDK_2.2 16.07~rc1
- rte_eth_dev_rx_intr_disable@DPDK_2.2 16.07~rc1
- rte_eth_dev_rx_intr_enable@DPDK_2.2 16.07~rc1
- rte_eth_dev_rx_queue_start@DPDK_2.2 16.07~rc1
- rte_eth_dev_rx_queue_stop@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_eeprom@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_link_down@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_link_up@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_mc_addr_list@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_mtu@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_rx_queue_stats_mapping@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_tx_queue_stats_mapping@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_vf_rx@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_vf_rxmode@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_vf_tx@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_vf_vlan_filter@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_vlan_ether_type@DPDK_16.04 16.07~rc1
- rte_eth_dev_set_vlan_offload@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_vlan_pvid@DPDK_2.2 16.07~rc1
- rte_eth_dev_set_vlan_strip_on_queue@DPDK_2.2 16.07~rc1
- rte_eth_dev_socket_id@DPDK_2.2 16.07~rc1
- rte_eth_dev_start@DPDK_2.2 16.07~rc1
- rte_eth_dev_stop@DPDK_2.2 16.07~rc1
- rte_eth_dev_tx_queue_start@DPDK_2.2 16.07~rc1
- rte_eth_dev_tx_queue_stop@DPDK_2.2 16.07~rc1
- rte_eth_dev_uc_all_hash_table_set@DPDK_2.2 16.07~rc1
- rte_eth_dev_uc_hash_table_set@DPDK_2.2 16.07~rc1
- rte_eth_dev_udp_tunnel_port_add@DPDK_16.04 16.07~rc1
- rte_eth_dev_udp_tunnel_port_delete@DPDK_16.04 16.07~rc1
- rte_eth_dev_vlan_filter@DPDK_2.2 16.07~rc1
- rte_eth_devices@DPDK_2.2 16.07~rc1
- rte_eth_dma_zone_reserve@DPDK_2.2 16.07~rc1
- rte_eth_driver_register@DPDK_2.2 16.07~rc1
- rte_eth_led_off@DPDK_2.2 16.07~rc1
- rte_eth_led_on@DPDK_2.2 16.07~rc1
- rte_eth_link_get@DPDK_2.2 16.07~rc1
- rte_eth_link_get_nowait@DPDK_2.2 16.07~rc1
- rte_eth_macaddr_get@DPDK_2.2 16.07~rc1
- rte_eth_mirror_rule_reset@DPDK_2.2 16.07~rc1
- rte_eth_mirror_rule_set@DPDK_2.2 16.07~rc1
- rte_eth_promiscuous_disable@DPDK_2.2 16.07~rc1
- rte_eth_promiscuous_enable@DPDK_2.2 16.07~rc1
- rte_eth_promiscuous_get@DPDK_2.2 16.07~rc1
- rte_eth_remove_rx_callback@DPDK_2.2 16.07~rc1
- rte_eth_remove_tx_callback@DPDK_2.2 16.07~rc1
- rte_eth_rx_queue_info_get@DPDK_2.2 16.07~rc1
- rte_eth_rx_queue_setup@DPDK_2.2 16.07~rc1
- rte_eth_set_queue_rate_limit@DPDK_2.2 16.07~rc1
- rte_eth_set_vf_rate_limit@DPDK_2.2 16.07~rc1
- rte_eth_speed_bitflag@DPDK_16.04 16.07~rc1
- rte_eth_stats_get@DPDK_2.2 16.07~rc1
- rte_eth_stats_reset@DPDK_2.2 16.07~rc1
- rte_eth_timesync_adjust_time@DPDK_2.2 16.07~rc1
- rte_eth_timesync_disable@DPDK_2.2 16.07~rc1
- rte_eth_timesync_enable@DPDK_2.2 16.07~rc1
- rte_eth_timesync_read_rx_timestamp@DPDK_2.2 16.07~rc1
- rte_eth_timesync_read_time@DPDK_2.2 16.07~rc1
- rte_eth_timesync_read_tx_timestamp@DPDK_2.2 16.07~rc1
- rte_eth_timesync_write_time@DPDK_2.2 16.07~rc1
- rte_eth_tx_buffer_count_callback@DPDK_16.04 16.07~rc1
- rte_eth_tx_buffer_drop_callback@DPDK_16.04 16.07~rc1
- rte_eth_tx_buffer_init@DPDK_16.04 16.07~rc1
- rte_eth_tx_buffer_set_err_callback@DPDK_16.04 16.07~rc1
- rte_eth_tx_queue_info_get@DPDK_2.2 16.07~rc1
- rte_eth_tx_queue_setup@DPDK_2.2 16.07~rc1
- rte_eth_xstats_get@DPDK_2.2 16.07~rc1
- rte_eth_xstats_get_names@DPDK_16.07 16.07~rc1
- rte_eth_xstats_reset@DPDK_2.2 16.07~rc1
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-acl2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-acl2.symbols
deleted file mode 100644
index 8ebfb8f..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-acl2.symbols
+++ /dev/null
@@ -1,15 +0,0 @@
-librte_acl.so.2 librte-acl2 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_acl_add_rules@DPDK_2.0 16.04
- rte_acl_build@DPDK_2.0 16.04
- rte_acl_classify@DPDK_2.0 16.04
- rte_acl_classify_alg@DPDK_2.0 16.04
- rte_acl_classify_scalar@DPDK_2.0 16.04
- rte_acl_create@DPDK_2.0 16.04
- rte_acl_dump@DPDK_2.0 16.04
- rte_acl_find_existing@DPDK_2.0 16.04
- rte_acl_free@DPDK_2.0 16.04
- rte_acl_list_dump@DPDK_2.0 16.04
- rte_acl_reset@DPDK_2.0 16.04
- rte_acl_reset_rules@DPDK_2.0 16.04
- rte_acl_set_ctx_classify@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-cfgfile2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-cfgfile2.symbols
deleted file mode 100644
index 1d347dc..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-cfgfile2.symbols
+++ /dev/null
@@ -1,13 +0,0 @@
-librte_cfgfile.so.2 librte-cfgfile2 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
- DPDK_2.0@DPDK_2.0 16.04
- rte_cfgfile_close@DPDK_2.0 16.04
- rte_cfgfile_get_entry@DPDK_2.0 16.04
- rte_cfgfile_has_entry@DPDK_2.0 16.04
- rte_cfgfile_has_section@DPDK_2.0 16.04
- rte_cfgfile_load@DPDK_2.0 16.04
- rte_cfgfile_num_sections@DPDK_2.0 16.04
- rte_cfgfile_section_entries@DPDK_2.0 16.04
- rte_cfgfile_section_entries_by_index@DPDK_16.04 16.04
- rte_cfgfile_section_num_entries@DPDK_2.0 16.04
- rte_cfgfile_sections@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-cmdline2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-cmdline2.symbols
deleted file mode 100644
index b83f5fd..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-cmdline2.symbols
+++ /dev/null
@@ -1,68 +0,0 @@
-librte_cmdline.so.2 librte-cmdline2 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.1@DPDK_2.1 16.04
- cirbuf_add_buf_head@DPDK_2.0 16.04
- cirbuf_add_buf_tail@DPDK_2.0 16.04
- cirbuf_add_head@DPDK_2.0 16.04
- cirbuf_add_head_safe@DPDK_2.0 16.04
- cirbuf_add_tail@DPDK_2.0 16.04
- cirbuf_add_tail_safe@DPDK_2.0 16.04
- cirbuf_align_left@DPDK_2.0 16.04
- cirbuf_align_right@DPDK_2.0 16.04
- cirbuf_del_buf_head@DPDK_2.0 16.04
- cirbuf_del_buf_tail@DPDK_2.0 16.04
- cirbuf_del_head@DPDK_2.0 16.04
- cirbuf_del_head_safe@DPDK_2.0 16.04
- cirbuf_del_tail@DPDK_2.0 16.04
- cirbuf_del_tail_safe@DPDK_2.0 16.04
- cirbuf_get_buf_head@DPDK_2.0 16.04
- cirbuf_get_buf_tail@DPDK_2.0 16.04
- cirbuf_get_head@DPDK_2.0 16.04
- cirbuf_get_tail@DPDK_2.0 16.04
- cirbuf_init@DPDK_2.0 16.04
- cmdline_complete@DPDK_2.0 16.04
- cmdline_complete_get_elt_string@DPDK_2.0 16.04
- cmdline_complete_get_nb_string@DPDK_2.0 16.04
- cmdline_file_new@DPDK_2.0 16.04
- cmdline_free@DPDK_2.0 16.04
- cmdline_get_help_etheraddr@DPDK_2.0 16.04
- cmdline_get_help_ipaddr@DPDK_2.0 16.04
- cmdline_get_help_num@DPDK_2.0 16.04
- cmdline_get_help_portlist@DPDK_2.0 16.04
- cmdline_get_help_string@DPDK_2.0 16.04
- cmdline_in@DPDK_2.0 16.04
- cmdline_interact@DPDK_2.0 16.04
- cmdline_isendoftoken@DPDK_2.0 16.04
- cmdline_new@DPDK_2.0 16.04
- cmdline_parse@DPDK_2.0 16.04
- cmdline_parse_etheraddr@DPDK_2.0 16.04
- cmdline_parse_ipaddr@DPDK_2.0 16.04
- cmdline_parse_num@DPDK_2.0 16.04
- cmdline_parse_portlist@DPDK_2.0 16.04
- cmdline_parse_string@DPDK_2.0 16.04
- cmdline_poll@DPDK_2.1 16.04
- cmdline_printf@DPDK_2.0 16.04
- cmdline_quit@DPDK_2.0 16.04
- cmdline_set_prompt@DPDK_2.0 16.04
- cmdline_stdin_exit@DPDK_2.0 16.04
- cmdline_stdin_new@DPDK_2.0 16.04
- cmdline_token_etheraddr_ops@DPDK_2.0 16.04
- cmdline_token_ipaddr_ops@DPDK_2.0 16.04
- cmdline_token_num_ops@DPDK_2.0 16.04
- cmdline_token_portlist_ops@DPDK_2.0 16.04
- cmdline_token_string_ops@DPDK_2.0 16.04
- cmdline_write_char@DPDK_2.0 16.04
- rdline_add_history@DPDK_2.0 16.04
- rdline_char_in@DPDK_2.0 16.04
- rdline_clear_history@DPDK_2.0 16.04
- rdline_get_buffer@DPDK_2.0 16.04
- rdline_get_history_item@DPDK_2.0 16.04
- rdline_init@DPDK_2.0 16.04
- rdline_newline@DPDK_2.0 16.04
- rdline_quit@DPDK_2.0 16.04
- rdline_redisplay@DPDK_2.0 16.04
- rdline_reset@DPDK_2.0 16.04
- rdline_restart@DPDK_2.0 16.04
- rdline_stop@DPDK_2.0 16.04
- vt100_init@DPDK_2.0 16.04
- vt100_parser@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-cryptodev1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-cryptodev1.symbols
deleted file mode 100644
index f5fa955..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-cryptodev1.symbols
+++ /dev/null
@@ -1,32 +0,0 @@
-librte_cryptodev.so.1 librte-cryptodev1 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
- DPDK_16.07@DPDK_16.07 16.07~rc1
- rte_crypto_op_pool_create@DPDK_16.04 16.04
- rte_cryptodev_callback_register@DPDK_16.04 16.04
- rte_cryptodev_callback_unregister@DPDK_16.04 16.04
- rte_cryptodev_close@DPDK_16.04 16.04
- rte_cryptodev_configure@DPDK_16.04 16.04
- rte_cryptodev_count@DPDK_16.04 16.04
- rte_cryptodev_count_devtype@DPDK_16.04 16.04
- rte_cryptodev_create_vdev@DPDK_16.04 16.04
- rte_cryptodev_get_dev_id@DPDK_16.04 16.04
- rte_cryptodev_get_feature_name@DPDK_16.04 16.04
- rte_cryptodev_info_get@DPDK_16.04 16.04
- rte_cryptodev_parse_vdev_init_params@DPDK_16.07 16.07~rc1
- rte_cryptodev_pmd_allocate@DPDK_16.04 16.04
- rte_cryptodev_pmd_callback_process@DPDK_16.04 16.04
- rte_cryptodev_pmd_driver_register@DPDK_16.04 16.04
- rte_cryptodev_pmd_release_device@DPDK_16.04 16.04
- rte_cryptodev_pmd_virtual_dev_init@DPDK_16.04 16.04
- rte_cryptodev_queue_pair_count@DPDK_16.04 16.04
- rte_cryptodev_queue_pair_setup@DPDK_16.04 16.04
- rte_cryptodev_queue_pair_start@DPDK_16.04 16.04
- rte_cryptodev_queue_pair_stop@DPDK_16.04 16.04
- rte_cryptodev_socket_id@DPDK_16.04 16.04
- rte_cryptodev_start@DPDK_16.04 16.04
- rte_cryptodev_stats_get@DPDK_16.04 16.04
- rte_cryptodev_stats_reset@DPDK_16.04 16.04
- rte_cryptodev_stop@DPDK_16.04 16.04
- rte_cryptodev_sym_session_create@DPDK_16.04 16.04
- rte_cryptodev_sym_session_free@DPDK_16.04 16.04
- rte_cryptodevs@DPDK_16.04 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-distributor1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-distributor1.symbols
deleted file mode 100644
index 3218e6a..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-distributor1.symbols
+++ /dev/null
@@ -1,11 +0,0 @@
-librte_distributor.so.1 librte-distributor1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_distributor_clear_returns@DPDK_2.0 16.04
- rte_distributor_create@DPDK_2.0 16.04
- rte_distributor_flush@DPDK_2.0 16.04
- rte_distributor_get_pkt@DPDK_2.0 16.04
- rte_distributor_poll_pkt@DPDK_2.0 16.04
- rte_distributor_process@DPDK_2.0 16.04
- rte_distributor_request_pkt@DPDK_2.0 16.04
- rte_distributor_return_pkt@DPDK_2.0 16.04
- rte_distributor_returned_pkts@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-eal2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-eal2.symbols
deleted file mode 100644
index cec59ec..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-eal2.symbols
+++ /dev/null
@@ -1,136 +0,0 @@
-librte_eal.so.2 librte-eal2 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
- DPDK_16.07@DPDK_16.07 16.07~rc1
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.1@DPDK_2.1 16.04
- DPDK_2.2@DPDK_2.2 16.04
- __rte_panic@DPDK_2.0 16.04
- devargs_list@DPDK_2.0 16.04
- eal_parse_sysfs_value@DPDK_2.0 16.04
- eal_timer_source@DPDK_2.0 16.04
- lcore_config@DPDK_2.0 16.04
- pci_device_list@DPDK_2.0 16.04
- pci_driver_list@DPDK_2.0 16.04
- pci_get_sysfs_path@DPDK_16.07 16.07~rc1
- per_lcore__lcore_id@DPDK_2.0 16.04
- per_lcore__rte_errno@DPDK_2.0 16.04
- rte_calloc@DPDK_2.0 16.04
- rte_calloc_socket@DPDK_2.0 16.04
- rte_cpu_check_supported@DPDK_2.0 16.04
- rte_cpu_get_flag_enabled@DPDK_2.0 16.04
- rte_cpu_get_flag_name@DPDK_16.04 16.04
- rte_cycles_vmware_tsc_map@DPDK_2.0 16.04
- rte_delay_us@DPDK_2.0 16.04
- rte_dump_physmem_layout@DPDK_2.0 16.04
- rte_dump_registers@DPDK_2.0 16.04
- rte_dump_stack@DPDK_2.0 16.04
- rte_dump_tailq@DPDK_2.0 16.04
- rte_eal_alarm_cancel@DPDK_2.0 16.04
- rte_eal_alarm_set@DPDK_2.0 16.04
- rte_eal_dev_init@DPDK_2.0 16.04
- rte_eal_devargs_add@DPDK_2.0 16.04
- rte_eal_devargs_dump@DPDK_2.0 16.04
- rte_eal_devargs_type_count@DPDK_2.0 16.04
- rte_eal_driver_register@DPDK_2.0 16.04
- rte_eal_driver_unregister@DPDK_2.0 16.04
- rte_eal_get_configuration@DPDK_2.0 16.04
- rte_eal_get_lcore_state@DPDK_2.0 16.04
- rte_eal_get_physmem_layout@DPDK_2.0 16.04
- rte_eal_get_physmem_size@DPDK_2.0 16.04
- rte_eal_has_hugepages@DPDK_2.0 16.04
- rte_eal_init@DPDK_2.0 16.04
- rte_eal_iopl_init@DPDK_2.0 16.04
- rte_eal_lcore_role@DPDK_2.0 16.04
- rte_eal_mp_remote_launch@DPDK_2.0 16.04
- rte_eal_mp_wait_lcore@DPDK_2.0 16.04
- rte_eal_parse_devargs_str@DPDK_2.0 16.04
- rte_eal_pci_detach@DPDK_2.1 16.04
- rte_eal_pci_dump@DPDK_2.0 16.04
- rte_eal_pci_ioport_map@DPDK_16.04 16.04
- rte_eal_pci_ioport_read@DPDK_16.04 16.04
- rte_eal_pci_ioport_unmap@DPDK_16.04 16.04
- rte_eal_pci_ioport_write@DPDK_16.04 16.04
- rte_eal_pci_map_device@DPDK_16.04 16.04
- rte_eal_pci_probe@DPDK_2.0 16.04
- rte_eal_pci_probe_one@DPDK_2.0 16.04
- rte_eal_pci_read_config@DPDK_2.1 16.04
- rte_eal_pci_register@DPDK_2.0 16.04
- rte_eal_pci_scan@DPDK_2.0 16.04
- rte_eal_pci_unmap_device@DPDK_16.04 16.04
- rte_eal_pci_unregister@DPDK_2.0 16.04
- rte_eal_pci_write_config@DPDK_2.1 16.04
- rte_eal_primary_proc_alive@DPDK_16.04 16.04
- rte_eal_process_type@DPDK_2.0 16.04
- rte_eal_remote_launch@DPDK_2.0 16.04
- rte_eal_tailq_lookup@DPDK_2.0 16.04
- rte_eal_tailq_register@DPDK_2.0 16.04
- rte_eal_vdev_init@DPDK_2.0 16.04
- rte_eal_vdev_uninit@DPDK_2.0 16.04
- rte_eal_wait_lcore@DPDK_2.0 16.04
- rte_epoll_ctl@DPDK_2.1 16.04
- rte_epoll_wait@DPDK_2.1 16.04
- rte_exit@DPDK_2.0 16.04
- rte_free@DPDK_2.0 16.04
- rte_get_log_level@DPDK_2.0 16.04
- rte_get_log_type@DPDK_2.0 16.04
- rte_get_tsc_hz@DPDK_2.0 16.04
- rte_hexdump@DPDK_2.0 16.04
- rte_intr_allow_others@DPDK_2.1 16.04
- rte_intr_callback_register@DPDK_2.0 16.04
- rte_intr_callback_unregister@DPDK_2.0 16.04
- rte_intr_cap_multiple@DPDK_2.2 16.04
- rte_intr_disable@DPDK_2.0 16.04
- rte_intr_dp_is_en@DPDK_2.1 16.04
- rte_intr_efd_disable@DPDK_2.1 16.04
- rte_intr_efd_enable@DPDK_2.1 16.04
- rte_intr_enable@DPDK_2.0 16.04
- rte_intr_rx_ctl@DPDK_2.1 16.04
- rte_intr_tls_epfd@DPDK_2.1 16.04
- rte_keepalive_create@DPDK_2.2 16.04
- rte_keepalive_dispatch_pings@DPDK_2.2 16.04
- rte_keepalive_mark_alive@DPDK_2.2 16.04
- rte_keepalive_mark_sleep@DPDK_16.07 16.07~rc1
- rte_keepalive_register_core@DPDK_2.2 16.04
- rte_keepalive_register_relay_callback@DPDK_16.07 16.07~rc1
- rte_log@DPDK_2.0 16.04
- rte_log_add_in_history@DPDK_2.0 16.04
- rte_log_cur_msg_loglevel@DPDK_2.0 16.04
- rte_log_cur_msg_logtype@DPDK_2.0 16.04
- rte_log_dump_history@DPDK_2.0 16.04
- rte_log_set_history@DPDK_2.0 16.04
- rte_logs@DPDK_2.0 16.04
- rte_malloc@DPDK_2.0 16.04
- rte_malloc_dump_stats@DPDK_2.0 16.04
- rte_malloc_get_socket_stats@DPDK_2.0 16.04
- rte_malloc_set_limit@DPDK_2.0 16.04
- rte_malloc_socket@DPDK_2.0 16.04
- rte_malloc_validate@DPDK_2.0 16.04
- rte_malloc_virt2phy@DPDK_2.0 16.04
- rte_mem_lock_page@DPDK_2.0 16.04
- rte_mem_virt2phy@DPDK_2.0 16.04
- rte_memdump@DPDK_2.0 16.04
- rte_memory_get_nchannel@DPDK_2.0 16.04
- rte_memory_get_nrank@DPDK_2.0 16.04
- rte_memzone_dump@DPDK_2.0 16.04
- rte_memzone_free@DPDK_2.1 16.04
- rte_memzone_lookup@DPDK_2.0 16.04
- rte_memzone_reserve@DPDK_2.0 16.04
- rte_memzone_reserve_aligned@DPDK_2.0 16.04
- rte_memzone_reserve_bounded@DPDK_2.0 16.04
- rte_memzone_walk@DPDK_2.0 16.04
- rte_openlog_stream@DPDK_2.0 16.04
- rte_realloc@DPDK_2.0 16.04
- (arch=!arm64)rte_rtm_supported@DPDK_16.07 16.07~rc3
- rte_set_application_usage_hook@DPDK_2.0 16.04
- rte_set_log_level@DPDK_2.0 16.04
- rte_set_log_type@DPDK_2.0 16.04
- rte_socket_id@DPDK_2.0 16.04
- rte_strerror@DPDK_2.0 16.04
- rte_strsplit@DPDK_2.0 16.04
- rte_sys_gettid@DPDK_2.0 16.04
- rte_thread_get_affinity@DPDK_2.0 16.04
- rte_thread_set_affinity@DPDK_2.0 16.04
- rte_thread_setname@DPDK_16.07 16.07~rc1
- rte_vlog@DPDK_2.0 16.04
- rte_zmalloc@DPDK_2.0 16.04
- rte_zmalloc_socket@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-hash2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-hash2.symbols
deleted file mode 100644
index d01da79..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-hash2.symbols
+++ /dev/null
@@ -1,28 +0,0 @@
-librte_hash.so.2 librte-hash2 #MINVER#
- DPDK_16.07@DPDK_16.07 16.07~rc3
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.1@DPDK_2.1 16.04
- DPDK_2.2@DPDK_2.2 16.04
- rte_fbk_hash_create@DPDK_2.0 16.04
- rte_fbk_hash_find_existing@DPDK_2.0 16.04
- rte_fbk_hash_free@DPDK_2.0 16.04
- rte_hash_add_key@DPDK_2.0 16.04
- rte_hash_add_key_data@DPDK_2.1 16.04
- rte_hash_add_key_with_hash@DPDK_2.0 16.04
- rte_hash_add_key_with_hash_data@DPDK_2.1 16.04
- rte_hash_create@DPDK_2.0 16.04
- rte_hash_del_key@DPDK_2.0 16.04
- rte_hash_del_key_with_hash@DPDK_2.0 16.04
- rte_hash_find_existing@DPDK_2.0 16.04
- rte_hash_free@DPDK_2.0 16.04
- rte_hash_get_key_with_position@DPDK_16.07 16.07~rc3
- rte_hash_hash@DPDK_2.0 16.04
- rte_hash_iterate@DPDK_2.1 16.04
- rte_hash_lookup@DPDK_2.0 16.04
- rte_hash_lookup_bulk@DPDK_2.0 16.04
- rte_hash_lookup_bulk_data@DPDK_2.1 16.04
- rte_hash_lookup_data@DPDK_2.1 16.04
- rte_hash_lookup_with_hash@DPDK_2.0 16.04
- rte_hash_lookup_with_hash_data@DPDK_2.1 16.04
- rte_hash_reset@DPDK_2.1 16.04
- rte_hash_set_cmp_func@DPDK_2.2 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-ip-frag1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-ip-frag1.symbols
deleted file mode 100644
index b210026..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-ip-frag1.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-librte_ip_frag.so.1 librte-ip-frag1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_ip_frag_free_death_row@DPDK_2.0 16.04
- rte_ip_frag_table_create@DPDK_2.0 16.04
- rte_ip_frag_table_statistics_dump@DPDK_2.0 16.04
- rte_ipv4_frag_reassemble_packet@DPDK_2.0 16.04
- rte_ipv4_fragment_packet@DPDK_2.0 16.04
- rte_ipv6_frag_reassemble_packet@DPDK_2.0 16.04
- rte_ipv6_fragment_packet@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-jobstats1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-jobstats1.symbols
deleted file mode 100644
index 6eecd0b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-jobstats1.symbols
+++ /dev/null
@@ -1,17 +0,0 @@
-librte_jobstats.so.1 librte-jobstats1 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
- DPDK_2.0@DPDK_2.0 16.04
- rte_jobstats_abort@DPDK_16.04 16.04
- rte_jobstats_context_finish@DPDK_2.0 16.04
- rte_jobstats_context_init@DPDK_2.0 16.04
- rte_jobstats_context_reset@DPDK_2.0 16.04
- rte_jobstats_context_start@DPDK_2.0 16.04
- rte_jobstats_finish@DPDK_2.0 16.04
- rte_jobstats_init@DPDK_2.0 16.04
- rte_jobstats_reset@DPDK_2.0 16.04
- rte_jobstats_set_max@DPDK_2.0 16.04
- rte_jobstats_set_min@DPDK_2.0 16.04
- rte_jobstats_set_period@DPDK_2.0 16.04
- rte_jobstats_set_target@DPDK_2.0 16.04
- rte_jobstats_set_update_period_function@DPDK_2.0 16.04
- rte_jobstats_start@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-kni2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-kni2.symbols
deleted file mode 100644
index c76cd8e..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-kni2.symbols
+++ /dev/null
@@ -1,13 +0,0 @@
-librte_kni.so.2 librte-kni2 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_kni_alloc@DPDK_2.0 16.04
- rte_kni_close@DPDK_2.0 16.04
- rte_kni_get@DPDK_2.0 16.04
- rte_kni_get_name@DPDK_2.0 16.04
- rte_kni_handle_request@DPDK_2.0 16.04
- rte_kni_init@DPDK_2.0 16.04
- rte_kni_register_handlers@DPDK_2.0 16.04
- rte_kni_release@DPDK_2.0 16.04
- rte_kni_rx_burst@DPDK_2.0 16.04
- rte_kni_tx_burst@DPDK_2.0 16.04
- rte_kni_unregister_handlers@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-kvargs1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-kvargs1.symbols
deleted file mode 100644
index 18175a7..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-kvargs1.symbols
+++ /dev/null
@@ -1,6 +0,0 @@
-librte_kvargs.so.1 librte-kvargs1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_kvargs_count@DPDK_2.0 16.04
- rte_kvargs_free@DPDK_2.0 16.04
- rte_kvargs_parse@DPDK_2.0 16.04
- rte_kvargs_process@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-lpm2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-lpm2.symbols
deleted file mode 100644
index 30a2e18..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-lpm2.symbols
+++ /dev/null
@@ -1,27 +0,0 @@
-librte_lpm.so.2 librte-lpm2 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
- DPDK_2.0@DPDK_2.0 16.04
- rte_lpm6_add@DPDK_2.0 16.04
- rte_lpm6_create@DPDK_2.0 16.04
- rte_lpm6_delete@DPDK_2.0 16.04
- rte_lpm6_delete_all@DPDK_2.0 16.04
- rte_lpm6_delete_bulk_func@DPDK_2.0 16.04
- rte_lpm6_find_existing@DPDK_2.0 16.04
- rte_lpm6_free@DPDK_2.0 16.04
- rte_lpm6_is_rule_present@DPDK_2.0 16.04
- rte_lpm6_lookup@DPDK_2.0 16.04
- rte_lpm6_lookup_bulk_func@DPDK_2.0 16.04
- rte_lpm_add@DPDK_16.04 16.04
- rte_lpm_add@DPDK_2.0 16.04
- rte_lpm_create@DPDK_16.04 16.04
- rte_lpm_create@DPDK_2.0 16.04
- rte_lpm_delete@DPDK_16.04 16.04
- rte_lpm_delete@DPDK_2.0 16.04
- rte_lpm_delete_all@DPDK_16.04 16.04
- rte_lpm_delete_all@DPDK_2.0 16.04
- rte_lpm_find_existing@DPDK_16.04 16.04
- rte_lpm_find_existing@DPDK_2.0 16.04
- rte_lpm_free@DPDK_16.04 16.04
- rte_lpm_free@DPDK_2.0 16.04
- rte_lpm_is_rule_present@DPDK_16.04 16.04
- rte_lpm_is_rule_present@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-mbuf2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-mbuf2.symbols
deleted file mode 100644
index 3a380ff..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-mbuf2.symbols
+++ /dev/null
@@ -1,11 +0,0 @@
-librte_mbuf.so.2 librte-mbuf2 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.1@DPDK_2.1 16.04
- rte_ctrlmbuf_init@DPDK_2.0 16.04
- rte_get_rx_ol_flag_name@DPDK_2.0 16.04
- rte_get_tx_ol_flag_name@DPDK_2.0 16.04
- rte_mbuf_sanity_check@DPDK_2.0 16.04
- rte_pktmbuf_dump@DPDK_2.0 16.04
- rte_pktmbuf_init@DPDK_2.0 16.04
- rte_pktmbuf_pool_create@DPDK_2.1 16.04
- rte_pktmbuf_pool_init@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-mempool2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-mempool2.symbols
deleted file mode 100644
index a70fcc3..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-mempool2.symbols
+++ /dev/null
@@ -1,31 +0,0 @@
-librte_mempool.so.2 librte-mempool2 #MINVER#
- DPDK_16.07@DPDK_16.07 16.07~rc1
- DPDK_2.0@DPDK_2.0 16.07~rc1
- rte_mempool_audit@DPDK_2.0 16.07~rc1
- rte_mempool_avail_count@DPDK_16.07 16.07~rc1
- rte_mempool_cache_create@DPDK_16.07 16.07~rc1
- rte_mempool_cache_free@DPDK_16.07 16.07~rc1
- rte_mempool_calc_obj_size@DPDK_2.0 16.07~rc1
- rte_mempool_check_cookies@DPDK_16.07 16.07~rc1
- rte_mempool_count@DPDK_2.0 16.07~rc1
- rte_mempool_create@DPDK_2.0 16.07~rc1
- rte_mempool_create_empty@DPDK_16.07 16.07~rc1
- rte_mempool_dump@DPDK_2.0 16.07~rc1
- rte_mempool_free@DPDK_16.07 16.07~rc1
- rte_mempool_in_use_count@DPDK_16.07 16.07~rc1
- rte_mempool_list_dump@DPDK_2.0 16.07~rc1
- rte_mempool_lookup@DPDK_2.0 16.07~rc1
- rte_mempool_mem_iter@DPDK_16.07 16.07~rc1
- rte_mempool_obj_iter@DPDK_16.07 16.07~rc1
- rte_mempool_ops_table@DPDK_16.07 16.07~rc1
- rte_mempool_populate_anon@DPDK_16.07 16.07~rc1
- rte_mempool_populate_default@DPDK_16.07 16.07~rc1
- rte_mempool_populate_phys@DPDK_16.07 16.07~rc1
- rte_mempool_populate_phys_tab@DPDK_16.07 16.07~rc1
- rte_mempool_populate_virt@DPDK_16.07 16.07~rc1
- rte_mempool_register_ops@DPDK_16.07 16.07~rc1
- rte_mempool_set_ops_byname@DPDK_16.07 16.07~rc1
- rte_mempool_walk@DPDK_2.0 16.07~rc1
- rte_mempool_xmem_create@DPDK_2.0 16.07~rc1
- rte_mempool_xmem_size@DPDK_2.0 16.07~rc1
- rte_mempool_xmem_usage@DPDK_2.0 16.07~rc1
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-meter1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-meter1.symbols
deleted file mode 100644
index c598c8d..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-meter1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_meter.so.1 librte-meter1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_meter_srtcm_config@DPDK_2.0 16.04
- rte_meter_trtcm_config@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pdump1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pdump1.symbols
deleted file mode 100644
index 9132910..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pdump1.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-librte_pdump.so.1 librte-pdump1 #MINVER#
- DPDK_16.07@DPDK_16.07 16.07~rc1
- rte_pdump_disable@DPDK_16.07 16.07~rc1
- rte_pdump_disable_by_deviceid@DPDK_16.07 16.07~rc1
- rte_pdump_enable@DPDK_16.07 16.07~rc1
- rte_pdump_enable_by_deviceid@DPDK_16.07 16.07~rc1
- rte_pdump_init@DPDK_16.07 16.07~rc1
- rte_pdump_set_socket_dir@DPDK_16.07 16.07~rc1
- rte_pdump_uninit@DPDK_16.07 16.07~rc1
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pipeline3.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pipeline3.symbols
deleted file mode 100644
index 5801c09..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pipeline3.symbols
+++ /dev/null
@@ -1,28 +0,0 @@
-librte_pipeline.so.3 librte-pipeline3 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.1@DPDK_2.1 16.04
- DPDK_2.2@DPDK_2.2 16.04
- rte_pipeline_ah_packet_drop@DPDK_16.04 16.04
- rte_pipeline_ah_packet_hijack@DPDK_16.04 16.04
- rte_pipeline_check@DPDK_2.0 16.04
- rte_pipeline_create@DPDK_2.0 16.04
- rte_pipeline_flush@DPDK_2.0 16.04
- rte_pipeline_free@DPDK_2.0 16.04
- rte_pipeline_port_in_connect_to_table@DPDK_2.0 16.04
- rte_pipeline_port_in_create@DPDK_2.0 16.04
- rte_pipeline_port_in_disable@DPDK_2.0 16.04
- rte_pipeline_port_in_enable@DPDK_2.0 16.04
- rte_pipeline_port_in_stats_read@DPDK_2.1 16.04
- rte_pipeline_port_out_create@DPDK_2.0 16.04
- rte_pipeline_port_out_packet_insert@DPDK_2.0 16.04
- rte_pipeline_port_out_stats_read@DPDK_2.1 16.04
- rte_pipeline_run@DPDK_2.0 16.04
- rte_pipeline_table_create@DPDK_2.0 16.04
- rte_pipeline_table_default_entry_add@DPDK_2.0 16.04
- rte_pipeline_table_default_entry_delete@DPDK_2.0 16.04
- rte_pipeline_table_entry_add@DPDK_2.0 16.04
- rte_pipeline_table_entry_add_bulk@DPDK_2.2 16.04
- rte_pipeline_table_entry_delete@DPDK_2.0 16.04
- rte_pipeline_table_entry_delete_bulk@DPDK_2.2 16.04
- rte_pipeline_table_stats_read@DPDK_2.1 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-af-packet1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-af-packet1.symbols
deleted file mode 100644
index 699357b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-af-packet1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_af_packet.so.1 librte-pmd-af-packet1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bnxt1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bnxt1.symbols
deleted file mode 100644
index acb47d6..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bnxt1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_bnxt.so.1 librte-pmd-bnxt1 #MINVER#
- DPDK_16.04@DPDK_16.04 16.07~rc3
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bond1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bond1.symbols
deleted file mode 100644
index cd8cf13..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-bond1.symbols
+++ /dev/null
@@ -1,29 +0,0 @@
-librte_pmd_bond.so.1 librte-pmd-bond1 #MINVER#
- DPDK_16.04@DPDK_16.04 16.07~rc1
- DPDK_16.07@DPDK_16.07 16.07~rc1
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.1@DPDK_2.1 16.04
- rte_eth_bond_8023ad_conf_get@DPDK_2.0 16.04
- rte_eth_bond_8023ad_setup@DPDK_2.0 16.04
- rte_eth_bond_8023ad_conf_get@DPDK_16.07 16.07~rc1
- rte_eth_bond_8023ad_ext_collect@DPDK_16.07 16.07~rc1
- rte_eth_bond_8023ad_ext_collect_get@DPDK_16.07 16.07~rc1
- rte_eth_bond_8023ad_ext_distrib@DPDK_16.07 16.07~rc1
- rte_eth_bond_8023ad_ext_distrib_get@DPDK_16.07 16.07~rc1
- rte_eth_bond_8023ad_ext_slowtx@DPDK_16.07 16.07~rc1
- rte_eth_bond_8023ad_setup@DPDK_16.07 16.07~rc1
- rte_eth_bond_active_slaves_get@DPDK_2.0 16.04
- rte_eth_bond_create@DPDK_2.0 16.04
- rte_eth_bond_free@DPDK_2.1 16.04
- rte_eth_bond_link_monitoring_set@DPDK_2.0 16.04
- rte_eth_bond_mac_address_reset@DPDK_2.0 16.04
- rte_eth_bond_mac_address_set@DPDK_2.0 16.04
- rte_eth_bond_mode_get@DPDK_2.0 16.04
- rte_eth_bond_mode_set@DPDK_2.0 16.04
- rte_eth_bond_primary_get@DPDK_2.0 16.04
- rte_eth_bond_primary_set@DPDK_2.0 16.04
- rte_eth_bond_slave_add@DPDK_2.0 16.04
- rte_eth_bond_slave_remove@DPDK_2.0 16.04
- rte_eth_bond_slaves_get@DPDK_2.0 16.04
- rte_eth_bond_xmit_policy_get@DPDK_2.0 16.04
- rte_eth_bond_xmit_policy_set@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-cxgbe1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-cxgbe1.symbols
deleted file mode 100644
index 9c9c059..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-cxgbe1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_cxgbe.so.1 librte-pmd-cxgbe1 #MINVER#
- DPDK_2.1@DPDK_2.1 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-e1000-1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-e1000-1.symbols
deleted file mode 100644
index 9ee7d4f..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-e1000-1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_e1000.so.1 librte-pmd-e1000-1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ena1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ena1.symbols
deleted file mode 100644
index 03ea178..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ena1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_ena.so.1 librte-pmd-ena1 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-enic1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-enic1.symbols
deleted file mode 100644
index e5150e9..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-enic1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_enic.so.1 librte-pmd-enic1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-fm10k1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-fm10k1.symbols
deleted file mode 100644
index f9b8fa7..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-fm10k1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_fm10k.so.1 librte-pmd-fm10k1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-i40e1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-i40e1.symbols
deleted file mode 100644
index cd4239a..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-i40e1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_i40e.so.1 librte-pmd-i40e1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ixgbe1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ixgbe1.symbols
deleted file mode 100644
index 13b0f1e..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ixgbe1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_ixgbe.so.1 librte-pmd-ixgbe1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null-crypto1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null-crypto1.symbols
deleted file mode 100644
index b480eba..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null-crypto1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_null_crypto.so.1 librte-pmd-null-crypto1 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null1.symbols
deleted file mode 100644
index c55b0f7..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-null1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_null.so.1 librte-pmd-null1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.2@DPDK_2.2 16.04
- eth_dev_null_create@DPDK_2.2 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-pcap1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-pcap1.symbols
deleted file mode 100644
index 326b7c0..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-pcap1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_pcap.so.1 librte-pmd-pcap1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ring2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ring2.symbols
deleted file mode 100644
index f0235fa..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-ring2.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-librte_pmd_ring.so.2 librte-pmd-ring2 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.2@DPDK_2.2 16.04
- rte_eth_from_ring@DPDK_2.2 16.04
- rte_eth_from_rings@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vhost1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vhost1.symbols
deleted file mode 100644
index 6b26396..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vhost1.symbols
+++ /dev/null
@@ -1,6 +0,0 @@
-librte_pmd_vhost.so.1 librte-pmd-vhost1 #MINVER#
- DPDK_16.04@DPDK_16.04 16.04
- rte_eth_vhost_feature_disable@DPDK_16.04 16.04
- rte_eth_vhost_feature_enable@DPDK_16.04 16.04
- rte_eth_vhost_feature_get@DPDK_16.04 16.04
- rte_eth_vhost_get_queue_event@DPDK_16.04 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-virtio1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-virtio1.symbols
deleted file mode 100644
index a3ddb8b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-virtio1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_virtio.so.1 librte-pmd-virtio1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vmxnet3-uio1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vmxnet3-uio1.symbols
deleted file mode 100644
index d12a79f..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-vmxnet3-uio1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-librte_pmd_vmxnet3_uio.so.1 librte-pmd-vmxnet3-uio1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
-# INFO: this library exports no symbols, essentially it is a driver that
-# registers itself on load and is then only driven by callbacks.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-xenvirt1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-xenvirt1.symbols
deleted file mode 100644
index 6bdf42a..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-pmd-xenvirt1.symbols
+++ /dev/null
@@ -1,3 +0,0 @@
-librte_pmd_xenvirt.so.1 librte-pmd-xenvirt1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_mempool_gntalloc_create@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-port3.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-port3.symbols
deleted file mode 100644
index e41b301..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-port3.symbols
+++ /dev/null
@@ -1,25 +0,0 @@
-librte_port.so.3 librte-port3 #MINVER#
- DPDK_16.07@DPDK_16.07 16.07~rc1
- DPDK_2.0@DPDK_2.0 16.07~rc1
- DPDK_2.1@DPDK_2.1 16.07~rc1
- DPDK_2.2@DPDK_2.2 16.07~rc1
- rte_port_ethdev_reader_ops@DPDK_2.0 16.07~rc1
- rte_port_ethdev_writer_nodrop_ops@DPDK_2.1 16.07~rc1
- rte_port_ethdev_writer_ops@DPDK_2.0 16.07~rc1
- (arch=!i386)rte_port_kni_reader_ops@DPDK_16.07 16.07~rc1
- (arch=!i386)rte_port_kni_writer_nodrop_ops@DPDK_16.07 16.07~rc1
- (arch=!i386)rte_port_kni_writer_ops@DPDK_16.07 16.07~rc1
- rte_port_ring_multi_reader_ops@DPDK_2.2 16.07~rc1
- rte_port_ring_multi_writer_nodrop_ops@DPDK_2.2 16.07~rc1
- rte_port_ring_multi_writer_ops@DPDK_2.2 16.07~rc1
- rte_port_ring_reader_ipv4_frag_ops@DPDK_2.0 16.07~rc1
- rte_port_ring_reader_ipv6_frag_ops@DPDK_2.1 16.07~rc1
- rte_port_ring_reader_ops@DPDK_2.0 16.07~rc1
- rte_port_ring_writer_ipv4_ras_ops@DPDK_2.0 16.07~rc1
- rte_port_ring_writer_ipv6_ras_ops@DPDK_2.1 16.07~rc1
- rte_port_ring_writer_nodrop_ops@DPDK_2.1 16.07~rc1
- rte_port_ring_writer_ops@DPDK_2.0 16.07~rc1
- rte_port_sched_reader_ops@DPDK_2.0 16.07~rc1
- rte_port_sched_writer_ops@DPDK_2.0 16.07~rc1
- rte_port_sink_ops@DPDK_2.0 16.07~rc1
- rte_port_source_ops@DPDK_2.0 16.07~rc1
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-power1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-power1.symbols
deleted file mode 100644
index ca6e862..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-power1.symbols
+++ /dev/null
@@ -1,14 +0,0 @@
-librte_power.so.1 librte-power1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_power_exit@DPDK_2.0 16.04
- rte_power_freq_down@DPDK_2.0 16.04
- rte_power_freq_max@DPDK_2.0 16.04
- rte_power_freq_min@DPDK_2.0 16.04
- rte_power_freq_up@DPDK_2.0 16.04
- rte_power_freqs@DPDK_2.0 16.04
- rte_power_get_env@DPDK_2.0 16.04
- rte_power_get_freq@DPDK_2.0 16.04
- rte_power_init@DPDK_2.0 16.04
- rte_power_set_env@DPDK_2.0 16.04
- rte_power_set_freq@DPDK_2.0 16.04
- rte_power_unset_env@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-reorder1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-reorder1.symbols
deleted file mode 100644
index d70169b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-reorder1.symbols
+++ /dev/null
@@ -1,9 +0,0 @@
-librte_reorder.so.1 librte-reorder1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_reorder_create@DPDK_2.0 16.04
- rte_reorder_drain@DPDK_2.0 16.04
- rte_reorder_find_existing@DPDK_2.0 16.04
- rte_reorder_free@DPDK_2.0 16.04
- rte_reorder_init@DPDK_2.0 16.04
- rte_reorder_insert@DPDK_2.0 16.04
- rte_reorder_reset@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-ring1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-ring1.symbols
deleted file mode 100644
index 8f4c574..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-ring1.symbols
+++ /dev/null
@@ -1,11 +0,0 @@
-librte_ring.so.1 librte-ring1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.2@DPDK_2.2 16.04
- rte_ring_create@DPDK_2.0 16.04
- rte_ring_dump@DPDK_2.0 16.04
- rte_ring_free@DPDK_2.2 16.04
- rte_ring_get_memsize@DPDK_2.0 16.04
- rte_ring_init@DPDK_2.0 16.04
- rte_ring_list_dump@DPDK_2.0 16.04
- rte_ring_lookup@DPDK_2.0 16.04
- rte_ring_set_water_mark@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-sched1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-sched1.symbols
deleted file mode 100644
index e74aa3d..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-sched1.symbols
+++ /dev/null
@@ -1,22 +0,0 @@
-librte_sched.so.1 librte-sched1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.1@DPDK_2.1 16.04
- rte_approx@DPDK_2.0 16.04
- rte_red_config_init@DPDK_2.0 16.04
- rte_red_log2_1_minus_Wq@DPDK_2.0 16.04
- rte_red_pow2_frac_inv@DPDK_2.0 16.04
- rte_red_rand_seed@DPDK_2.0 16.04
- rte_red_rand_val@DPDK_2.0 16.04
- rte_red_rt_data_init@DPDK_2.0 16.04
- rte_sched_pipe_config@DPDK_2.0 16.04
- rte_sched_port_config@DPDK_2.0 16.04
- rte_sched_port_dequeue@DPDK_2.0 16.04
- rte_sched_port_enqueue@DPDK_2.0 16.04
- rte_sched_port_free@DPDK_2.0 16.04
- rte_sched_port_get_memory_footprint@DPDK_2.0 16.04
- rte_sched_port_pkt_read_color@DPDK_2.1 16.04
- rte_sched_port_pkt_read_tree_path@DPDK_2.1 16.04
- rte_sched_port_pkt_write@DPDK_2.1 16.04
- rte_sched_queue_read_stats@DPDK_2.0 16.04
- rte_sched_subport_config@DPDK_2.0 16.04
- rte_sched_subport_read_stats@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-table2.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-table2.symbols
deleted file mode 100644
index d3e10b7..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-table2.symbols
+++ /dev/null
@@ -1,19 +0,0 @@
-librte_table.so.2 librte-table2 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- DPDK_2.2@DPDK_2.2 16.04
- rte_table_acl_ops@DPDK_2.0 16.04
- rte_table_array_ops@DPDK_2.0 16.04
- rte_table_hash_ext_ops@DPDK_2.0 16.04
- rte_table_hash_key16_ext_dosig_ops@DPDK_2.2 16.04
- rte_table_hash_key16_ext_ops@DPDK_2.0 16.04
- rte_table_hash_key16_lru_ops@DPDK_2.0 16.04
- rte_table_hash_key32_ext_ops@DPDK_2.0 16.04
- rte_table_hash_key32_lru_ops@DPDK_2.0 16.04
- rte_table_hash_key8_ext_dosig_ops@DPDK_2.0 16.04
- rte_table_hash_key8_ext_ops@DPDK_2.0 16.04
- rte_table_hash_key8_lru_dosig_ops@DPDK_2.0 16.04
- rte_table_hash_key8_lru_ops@DPDK_2.0 16.04
- rte_table_hash_lru_ops@DPDK_2.0 16.04
- rte_table_lpm_ipv6_ops@DPDK_2.0 16.04
- rte_table_lpm_ops@DPDK_2.0 16.04
- rte_table_stub_ops@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-timer1.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-timer1.symbols
deleted file mode 100644
index 0ac8261..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-timer1.symbols
+++ /dev/null
@@ -1,11 +0,0 @@
-librte_timer.so.1 librte-timer1 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
- rte_timer_dump_stats@DPDK_2.0 16.04
- rte_timer_init@DPDK_2.0 16.04
- rte_timer_manage@DPDK_2.0 16.04
- rte_timer_pending@DPDK_2.0 16.04
- rte_timer_reset@DPDK_2.0 16.04
- rte_timer_reset_sync@DPDK_2.0 16.04
- rte_timer_stop@DPDK_2.0 16.04
- rte_timer_stop_sync@DPDK_2.0 16.04
- rte_timer_subsystem_init@DPDK_2.0 16.04
diff --git a/ovs_build/dpdk_16.07.fuel/debian/librte-vhost3.symbols b/ovs_build/dpdk_16.07.fuel/debian/librte-vhost3.symbols
deleted file mode 100644
index 7835cf4..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/librte-vhost3.symbols
+++ /dev/null
@@ -1,18 +0,0 @@
-librte_vhost.so.3 librte-vhost3 #MINVER#
- DPDK_16.07@DPDK_16.07 16.07~rc1
- DPDK_2.0@DPDK_2.0 16.07~rc1
- DPDK_2.1@DPDK_2.1 16.07~rc1
- rte_vhost_avail_entries@DPDK_16.07 16.07~rc1
- rte_vhost_dequeue_burst@DPDK_2.0 16.07~rc1
- rte_vhost_driver_callback_register@DPDK_2.0 16.07~rc1
- rte_vhost_driver_register@DPDK_2.0 16.07~rc1
- rte_vhost_driver_session_start@DPDK_2.0 16.07~rc1
- rte_vhost_driver_unregister@DPDK_2.1 16.07~rc1
- rte_vhost_enable_guest_notification@DPDK_2.0 16.07~rc1
- rte_vhost_enqueue_burst@DPDK_2.0 16.07~rc1
- rte_vhost_feature_disable@DPDK_2.0 16.07~rc1
- rte_vhost_feature_enable@DPDK_2.0 16.07~rc1
- rte_vhost_feature_get@DPDK_2.0 16.07~rc1
- rte_vhost_get_ifname@DPDK_16.07 16.07~rc1
- rte_vhost_get_numa_node@DPDK_16.07 16.07~rc1
- rte_vhost_get_queue_num@DPDK_16.07 16.07~rc1
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch
deleted file mode 100644
index 7dfd9dd..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Description: doc: fix old dpdk-nic-bind.py references
-
-dpdk-nic-bind.py script has been renamed to dpdk-devbind.py,
-but some references to the old script have remained.
-This commit completes the renaming.
-
-Fixes: a5d7a3f77ddc ("unify tools naming")
-
-Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
-
-Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15057/
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-08-03
-
-diff --git a/doc/guides/howto/flow_bifurcation.rst b/doc/guides/howto/flow_bifurcation.rst
-index a1c6262..0d7226a 100644
---- a/doc/guides/howto/flow_bifurcation.rst
-+++ b/doc/guides/howto/flow_bifurcation.rst
-@@ -119,8 +119,8 @@ The typical procedure to achieve this is as follows:
-    .. code-block:: console
- 
-        modprobe vfio-pci
--       dpdk_nic_bind.py -b vfio-pci 01:10.0
--       dpdk_nic_bind.py -b vfio-pci 01:10.1
-+       dpdk-devbind.py -b vfio-pci 01:10.0
-+       dpdk-devbind.py -b vfio-pci 01:10.1
- 
- #. Run a DPDK application on the VFs:
- 
-@@ -279,8 +279,8 @@ The typical procedure to achieve this is as follows:
-    .. code-block:: console
- 
-        modprobe vfio-pci
--       dpdk_nic_bind.py -b vfio-pci 01:10.0
--       dpdk_nic_bind.py -b vfio-pci 01:10.1
-+       dpdk-devbind.py -b vfio-pci 01:10.0
-+       dpdk-devbind.py -b vfio-pci 01:10.1
- 
- #. run DPDK application on VFs:
- 
-diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst
-index 49666f1..9bc3450 100644
---- a/doc/guides/howto/lm_bond_virtio_sriov.rst
-+++ b/doc/guides/howto/lm_bond_virtio_sriov.rst
-@@ -613,17 +613,17 @@ Set up DPDK in the Virtual Machine
-    cat  /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
- 
-    ifconfig -a
--   /root/dpdk/tools/dpdk_nic_bind.py --status
-+   /root/dpdk/tools/dpdk-devbind.py --status
- 
-    rmmod virtio-pci ixgbevf
- 
-    modprobe uio
-    insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko
- 
--   /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:03.0
--   /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:04.0
-+   /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:03.0
-+   /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:04.0
- 
--   /root/dpdk/tools/dpdk_nic_bind.py --status
-+   /root/dpdk/tools/dpdk-devbind.py --status
- 
- run_testpmd_bonding_in_vm.sh
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst
-index fad1f2a..4937781 100644
---- a/doc/guides/howto/lm_virtio_vhost_user.rst
-+++ b/doc/guides/howto/lm_virtio_vhost_user.rst
-@@ -91,14 +91,14 @@ For Fortville NIC.
- .. code-block:: console
- 
-    cd /root/dpdk/tools
--   ./dpdk_nic_bind.py -b igb_uio 0000:02:00.0
-+   ./dpdk-devbind.py -b igb_uio 0000:02:00.0
- 
- For Niantic NIC.
- 
- .. code-block:: console
- 
-    cd /root/dpdk/tools
--   ./dpdk_nic_bind.py -b igb_uio 0000:09:00.0
-+   ./dpdk-devbind.py -b igb_uio 0000:09:00.0
- 
- On host_server_1: Terminal 3
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-@@ -172,14 +172,14 @@ For Fortville NIC.
- .. code-block:: console
- 
-    cd /root/dpdk/tools
--   ./dpdk_nic_bind.py -b igb_uio 0000:03:00.0
-+   ./dpdk-devbind.py -b igb_uio 0000:03:00.0
- 
- For Niantic NIC.
- 
- .. code-block:: console
- 
-    cd /root/dpdk/tools
--   ./dpdk_nic_bind.py -b igb_uio 0000:06:00.0
-+   ./dpdk-devbind.py -b igb_uio 0000:06:00.0
- 
- On host_server_2: Terminal 3
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-@@ -444,17 +444,17 @@ setup_dpdk_virtio_in_vm.sh
-    cat  /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
- 
-    ifconfig -a
--   /root/dpdk/tools/dpdk_nic_bind.py --status
-+   /root/dpdk/tools/dpdk-devbind.py --status
- 
-    rmmod virtio-pci
- 
-    modprobe uio
-    insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko
- 
--   /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:03.0
--   /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:04.0
-+   /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:03.0
-+   /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:04.0
- 
--   /root/dpdk/tools/dpdk_nic_bind.py --status
-+   /root/dpdk/tools/dpdk-devbind.py --status
- 
- run_testpmd_in_vm.sh
- ~~~~~~~~~~~~~~~~~~~~
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch
deleted file mode 100644
index af26be8..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
-Date: Wed, 21 Sep 2016 13:56:31 +0530
-Subject: [PATCH] examples: fix ip_pipeline to load PMD driver correctly
-
-There is typo in init.c of ip_pipeline example due to which,
-invalid file path is added to -d option of EAL i.e path starting
-with =.
-
-*Update*
-There was a follow on issue identified that is now folded into this patch to
-keep maintenance simple with just one patch.
-
-Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
-Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
-
-Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15995/
-Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
-Last-update: 2016-10-04
-
----
- examples/ip_pipeline/init.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c
-index cd167f6..27b0aa7 100644
---- a/examples/ip_pipeline/init.c
-+++ b/examples/ip_pipeline/init.c
-@@ -236,7 +236,7 @@ app_init_eal(struct app_params *app)
- 	}
- 
- 	if (p->add_driver) {
--		snprintf(buffer, sizeof(buffer), "-d=%s", p->add_driver);
-+		snprintf(buffer, sizeof(buffer), "-d%s", p->add_driver);
- 		app->eal_argv[n_args++] = strdup(buffer);
- 	}
- 
--- 
-1.9.1
-
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-1-4-doc-move-tool-guides-in-their-own-subdirectory.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-1-4-doc-move-tool-guides-in-their-own-subdirectory.patch
deleted file mode 100644
index a1cc65c..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-1-4-doc-move-tool-guides-in-their-own-subdirectory.patch
+++ /dev/null
@@ -1,528 +0,0 @@
-diff --git a/doc/guides/index.rst b/doc/guides/index.rst
-index 0441859..57570f6 100644
---- a/doc/guides/index.rst
-+++ b/doc/guides/index.rst
-@@ -41,6 +41,7 @@ DPDK documentation
-    nics/index
-    cryptodevs/index
-    sample_app_ug/index
-+   tools/index
-    testpmd_app_ug/index
-    faq/index
-    howto/index
-diff --git a/doc/guides/sample_app_ug/index.rst b/doc/guides/sample_app_ug/index.rst
-index 96bb317..6573452 100644
---- a/doc/guides/sample_app_ug/index.rst
-+++ b/doc/guides/sample_app_ug/index.rst
-@@ -72,11 +72,9 @@ Sample Applications User Guide
-     dist_app
-     vm_power_management
-     tep_termination
--    proc_info
-     ptpclient
-     performance_thread
-     ipsec_secgw
--    pdump
- 
- **Figures**
- 
-diff --git a/doc/guides/sample_app_ug/pdump.rst b/doc/guides/sample_app_ug/pdump.rst
-deleted file mode 100644
-index ac0e7c9..0000000
---- a/doc/guides/sample_app_ug/pdump.rst
-+++ /dev/null
-@@ -1,144 +0,0 @@
--
--..  BSD LICENSE
--    Copyright(c) 2016 Intel Corporation. All rights reserved.
--    All rights reserved.
--
--    Redistribution and use in source and binary forms, with or without
--    modification, are permitted provided that the following conditions
--    are met:
--
--    * Redistributions of source code must retain the above copyright
--    notice, this list of conditions and the following disclaimer.
--    * Redistributions in binary form must reproduce the above copyright
--    notice, this list of conditions and the following disclaimer in
--    the documentation and/or other materials provided with the
--    distribution.
--    * Neither the name of Intel Corporation nor the names of its
--    contributors may be used to endorse or promote products derived
--    from this software without specific prior written permission.
--
--    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
--
--dpdk-pdump Application
--======================
--
--The ``dpdk-pdump`` tool is a Data Plane Development Kit (DPDK) tool that runs as
--a DPDK secondary process and is capable of enabling packet capture on dpdk ports.
--
--   .. Note::
--
--      * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled
--        by default in the build configuration files,
--        owing to an external dependency on the libpcap development files
--        which must be installed on the board.
--        Once the libpcap development files are installed, the libpcap based PMD
--        can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK.
--
--
--Running the Application
-------------------------
--
--The tool has a number of command line options:
--
--.. code-block:: console
--
--   ./build/app/dpdk-pdump --
--                          --pdump '(port=<port id> | device_id=<pci id or vdev name>),
--                                   (queue=<queue_id>),
--                                   (rx-dev=<iface or pcap file> |
--                                    tx-dev=<iface or pcap file>),
--                                   [ring-size=<ring size>],
--                                   [mbuf-size=<mbuf data size>],
--                                   [total-num-mbufs=<number of mbufs>]'
--                          [--server-socket-path=<server socket dir>]
--                          [--client-socket-path=<client socket dir>]
--
--The ``--pdump`` command line option is mandatory and it takes various sub arguments which are described in
--below section.
--
--   .. Note::
--
--      * Parameters inside the parentheses represents mandatory parameters.
--
--      * Parameters inside the square brackets represents optional parameters.
--
--      * Multiple instances of ``--pdump`` can be passed to capture packets on different port and queue combinations.
--
--The ``--server-socket-path`` command line option is optional. This represents the server socket directory.
--If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
--for non root users.
--
--The ``--client-socket-path`` command line option is optional. This represents the client socket directory.
--If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
--for non root users.
--
--
--The ``--pdump`` parameters
--~~~~~~~~~~~~~~~~~~~~~~~~~~
--
--``port``:
--Port id of the eth device on which packets should be captured.
--
--``device_id``:
--PCI address (or) name of the eth device on which packets should be captured.
--
--   .. Note::
--
--      * As of now the ``dpdk-pdump`` tool cannot capture the packets of virtual devices
--        in the primary process due to a bug in the ethdev library. Due to this bug, in a multi process context,
--        when the primary and secondary have different ports set, then the secondary process
--        (here the ``dpdk-pdump`` tool) overwrites the ``rte_eth_devices[]`` entries of the primary process.
--
--``queue``:
--Queue id of the eth device on which packets should be captured. The user can pass a queue value of ``*`` to enable
--packet capture on all queues of the eth device.
--
--``rx-dev``:
--Can be either a pcap file name or any Linux iface.
--
--``tx-dev``:
--Can be either a pcap file name or any Linux iface.
--
--   .. Note::
--
--      * To receive ingress packets only, ``rx-dev`` should be passed.
--
--      * To receive egress packets only, ``tx-dev`` should be passed.
--
--      * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
--        should both be passed with the different file names or the Linux iface names.
--
--      * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
--        should both be passed with the same file names or the the Linux iface names.
--
--``ring-size``:
--Size of the ring. This value is used internally for ring creation. The ring will be used to enqueue the packets from
--the primary application to the secondary. This is an optional parameter with default size 16384.
--
--``mbuf-size``:
--Size of the mbuf data. This is used internally for mempool creation. Ideally this value must be same as
--the primary application's mempool's mbuf data size which is used for packet RX. This is an optional parameter with
--default size 2176.
--
--``total-num-mbufs``:
--Total number mbufs in mempool. This is used internally for mempool creation. This is an optional parameter with default
--value 65535.
--
--
--Example
---------
--
--.. code-block:: console
--
--   $ sudo ./build/app/dpdk-pdump -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap'
-diff --git a/doc/guides/sample_app_ug/proc_info.rst b/doc/guides/sample_app_ug/proc_info.rst
-deleted file mode 100644
-index 73f2195..0000000
---- a/doc/guides/sample_app_ug/proc_info.rst
-+++ /dev/null
-@@ -1,71 +0,0 @@
--
--..  BSD LICENSE
--    Copyright(c) 2015 Intel Corporation. All rights reserved.
--    All rights reserved.
--
--    Redistribution and use in source and binary forms, with or without
--    modification, are permitted provided that the following conditions
--    are met:
--
--    * Redistributions of source code must retain the above copyright
--    notice, this list of conditions and the following disclaimer.
--    * Redistributions in binary form must reproduce the above copyright
--    notice, this list of conditions and the following disclaimer in
--    the documentation and/or other materials provided with the
--    distribution.
--    * Neither the name of Intel Corporation nor the names of its
--    contributors may be used to endorse or promote products derived
--    from this software without specific prior written permission.
--
--    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
--
--dpdk-procinfo Application
--=========================
--
--The dpdk-procinfo application is a Data Plane Development Kit (DPDK) application
--that runs as a DPDK secondary process and is capable of retrieving port
--statistics, resetting port statistics and printing DPDK memory information.
--This application extends the original functionality that was supported by
--dump_cfg.
--
--Running the Application
-------------------------
--The application has a number of command line options:
--
--.. code-block:: console
--
--   ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats |
--   --stats-reset | --xstats-reset]
--
--Parameters
--~~~~~~~~~~
--**-p PORTMASK**: Hexadecimal bitmask of ports to configure.
--
--**--stats**
--The stats parameter controls the printing of generic port statistics. If no
--port mask is specified stats are printed for all DPDK ports.
--
--**--xstats**
--The stats parameter controls the printing of extended port statistics. If no
--port mask is specified xstats are printed for all DPDK ports.
--
--**--stats-reset**
--The stats-reset parameter controls the resetting of generic port statistics. If
--no port mask is specified, the generic stats are reset for all DPDK ports.
--
--**--xstats-reset**
--The xstats-reset parameter controls the resetting of extended port statistics.
--If no port mask is specified xstats are reset for all DPDK ports.
--
--**-m**: Print DPDK memory information.
-diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst
-new file mode 100644
-index 0000000..d7654a2
---- /dev/null
-+++ b/doc/guides/tools/index.rst
-@@ -0,0 +1,40 @@
-+..  BSD LICENSE
-+    Copyright(c) 2016 Canonical Limited. All rights reserved.
-+    All rights reserved.
-+
-+    Redistribution and use in source and binary forms, with or without
-+    modification, are permitted provided that the following conditions
-+    are met:
-+
-+    * Redistributions of source code must retain the above copyright
-+    notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+    notice, this list of conditions and the following disclaimer in
-+    the documentation and/or other materials provided with the
-+    distribution.
-+    * Neither the name of Intel Corporation nor the names of its
-+    contributors may be used to endorse or promote products derived
-+    from this software without specific prior written permission.
-+
-+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+Tool User Guides
-+================
-+
-+.. toctree::
-+    :maxdepth: 2
-+    :numbered:
-+
-+    proc_info
-+    pdump
-+
-diff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst
-new file mode 100644
-index 0000000..ac0e7c9
---- /dev/null
-+++ b/doc/guides/tools/pdump.rst
-@@ -0,0 +1,144 @@
-+
-+..  BSD LICENSE
-+    Copyright(c) 2016 Intel Corporation. All rights reserved.
-+    All rights reserved.
-+
-+    Redistribution and use in source and binary forms, with or without
-+    modification, are permitted provided that the following conditions
-+    are met:
-+
-+    * Redistributions of source code must retain the above copyright
-+    notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+    notice, this list of conditions and the following disclaimer in
-+    the documentation and/or other materials provided with the
-+    distribution.
-+    * Neither the name of Intel Corporation nor the names of its
-+    contributors may be used to endorse or promote products derived
-+    from this software without specific prior written permission.
-+
-+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+
-+dpdk-pdump Application
-+======================
-+
-+The ``dpdk-pdump`` tool is a Data Plane Development Kit (DPDK) tool that runs as
-+a DPDK secondary process and is capable of enabling packet capture on dpdk ports.
-+
-+   .. Note::
-+
-+      * The ``dpdk-pdump`` tool depends on libpcap based PMD which is disabled
-+        by default in the build configuration files,
-+        owing to an external dependency on the libpcap development files
-+        which must be installed on the board.
-+        Once the libpcap development files are installed, the libpcap based PMD
-+        can be enabled by setting CONFIG_RTE_LIBRTE_PMD_PCAP=y and recompiling the DPDK.
-+
-+
-+Running the Application
-+-----------------------
-+
-+The tool has a number of command line options:
-+
-+.. code-block:: console
-+
-+   ./build/app/dpdk-pdump --
-+                          --pdump '(port=<port id> | device_id=<pci id or vdev name>),
-+                                   (queue=<queue_id>),
-+                                   (rx-dev=<iface or pcap file> |
-+                                    tx-dev=<iface or pcap file>),
-+                                   [ring-size=<ring size>],
-+                                   [mbuf-size=<mbuf data size>],
-+                                   [total-num-mbufs=<number of mbufs>]'
-+                          [--server-socket-path=<server socket dir>]
-+                          [--client-socket-path=<client socket dir>]
-+
-+The ``--pdump`` command line option is mandatory and it takes various sub arguments which are described in
-+below section.
-+
-+   .. Note::
-+
-+      * Parameters inside the parentheses represents mandatory parameters.
-+
-+      * Parameters inside the square brackets represents optional parameters.
-+
-+      * Multiple instances of ``--pdump`` can be passed to capture packets on different port and queue combinations.
-+
-+The ``--server-socket-path`` command line option is optional. This represents the server socket directory.
-+If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
-+for non root users.
-+
-+The ``--client-socket-path`` command line option is optional. This represents the client socket directory.
-+If no value is passed default values are used i.e. ``/var/run/.dpdk/`` for root users and ``~/.dpdk/``
-+for non root users.
-+
-+
-+The ``--pdump`` parameters
-+~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+``port``:
-+Port id of the eth device on which packets should be captured.
-+
-+``device_id``:
-+PCI address (or) name of the eth device on which packets should be captured.
-+
-+   .. Note::
-+
-+      * As of now the ``dpdk-pdump`` tool cannot capture the packets of virtual devices
-+        in the primary process due to a bug in the ethdev library. Due to this bug, in a multi process context,
-+        when the primary and secondary have different ports set, then the secondary process
-+        (here the ``dpdk-pdump`` tool) overwrites the ``rte_eth_devices[]`` entries of the primary process.
-+
-+``queue``:
-+Queue id of the eth device on which packets should be captured. The user can pass a queue value of ``*`` to enable
-+packet capture on all queues of the eth device.
-+
-+``rx-dev``:
-+Can be either a pcap file name or any Linux iface.
-+
-+``tx-dev``:
-+Can be either a pcap file name or any Linux iface.
-+
-+   .. Note::
-+
-+      * To receive ingress packets only, ``rx-dev`` should be passed.
-+
-+      * To receive egress packets only, ``tx-dev`` should be passed.
-+
-+      * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
-+        should both be passed with the different file names or the Linux iface names.
-+
-+      * To receive ingress and egress packets separately ``rx-dev`` and ``tx-dev``
-+        should both be passed with the same file names or the the Linux iface names.
-+
-+``ring-size``:
-+Size of the ring. This value is used internally for ring creation. The ring will be used to enqueue the packets from
-+the primary application to the secondary. This is an optional parameter with default size 16384.
-+
-+``mbuf-size``:
-+Size of the mbuf data. This is used internally for mempool creation. Ideally this value must be same as
-+the primary application's mempool's mbuf data size which is used for packet RX. This is an optional parameter with
-+default size 2176.
-+
-+``total-num-mbufs``:
-+Total number mbufs in mempool. This is used internally for mempool creation. This is an optional parameter with default
-+value 65535.
-+
-+
-+Example
-+-------
-+
-+.. code-block:: console
-+
-+   $ sudo ./build/app/dpdk-pdump -- --pdump 'port=0,queue=*,rx-dev=/tmp/rx.pcap'
-diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst
-new file mode 100644
-index 0000000..73f2195
---- /dev/null
-+++ b/doc/guides/tools/proc_info.rst
-@@ -0,0 +1,71 @@
-+
-+..  BSD LICENSE
-+    Copyright(c) 2015 Intel Corporation. All rights reserved.
-+    All rights reserved.
-+
-+    Redistribution and use in source and binary forms, with or without
-+    modification, are permitted provided that the following conditions
-+    are met:
-+
-+    * Redistributions of source code must retain the above copyright
-+    notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+    notice, this list of conditions and the following disclaimer in
-+    the documentation and/or other materials provided with the
-+    distribution.
-+    * Neither the name of Intel Corporation nor the names of its
-+    contributors may be used to endorse or promote products derived
-+    from this software without specific prior written permission.
-+
-+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+
-+dpdk-procinfo Application
-+=========================
-+
-+The dpdk-procinfo application is a Data Plane Development Kit (DPDK) application
-+that runs as a DPDK secondary process and is capable of retrieving port
-+statistics, resetting port statistics and printing DPDK memory information.
-+This application extends the original functionality that was supported by
-+dump_cfg.
-+
-+Running the Application
-+-----------------------
-+The application has a number of command line options:
-+
-+.. code-block:: console
-+
-+   ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats |
-+   --stats-reset | --xstats-reset]
-+
-+Parameters
-+~~~~~~~~~~
-+**-p PORTMASK**: Hexadecimal bitmask of ports to configure.
-+
-+**--stats**
-+The stats parameter controls the printing of generic port statistics. If no
-+port mask is specified stats are printed for all DPDK ports.
-+
-+**--xstats**
-+The stats parameter controls the printing of extended port statistics. If no
-+port mask is specified xstats are printed for all DPDK ports.
-+
-+**--stats-reset**
-+The stats-reset parameter controls the resetting of generic port statistics. If
-+no port mask is specified, the generic stats are reset for all DPDK ports.
-+
-+**--xstats-reset**
-+The xstats-reset parameter controls the resetting of extended port statistics.
-+If no port mask is specified xstats are reset for all DPDK ports.
-+
-+**-m**: Print DPDK memory information.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch
deleted file mode 100644
index f2e307f..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/doc/guides/conf.py b/doc/guides/conf.py
-index cd6a4f7..55b6b2f 100644
---- a/doc/guides/conf.py
-+++ b/doc/guides/conf.py
-@@ -105,6 +105,14 @@ class CustomLatexFormatter(LatexFormatter):
- # Replace the default latex formatter.
- PygmentsBridge.latex_formatter = CustomLatexFormatter
- 
-+# Configuration for man pages
-+man_pages = [("testpmd_app_ug/run_app", "testpmd",
-+              "tests for dpdk pmds", "", 1),
-+             ("tools/pdump", "dpdk-pdump",
-+              "enable packet capture on dpdk ports", "", 1),
-+             ("tools/proc_info", "dpdk-procinfo",
-+              "access dpdk port stats and memory info", "", 1)]
-+
- ######## :numref: fallback ########
- # The following hook functions add some simple handling for the :numref:
- # directive for Sphinx versions prior to 1.3.1. The functions replace the
-diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
-index 9952f25..21d9bdf 100644
---- a/mk/rte.sdkdoc.mk
-+++ b/mk/rte.sdkdoc.mk
-@@ -63,7 +63,7 @@ help:
- all: api-html guides-html guides-pdf
- 
- .PHONY: clean
--clean: api-html-clean guides-html-clean guides-pdf-clean
-+clean: api-html-clean guides-html-clean guides-pdf-clean guides-man-clean
- 
- .PHONY: api-html
- api-html: api-html-clean
-diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
-index 5217063..533d369 100644
---- a/mk/rte.sdkinstall.mk
-+++ b/mk/rte.sdkinstall.mk
-@@ -66,6 +66,7 @@ includedir  ?=      $(prefix)/include/dpdk
- datarootdir ?=      $(prefix)/share
- docdir      ?=       $(datarootdir)/doc/dpdk
- datadir     ?=       $(datarootdir)/dpdk
-+mandir      ?=       $(datarootdir)/man
- sdkdir      ?=                $(datadir)
- targetdir   ?=                $(datadir)/$(RTE_TARGET)
- 
-@@ -133,6 +134,11 @@ install-runtime:
- 	                           $(DESTDIR)$(sbindir)/dpdk-devbind)
- 	$(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/tools/dpdk-pmdinfo.py, \
- 	                           $(DESTDIR)$(bindir)/dpdk-pmdinfo)
-+ifneq ($(wildcard $O/doc/man/*/*.1),)
-+	$(Q)$(call rte_mkdir,     $(DESTDIR)$(mandir))
-+	$(Q)$(call rte_mkdir,     $(DESTDIR)$(mandir)/man1)
-+	$(Q)cp -a $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1
-+endif
- 
- install-kmod:
- ifneq ($(wildcard $O/kmod/*),)
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch
deleted file mode 100644
index ab0f9b4..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/doc/guides/conf.py b/doc/guides/conf.py
-index 55b6b2f..c45c4be 100644
---- a/doc/guides/conf.py
-+++ b/doc/guides/conf.py
-@@ -111,7 +111,9 @@ man_pages = [("testpmd_app_ug/run_app", "testpmd",
-              ("tools/pdump", "dpdk-pdump",
-               "enable packet capture on dpdk ports", "", 1),
-              ("tools/proc_info", "dpdk-procinfo",
--              "access dpdk port stats and memory info", "", 1)]
-+              "access dpdk port stats and memory info", "", 1),
-+             ("tools/pmdinfo", "dpdk-pmdinfo",
-+              "dump a PMDs hardware support info", "", 1)]
- 
- ######## :numref: fallback ########
- # The following hook functions add some simple handling for the :numref:
-diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst
-index d7654a2..80f2115 100644
---- a/doc/guides/tools/index.rst
-+++ b/doc/guides/tools/index.rst
-@@ -37,4 +37,5 @@ Tool User Guides
- 
-     proc_info
-     pdump
-+    pmdinfo
- 
-diff --git a/doc/guides/tools/pmdinfo.rst b/doc/guides/tools/pmdinfo.rst
-new file mode 100644
-index 0000000..a90c59f
---- /dev/null
-+++ b/doc/guides/tools/pmdinfo.rst
-@@ -0,0 +1,57 @@
-+
-+..  BSD LICENSE
-+    Copyright(c) 2016 Canonical Limited. All rights reserved.
-+
-+    Redistribution and use in source and binary forms, with or without
-+    modification, are permitted provided that the following conditions
-+    are met:
-+
-+    * Redistributions of source code must retain the above copyright
-+    notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+    notice, this list of conditions and the following disclaimer in
-+    the documentation and/or other materials provided with the
-+    distribution.
-+    * Neither the name of Intel Corporation nor the names of its
-+    contributors may be used to endorse or promote products derived
-+    from this software without specific prior written permission.
-+
-+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+
-+dpdk-pmdinfo Application
-+========================
-+
-+The ``dpdk-pmdinfo`` tool is a Data Plane Development Kit (DPDK) utility that
-+can dump a PMDs hardware support info.
-+
-+
-+Running the Application
-+-----------------------
-+
-+The tool has a number of command line options:
-+
-+.. code-block:: console
-+
-+
-+   dpdk-pmdinfo [-hrtp] [-d <pci id file] <elf-file>
-+
-+   -h, --help            Show a short help message and exit
-+   -r, --raw             Dump as raw json strings
-+   -d FILE, --pcidb=FILE Specify a pci database to get vendor names from
-+   -t, --table           Output information on hw support as a hex table
-+   -p, --plugindir       Scan dpdk for autoload plugins
-+
-+.. Note::
-+
-+   * Parameters inside the square brackets represents optional parameters.
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch
deleted file mode 100644
index 4b6c18d..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-diff --git a/doc/guides/conf.py b/doc/guides/conf.py
-index c45c4be..149bcdb 100644
---- a/doc/guides/conf.py
-+++ b/doc/guides/conf.py
-@@ -113,7 +113,9 @@ man_pages = [("testpmd_app_ug/run_app", "testpmd",
-              ("tools/proc_info", "dpdk-procinfo",
-               "access dpdk port stats and memory info", "", 1),
-              ("tools/pmdinfo", "dpdk-pmdinfo",
--              "dump a PMDs hardware support info", "", 1)]
-+              "dump a PMDs hardware support info", "", 1),
-+             ("tools/devbind", "dpdk-devbind",
-+              "check device status and bind/unbind them from drivers", "", 8)]
- 
- ######## :numref: fallback ########
- # The following hook functions add some simple handling for the :numref:
-diff --git a/doc/guides/tools/devbind.rst b/doc/guides/tools/devbind.rst
-new file mode 100644
-index 0000000..18a8059
---- /dev/null
-+++ b/doc/guides/tools/devbind.rst
-@@ -0,0 +1,143 @@
-+
-+..  BSD LICENSE
-+    Copyright(c) 2016 Canonical Limited. All rights reserved.
-+
-+    Redistribution and use in source and binary forms, with or without
-+    modification, are permitted provided that the following conditions
-+    are met:
-+
-+    * Redistributions of source code must retain the above copyright
-+    notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+    notice, this list of conditions and the following disclaimer in
-+    the documentation and/or other materials provided with the
-+    distribution.
-+    * Neither the name of Intel Corporation nor the names of its
-+    contributors may be used to endorse or promote products derived
-+    from this software without specific prior written permission.
-+
-+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+
-+dpdk-devbind Application
-+========================
-+
-+The ``dpdk-devbind`` tool is a Data Plane Development Kit (DPDK) tool that helps binding and unbinding devices from specific drivers.
-+As well as checking their status in that regard.
-+
-+
-+Running the Application
-+-----------------------
-+
-+The tool has a number of command line options:
-+
-+.. code-block:: console
-+
-+   dpdk-devbind [options] DEVICE1 DEVICE2 ....
-+
-+OPTIONS
-+-------
-+
-+* ``--help, --usage``
-+
-+        Display usage information and quit
-+
-+* ``-s, --status``
-+
-+        Print the current status of all known network interfaces.
-+        For each device, it displays the PCI domain, bus, slot and function,
-+        along with a text description of the device. Depending upon whether the
-+        device is being used by a kernel driver, the ``igb_uio`` driver, or no
-+        driver, other relevant information will be displayed:
-+        - the Linux interface name e.g. ``if=eth0``
-+        - the driver being used e.g. ``drv=igb_uio``
-+        - any suitable drivers not currently using that device e.g. ``unused=igb_uio``
-+        NOTE: if this flag is passed along with a bind/unbind option, the
-+        status display will always occur after the other operations have taken
-+        place.
-+
-+* ``-b driver, --bind=driver``
-+
-+        Select the driver to use or "none" to unbind the device
-+
-+* ``-u, --unbind``
-+
-+        Unbind a device (Equivalent to ``-b none``)
-+
-+* ``--force``
-+
-+        By default, devices which are used by Linux - as indicated by having
-+        routes in the routing table - cannot be modified. Using the ``--force``
-+        flag overrides this behavior, allowing active links to be forcibly
-+        unbound.
-+        WARNING: This can lead to loss of network connection and should be used
-+        with caution.
-+
-+
-+.. warning::
-+
-+    Due to the way VFIO works, there are certain limitations to which devices can be used with VFIO.
-+    Mainly it comes down to how IOMMU groups work.
-+    Any Virtual Function device can be used with VFIO on its own, but physical devices will require either all ports bound to VFIO,
-+    or some of them bound to VFIO while others not being bound to anything at all.
-+
-+    If your device is behind a PCI-to-PCI bridge, the bridge will then be part of the IOMMU group in which your device is in.
-+    Therefore, the bridge driver should also be unbound from the bridge PCI device for VFIO to work with devices behind the bridge.
-+
-+.. warning::
-+
-+    While any user can run the ``dpdk-devbind.py`` script to view the status of the network ports,
-+    binding or unbinding network ports requires root privileges.
-+
-+
-+Examples
-+--------
-+
-+To display current device status::
-+
-+   dpdk-devbind --status
-+
-+To bind eth1 from the current driver and move to use igb_uio::
-+
-+   dpdk-devbind --bind=igb_uio eth1
-+
-+To unbind 0000:01:00.0 from using any driver::
-+
-+   dpdk-devbind -u 0000:01:00.0
-+
-+To bind 0000:02:00.0 and 0000:02:00.1 to the ixgbe kernel driver::
-+
-+   dpdk-devbind -b ixgbe 02:00.0 02:00.1
-+
-+To check status of all network ports, assign one to the igb_uio driver and check status again::
-+
-+   # Check the status of the available devices.
-+   dpdk-devbind --status
-+   Network devices using DPDK-compatible driver
-+   ============================================
-+   <none>
-+
-+   Network devices using kernel driver
-+   ===================================
-+   0000:0a:00.0 '82599ES 10-Gigabit' if=eth2 drv=ixgbe unused=
-+
-+
-+   # Bind the device to igb_uio.
-+   sudo dpdk-devbind -b igb_uio 0000:0a:00.0
-+
-+
-+   # Recheck the status of the devices.
-+   dpdk-devbind --status
-+   Network devices using DPDK-compatible driver
-+   ============================================
-+   0000:0a:00.0 '82599ES 10-Gigabit' drv=igb_uio unused=
-diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst
-index 80f2115..cbe98b2 100644
---- a/doc/guides/tools/index.rst
-+++ b/doc/guides/tools/index.rst
-@@ -38,4 +38,5 @@ Tool User Guides
-     proc_info
-     pdump
-     pmdinfo
-+    devbind
- 
-diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
-index 533d369..b1faf28 100644
---- a/mk/rte.sdkinstall.mk
-+++ b/mk/rte.sdkinstall.mk
-@@ -139,6 +139,11 @@ ifneq ($(wildcard $O/doc/man/*/*.1),)
- 	$(Q)$(call rte_mkdir,     $(DESTDIR)$(mandir)/man1)
- 	$(Q)cp -a $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1
- endif
-+ifneq ($(wildcard $O/doc/man/*/*.8),)
-+	$(Q)$(call rte_mkdir,     $(DESTDIR)$(mandir))
-+	$(Q)$(call rte_mkdir,     $(DESTDIR)$(mandir)/man8)
-+	$(Q)cp -a $O/doc/man/*/*.8 $(DESTDIR)$(mandir)/man8
-+endif
- 
- install-kmod:
- ifneq ($(wildcard $O/kmod/*),)
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch
deleted file mode 100644
index 9275147..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE
-
-Linux: 7e9321599011 ("treewide: remove references to the now unnecessary
-DEFINE_PCI_DEVICE_TABLE")
-
-Replaced macro with its value in kni ethtool drivers.
-
-Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
-
-Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15717/
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-09-19
-
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
-@@ -76,7 +76,7 @@
- static const char igb_copyright[] =
- 				"Copyright (c) 2007-2013 Intel Corporation.";
- 
--static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
-+const struct pci_device_id igb_pci_tbl[] = {
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) },
- 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) },
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
-@@ -86,7 +86,7 @@
-  * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
-  *   Class, Class Mask, private data (not used) }
-  */
--DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = {
-+const struct pci_device_id ixgbe_pci_tbl[] = {
- 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598)},
- 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT)},
- 	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT)},
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/fix-double-license-info.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/fix-double-license-info.patch
deleted file mode 100644
index 5565e7a..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/fix-double-license-info.patch
+++ /dev/null
@@ -1,1324 +0,0 @@
-Description: remove duplicate license information
-
-This is getting rid of:
-W: dpdk-rte-kni-dkms: extra-license-file usr/src/dpdk-rte-kni-16.07-rc4/ethtool/igb/COPYING
-W: dpdk-rte-kni-dkms: extra-license-file usr/src/dpdk-rte-kni-16.07-rc4/ethtool/ixgbe/COPYING
-
-The License (GPLv2 and all others needed) is already provided via
-debian/copyright as it should be.
-
-Forwarded: yes
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-08-01
-
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/COPYING
-+++ /dev/null
-@@ -1,339 +0,0 @@
--
--"This software program is licensed subject to the GNU General Public License 
--(GPL). Version 2, June 1991, available at 
--<http://www.fsf.org/copyleft/gpl.html>"
--
--GNU General Public License 
--
--Version 2, June 1991
--
--Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
--59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
--
--Everyone is permitted to copy and distribute verbatim copies of this license
--document, but changing it is not allowed.
--
--Preamble
--
--The licenses for most software are designed to take away your freedom to 
--share and change it. By contrast, the GNU General Public License is intended
--to guarantee your freedom to share and change free software--to make sure 
--the software is free for all its users. This General Public License applies 
--to most of the Free Software Foundation's software and to any other program 
--whose authors commit to using it. (Some other Free Software Foundation 
--software is covered by the GNU Library General Public License instead.) You 
--can apply it to your programs, too.
--
--When we speak of free software, we are referring to freedom, not price. Our
--General Public Licenses are designed to make sure that you have the freedom 
--to distribute copies of free software (and charge for this service if you 
--wish), that you receive source code or can get it if you want it, that you 
--can change the software or use pieces of it in new free programs; and that 
--you know you can do these things.
--
--To protect your rights, we need to make restrictions that forbid anyone to 
--deny you these rights or to ask you to surrender the rights. These 
--restrictions translate to certain responsibilities for you if you distribute
--copies of the software, or if you modify it.
--
--For example, if you distribute copies of such a program, whether gratis or 
--for a fee, you must give the recipients all the rights that you have. You 
--must make sure that they, too, receive or can get the source code. And you 
--must show them these terms so they know their rights.
-- 
--We protect your rights with two steps: (1) copyright the software, and (2) 
--offer you this license which gives you legal permission to copy, distribute 
--and/or modify the software. 
--
--Also, for each author's protection and ours, we want to make certain that 
--everyone understands that there is no warranty for this free software. If 
--the software is modified by someone else and passed on, we want its 
--recipients to know that what they have is not the original, so that any 
--problems introduced by others will not reflect on the original authors' 
--reputations. 
--
--Finally, any free program is threatened constantly by software patents. We 
--wish to avoid the danger that redistributors of a free program will 
--individually obtain patent licenses, in effect making the program 
--proprietary. To prevent this, we have made it clear that any patent must be 
--licensed for everyone's free use or not licensed at all. 
--
--The precise terms and conditions for copying, distribution and modification 
--follow. 
--
--TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--
--0. This License applies to any program or other work which contains a notice
--   placed by the copyright holder saying it may be distributed under the 
--   terms of this General Public License. The "Program", below, refers to any
--   such program or work, and a "work based on the Program" means either the 
--   Program or any derivative work under copyright law: that is to say, a 
--   work containing the Program or a portion of it, either verbatim or with 
--   modifications and/or translated into another language. (Hereinafter, 
--   translation is included without limitation in the term "modification".) 
--   Each licensee is addressed as "you". 
--
--   Activities other than copying, distribution and modification are not 
--   covered by this License; they are outside its scope. The act of running 
--   the Program is not restricted, and the output from the Program is covered 
--   only if its contents constitute a work based on the Program (independent 
--   of having been made by running the Program). Whether that is true depends
--   on what the Program does. 
--
--1. You may copy and distribute verbatim copies of the Program's source code 
--   as you receive it, in any medium, provided that you conspicuously and 
--   appropriately publish on each copy an appropriate copyright notice and 
--   disclaimer of warranty; keep intact all the notices that refer to this 
--   License and to the absence of any warranty; and give any other recipients 
--   of the Program a copy of this License along with the Program. 
--
--   You may charge a fee for the physical act of transferring a copy, and you 
--   may at your option offer warranty protection in exchange for a fee. 
--
--2. You may modify your copy or copies of the Program or any portion of it, 
--   thus forming a work based on the Program, and copy and distribute such 
--   modifications or work under the terms of Section 1 above, provided that 
--   you also meet all of these conditions: 
--
--   * a) You must cause the modified files to carry prominent notices stating 
--        that you changed the files and the date of any change. 
--
--   * b) You must cause any work that you distribute or publish, that in 
--        whole or in part contains or is derived from the Program or any part 
--        thereof, to be licensed as a whole at no charge to all third parties
--        under the terms of this License. 
--
--   * c) If the modified program normally reads commands interactively when 
--        run, you must cause it, when started running for such interactive 
--        use in the most ordinary way, to print or display an announcement 
--        including an appropriate copyright notice and a notice that there is
--        no warranty (or else, saying that you provide a warranty) and that 
--        users may redistribute the program under these conditions, and 
--        telling the user how to view a copy of this License. (Exception: if 
--        the Program itself is interactive but does not normally print such 
--        an announcement, your work based on the Program is not required to 
--        print an announcement.) 
--
--   These requirements apply to the modified work as a whole. If identifiable 
--   sections of that work are not derived from the Program, and can be 
--   reasonably considered independent and separate works in themselves, then 
--   this License, and its terms, do not apply to those sections when you 
--   distribute them as separate works. But when you distribute the same 
--   sections as part of a whole which is a work based on the Program, the 
--   distribution of the whole must be on the terms of this License, whose 
--   permissions for other licensees extend to the entire whole, and thus to 
--   each and every part regardless of who wrote it. 
--
--   Thus, it is not the intent of this section to claim rights or contest 
--   your rights to work written entirely by you; rather, the intent is to 
--   exercise the right to control the distribution of derivative or 
--   collective works based on the Program. 
--
--   In addition, mere aggregation of another work not based on the Program 
--   with the Program (or with a work based on the Program) on a volume of a 
--   storage or distribution medium does not bring the other work under the 
--   scope of this License. 
--
--3. You may copy and distribute the Program (or a work based on it, under 
--   Section 2) in object code or executable form under the terms of Sections 
--   1 and 2 above provided that you also do one of the following: 
--
--   * a) Accompany it with the complete corresponding machine-readable source 
--        code, which must be distributed under the terms of Sections 1 and 2 
--        above on a medium customarily used for software interchange; or, 
--
--   * b) Accompany it with a written offer, valid for at least three years, 
--        to give any third party, for a charge no more than your cost of 
--        physically performing source distribution, a complete machine-
--        readable copy of the corresponding source code, to be distributed 
--        under the terms of Sections 1 and 2 above on a medium customarily 
--        used for software interchange; or, 
--
--   * c) Accompany it with the information you received as to the offer to 
--        distribute corresponding source code. (This alternative is allowed 
--        only for noncommercial distribution and only if you received the 
--        program in object code or executable form with such an offer, in 
--        accord with Subsection b above.) 
--
--   The source code for a work means the preferred form of the work for 
--   making modifications to it. For an executable work, complete source code 
--   means all the source code for all modules it contains, plus any 
--   associated interface definition files, plus the scripts used to control 
--   compilation and installation of the executable. However, as a special 
--   exception, the source code distributed need not include anything that is 
--   normally distributed (in either source or binary form) with the major 
--   components (compiler, kernel, and so on) of the operating system on which
--   the executable runs, unless that component itself accompanies the 
--   executable. 
--
--   If distribution of executable or object code is made by offering access 
--   to copy from a designated place, then offering equivalent access to copy 
--   the source code from the same place counts as distribution of the source 
--   code, even though third parties are not compelled to copy the source 
--   along with the object code. 
--
--4. You may not copy, modify, sublicense, or distribute the Program except as
--   expressly provided under this License. Any attempt otherwise to copy, 
--   modify, sublicense or distribute the Program is void, and will 
--   automatically terminate your rights under this License. However, parties 
--   who have received copies, or rights, from you under this License will not
--   have their licenses terminated so long as such parties remain in full 
--   compliance. 
--
--5. You are not required to accept this License, since you have not signed 
--   it. However, nothing else grants you permission to modify or distribute 
--   the Program or its derivative works. These actions are prohibited by law 
--   if you do not accept this License. Therefore, by modifying or 
--   distributing the Program (or any work based on the Program), you 
--   indicate your acceptance of this License to do so, and all its terms and
--   conditions for copying, distributing or modifying the Program or works 
--   based on it. 
--
--6. Each time you redistribute the Program (or any work based on the 
--   Program), the recipient automatically receives a license from the 
--   original licensor to copy, distribute or modify the Program subject to 
--   these terms and conditions. You may not impose any further restrictions 
--   on the recipients' exercise of the rights granted herein. You are not 
--   responsible for enforcing compliance by third parties to this License. 
--
--7. If, as a consequence of a court judgment or allegation of patent 
--   infringement or for any other reason (not limited to patent issues), 
--   conditions are imposed on you (whether by court order, agreement or 
--   otherwise) that contradict the conditions of this License, they do not 
--   excuse you from the conditions of this License. If you cannot distribute 
--   so as to satisfy simultaneously your obligations under this License and 
--   any other pertinent obligations, then as a consequence you may not 
--   distribute the Program at all. For example, if a patent license would 
--   not permit royalty-free redistribution of the Program by all those who 
--   receive copies directly or indirectly through you, then the only way you 
--   could satisfy both it and this License would be to refrain entirely from 
--   distribution of the Program. 
--
--   If any portion of this section is held invalid or unenforceable under any
--   particular circumstance, the balance of the section is intended to apply
--   and the section as a whole is intended to apply in other circumstances. 
--
--   It is not the purpose of this section to induce you to infringe any 
--   patents or other property right claims or to contest validity of any 
--   such claims; this section has the sole purpose of protecting the 
--   integrity of the free software distribution system, which is implemented 
--   by public license practices. Many people have made generous contributions
--   to the wide range of software distributed through that system in 
--   reliance on consistent application of that system; it is up to the 
--   author/donor to decide if he or she is willing to distribute software 
--   through any other system and a licensee cannot impose that choice. 
--
--   This section is intended to make thoroughly clear what is believed to be 
--   a consequence of the rest of this License. 
--
--8. If the distribution and/or use of the Program is restricted in certain 
--   countries either by patents or by copyrighted interfaces, the original 
--   copyright holder who places the Program under this License may add an 
--   explicit geographical distribution limitation excluding those countries, 
--   so that distribution is permitted only in or among countries not thus 
--   excluded. In such case, this License incorporates the limitation as if 
--   written in the body of this License. 
--
--9. The Free Software Foundation may publish revised and/or new versions of 
--   the General Public License from time to time. Such new versions will be 
--   similar in spirit to the present version, but may differ in detail to 
--   address new problems or concerns. 
--
--   Each version is given a distinguishing version number. If the Program 
--   specifies a version number of this License which applies to it and "any 
--   later version", you have the option of following the terms and 
--   conditions either of that version or of any later version published by 
--   the Free Software Foundation. If the Program does not specify a version 
--   number of this License, you may choose any version ever published by the 
--   Free Software Foundation. 
--
--10. If you wish to incorporate parts of the Program into other free programs
--    whose distribution conditions are different, write to the author to ask 
--    for permission. For software which is copyrighted by the Free Software 
--    Foundation, write to the Free Software Foundation; we sometimes make 
--    exceptions for this. Our decision will be guided by the two goals of 
--    preserving the free status of all derivatives of our free software and 
--    of promoting the sharing and reuse of software generally. 
--
--   NO WARRANTY
--
--11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
--    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
--    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
--    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
--    EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
--    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE 
--    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH 
--    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL 
--    NECESSARY SERVICING, REPAIR OR CORRECTION. 
--
--12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
--    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
--    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR 
--    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL 
--    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM 
--    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED 
--    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF 
--    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR 
--    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
--
--END OF TERMS AND CONDITIONS
--
--How to Apply These Terms to Your New Programs
--
--If you develop a new program, and you want it to be of the greatest 
--possible use to the public, the best way to achieve this is to make it free 
--software which everyone can redistribute and change under these terms. 
--
--To do so, attach the following notices to the program. It is safest to 
--attach them to the start of each source file to most effectively convey the
--exclusion of warranty; and each file should have at least the "copyright" 
--line and a pointer to where the full notice is found. 
--
--one line to give the program's name and an idea of what it does.
--Copyright (C) yyyy  name of author
--
--This program is free software; you can redistribute it and/or modify it 
--under the terms of the GNU General Public License as published by the Free 
--Software Foundation; either version 2 of the License, or (at your option) 
--any later version.
--
--This program is distributed in the hope that it will be useful, but WITHOUT 
--ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
--FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
--more details.
--
--You should have received a copy of the GNU General Public License along with
--this program; if not, write to the Free Software Foundation, Inc., 59 
--Temple Place - Suite 330, Boston, MA  02111-1307, USA.
--
--Also add information on how to contact you by electronic and paper mail. 
--
--If the program is interactive, make it output a short notice like this when 
--it starts in an interactive mode: 
--
--Gnomovision version 69, Copyright (C) year name of author Gnomovision comes 
--with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free 
--software, and you are welcome to redistribute it under certain conditions; 
--type 'show c' for details.
--
--The hypothetical commands 'show w' and 'show c' should show the appropriate 
--parts of the General Public License. Of course, the commands you use may be 
--called something other than 'show w' and 'show c'; they could even be 
--mouse-clicks or menu items--whatever suits your program. 
--
--You should also get your employer (if you work as a programmer) or your 
--school, if any, to sign a "copyright disclaimer" for the program, if 
--necessary. Here is a sample; alter the names: 
--
--Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
--'Gnomovision' (which makes passes at compilers) written by James Hacker.
--
--signature of Ty Coon, 1 April 1989
--Ty Coon, President of Vice
--
--This General Public License does not permit incorporating your program into 
--proprietary programs. If your program is a subroutine library, you may 
--consider it more useful to permit linking proprietary applications with the 
--library. If this is what you want to do, use the GNU Library General Public 
--License instead of this License.
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/COPYING
-+++ /dev/null
-@@ -1,339 +0,0 @@
--
--"This software program is licensed subject to the GNU General Public License 
--(GPL). Version 2, June 1991, available at 
--<http://www.fsf.org/copyleft/gpl.html>"
--
--GNU General Public License 
--
--Version 2, June 1991
--
--Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
--59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
--
--Everyone is permitted to copy and distribute verbatim copies of this license
--document, but changing it is not allowed.
--
--Preamble
--
--The licenses for most software are designed to take away your freedom to 
--share and change it. By contrast, the GNU General Public License is intended
--to guarantee your freedom to share and change free software--to make sure 
--the software is free for all its users. This General Public License applies 
--to most of the Free Software Foundation's software and to any other program 
--whose authors commit to using it. (Some other Free Software Foundation 
--software is covered by the GNU Library General Public License instead.) You 
--can apply it to your programs, too.
--
--When we speak of free software, we are referring to freedom, not price. Our
--General Public Licenses are designed to make sure that you have the freedom 
--to distribute copies of free software (and charge for this service if you 
--wish), that you receive source code or can get it if you want it, that you 
--can change the software or use pieces of it in new free programs; and that 
--you know you can do these things.
--
--To protect your rights, we need to make restrictions that forbid anyone to 
--deny you these rights or to ask you to surrender the rights. These 
--restrictions translate to certain responsibilities for you if you distribute
--copies of the software, or if you modify it.
--
--For example, if you distribute copies of such a program, whether gratis or 
--for a fee, you must give the recipients all the rights that you have. You 
--must make sure that they, too, receive or can get the source code. And you 
--must show them these terms so they know their rights.
-- 
--We protect your rights with two steps: (1) copyright the software, and (2) 
--offer you this license which gives you legal permission to copy, distribute 
--and/or modify the software. 
--
--Also, for each author's protection and ours, we want to make certain that 
--everyone understands that there is no warranty for this free software. If 
--the software is modified by someone else and passed on, we want its 
--recipients to know that what they have is not the original, so that any 
--problems introduced by others will not reflect on the original authors' 
--reputations. 
--
--Finally, any free program is threatened constantly by software patents. We 
--wish to avoid the danger that redistributors of a free program will 
--individually obtain patent licenses, in effect making the program 
--proprietary. To prevent this, we have made it clear that any patent must be 
--licensed for everyone's free use or not licensed at all. 
--
--The precise terms and conditions for copying, distribution and modification 
--follow. 
--
--TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--
--0. This License applies to any program or other work which contains a notice
--   placed by the copyright holder saying it may be distributed under the 
--   terms of this General Public License. The "Program", below, refers to any
--   such program or work, and a "work based on the Program" means either the 
--   Program or any derivative work under copyright law: that is to say, a 
--   work containing the Program or a portion of it, either verbatim or with 
--   modifications and/or translated into another language. (Hereinafter, 
--   translation is included without limitation in the term "modification".) 
--   Each licensee is addressed as "you". 
--
--   Activities other than copying, distribution and modification are not 
--   covered by this License; they are outside its scope. The act of running 
--   the Program is not restricted, and the output from the Program is covered 
--   only if its contents constitute a work based on the Program (independent 
--   of having been made by running the Program). Whether that is true depends
--   on what the Program does. 
--
--1. You may copy and distribute verbatim copies of the Program's source code 
--   as you receive it, in any medium, provided that you conspicuously and 
--   appropriately publish on each copy an appropriate copyright notice and 
--   disclaimer of warranty; keep intact all the notices that refer to this 
--   License and to the absence of any warranty; and give any other recipients 
--   of the Program a copy of this License along with the Program. 
--
--   You may charge a fee for the physical act of transferring a copy, and you 
--   may at your option offer warranty protection in exchange for a fee. 
--
--2. You may modify your copy or copies of the Program or any portion of it, 
--   thus forming a work based on the Program, and copy and distribute such 
--   modifications or work under the terms of Section 1 above, provided that 
--   you also meet all of these conditions: 
--
--   * a) You must cause the modified files to carry prominent notices stating 
--        that you changed the files and the date of any change. 
--
--   * b) You must cause any work that you distribute or publish, that in 
--        whole or in part contains or is derived from the Program or any part 
--        thereof, to be licensed as a whole at no charge to all third parties
--        under the terms of this License. 
--
--   * c) If the modified program normally reads commands interactively when 
--        run, you must cause it, when started running for such interactive 
--        use in the most ordinary way, to print or display an announcement 
--        including an appropriate copyright notice and a notice that there is
--        no warranty (or else, saying that you provide a warranty) and that 
--        users may redistribute the program under these conditions, and 
--        telling the user how to view a copy of this License. (Exception: if 
--        the Program itself is interactive but does not normally print such 
--        an announcement, your work based on the Program is not required to 
--        print an announcement.) 
--
--   These requirements apply to the modified work as a whole. If identifiable 
--   sections of that work are not derived from the Program, and can be 
--   reasonably considered independent and separate works in themselves, then 
--   this License, and its terms, do not apply to those sections when you 
--   distribute them as separate works. But when you distribute the same 
--   sections as part of a whole which is a work based on the Program, the 
--   distribution of the whole must be on the terms of this License, whose 
--   permissions for other licensees extend to the entire whole, and thus to 
--   each and every part regardless of who wrote it. 
--
--   Thus, it is not the intent of this section to claim rights or contest 
--   your rights to work written entirely by you; rather, the intent is to 
--   exercise the right to control the distribution of derivative or 
--   collective works based on the Program. 
--
--   In addition, mere aggregation of another work not based on the Program 
--   with the Program (or with a work based on the Program) on a volume of a 
--   storage or distribution medium does not bring the other work under the 
--   scope of this License. 
--
--3. You may copy and distribute the Program (or a work based on it, under 
--   Section 2) in object code or executable form under the terms of Sections 
--   1 and 2 above provided that you also do one of the following: 
--
--   * a) Accompany it with the complete corresponding machine-readable source 
--        code, which must be distributed under the terms of Sections 1 and 2 
--        above on a medium customarily used for software interchange; or, 
--
--   * b) Accompany it with a written offer, valid for at least three years, 
--        to give any third party, for a charge no more than your cost of 
--        physically performing source distribution, a complete machine-
--        readable copy of the corresponding source code, to be distributed 
--        under the terms of Sections 1 and 2 above on a medium customarily 
--        used for software interchange; or, 
--
--   * c) Accompany it with the information you received as to the offer to 
--        distribute corresponding source code. (This alternative is allowed 
--        only for noncommercial distribution and only if you received the 
--        program in object code or executable form with such an offer, in 
--        accord with Subsection b above.) 
--
--   The source code for a work means the preferred form of the work for 
--   making modifications to it. For an executable work, complete source code 
--   means all the source code for all modules it contains, plus any 
--   associated interface definition files, plus the scripts used to control 
--   compilation and installation of the executable. However, as a special 
--   exception, the source code distributed need not include anything that is 
--   normally distributed (in either source or binary form) with the major 
--   components (compiler, kernel, and so on) of the operating system on which
--   the executable runs, unless that component itself accompanies the 
--   executable. 
--
--   If distribution of executable or object code is made by offering access 
--   to copy from a designated place, then offering equivalent access to copy 
--   the source code from the same place counts as distribution of the source 
--   code, even though third parties are not compelled to copy the source 
--   along with the object code. 
--
--4. You may not copy, modify, sublicense, or distribute the Program except as
--   expressly provided under this License. Any attempt otherwise to copy, 
--   modify, sublicense or distribute the Program is void, and will 
--   automatically terminate your rights under this License. However, parties 
--   who have received copies, or rights, from you under this License will not
--   have their licenses terminated so long as such parties remain in full 
--   compliance. 
--
--5. You are not required to accept this License, since you have not signed 
--   it. However, nothing else grants you permission to modify or distribute 
--   the Program or its derivative works. These actions are prohibited by law 
--   if you do not accept this License. Therefore, by modifying or 
--   distributing the Program (or any work based on the Program), you 
--   indicate your acceptance of this License to do so, and all its terms and
--   conditions for copying, distributing or modifying the Program or works 
--   based on it. 
--
--6. Each time you redistribute the Program (or any work based on the 
--   Program), the recipient automatically receives a license from the 
--   original licensor to copy, distribute or modify the Program subject to 
--   these terms and conditions. You may not impose any further restrictions 
--   on the recipients' exercise of the rights granted herein. You are not 
--   responsible for enforcing compliance by third parties to this License. 
--
--7. If, as a consequence of a court judgment or allegation of patent 
--   infringement or for any other reason (not limited to patent issues), 
--   conditions are imposed on you (whether by court order, agreement or 
--   otherwise) that contradict the conditions of this License, they do not 
--   excuse you from the conditions of this License. If you cannot distribute 
--   so as to satisfy simultaneously your obligations under this License and 
--   any other pertinent obligations, then as a consequence you may not 
--   distribute the Program at all. For example, if a patent license would 
--   not permit royalty-free redistribution of the Program by all those who 
--   receive copies directly or indirectly through you, then the only way you 
--   could satisfy both it and this License would be to refrain entirely from 
--   distribution of the Program. 
--
--   If any portion of this section is held invalid or unenforceable under any
--   particular circumstance, the balance of the section is intended to apply
--   and the section as a whole is intended to apply in other circumstances. 
--
--   It is not the purpose of this section to induce you to infringe any 
--   patents or other property right claims or to contest validity of any 
--   such claims; this section has the sole purpose of protecting the 
--   integrity of the free software distribution system, which is implemented 
--   by public license practices. Many people have made generous contributions
--   to the wide range of software distributed through that system in 
--   reliance on consistent application of that system; it is up to the 
--   author/donor to decide if he or she is willing to distribute software 
--   through any other system and a licensee cannot impose that choice. 
--
--   This section is intended to make thoroughly clear what is believed to be 
--   a consequence of the rest of this License. 
--
--8. If the distribution and/or use of the Program is restricted in certain 
--   countries either by patents or by copyrighted interfaces, the original 
--   copyright holder who places the Program under this License may add an 
--   explicit geographical distribution limitation excluding those countries, 
--   so that distribution is permitted only in or among countries not thus 
--   excluded. In such case, this License incorporates the limitation as if 
--   written in the body of this License. 
--
--9. The Free Software Foundation may publish revised and/or new versions of 
--   the General Public License from time to time. Such new versions will be 
--   similar in spirit to the present version, but may differ in detail to 
--   address new problems or concerns. 
--
--   Each version is given a distinguishing version number. If the Program 
--   specifies a version number of this License which applies to it and "any 
--   later version", you have the option of following the terms and 
--   conditions either of that version or of any later version published by 
--   the Free Software Foundation. If the Program does not specify a version 
--   number of this License, you may choose any version ever published by the 
--   Free Software Foundation. 
--
--10. If you wish to incorporate parts of the Program into other free programs
--    whose distribution conditions are different, write to the author to ask 
--    for permission. For software which is copyrighted by the Free Software 
--    Foundation, write to the Free Software Foundation; we sometimes make 
--    exceptions for this. Our decision will be guided by the two goals of 
--    preserving the free status of all derivatives of our free software and 
--    of promoting the sharing and reuse of software generally. 
--
--   NO WARRANTY
--
--11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
--    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
--    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
--    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
--    EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
--    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE 
--    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH 
--    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL 
--    NECESSARY SERVICING, REPAIR OR CORRECTION. 
--
--12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
--    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
--    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR 
--    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL 
--    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM 
--    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED 
--    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF 
--    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR 
--    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
--
--END OF TERMS AND CONDITIONS
--
--How to Apply These Terms to Your New Programs
--
--If you develop a new program, and you want it to be of the greatest 
--possible use to the public, the best way to achieve this is to make it free 
--software which everyone can redistribute and change under these terms. 
--
--To do so, attach the following notices to the program. It is safest to 
--attach them to the start of each source file to most effectively convey the
--exclusion of warranty; and each file should have at least the "copyright" 
--line and a pointer to where the full notice is found. 
--
--one line to give the program's name and an idea of what it does.
--Copyright (C) yyyy  name of author
--
--This program is free software; you can redistribute it and/or modify it 
--under the terms of the GNU General Public License as published by the Free 
--Software Foundation; either version 2 of the License, or (at your option) 
--any later version.
--
--This program is distributed in the hope that it will be useful, but WITHOUT 
--ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
--FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
--more details.
--
--You should have received a copy of the GNU General Public License along with
--this program; if not, write to the Free Software Foundation, Inc., 59 
--Temple Place - Suite 330, Boston, MA  02111-1307, USA.
--
--Also add information on how to contact you by electronic and paper mail. 
--
--If the program is interactive, make it output a short notice like this when 
--it starts in an interactive mode: 
--
--Gnomovision version 69, Copyright (C) year name of author Gnomovision comes 
--with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free 
--software, and you are welcome to redistribute it under certain conditions; 
--type 'show c' for details.
--
--The hypothetical commands 'show w' and 'show c' should show the appropriate 
--parts of the General Public License. Of course, the commands you use may be 
--called something other than 'show w' and 'show c'; they could even be 
--mouse-clicks or menu items--whatever suits your program. 
--
--You should also get your employer (if you work as a programmer) or your 
--school, if any, to sign a "copyright disclaimer" for the program, if 
--necessary. Here is a sample; alter the names: 
--
--Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
--'Gnomovision' (which makes passes at compilers) written by James Hacker.
--
--signature of Ty Coon, 1 April 1989
--Ty Coon, President of Vice
--
--This General Public License does not permit incorporating your program into 
--proprietary programs. If your program is a subroutine library, you may 
--consider it more useful to permit linking proprietary applications with the 
--library. If this is what you want to do, use the GNU Library General Public 
--License instead of this License.
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_82575.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_api.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_api.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_api.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_api.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_defines.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_defines.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_hw.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_hw.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_i210.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mac.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_manage.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_manage.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_manage.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_manage.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mbx.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mbx.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mbx.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_mbx.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_nvm.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_nvm.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_nvm.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_nvm.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_osdep.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_osdep.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_regs.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_regs.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_debugfs.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_debugfs.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ethtool.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ethtool.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_hwmon.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_hwmon.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_param.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_param.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_procfs.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_procfs.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ptp.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_ptp.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_regtest.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_regtest.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_vmdq.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat_ethtool.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat_ethtool.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82598.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_api.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_api.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_api.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_api.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_common.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_common.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_common.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_common.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_dcb.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_dcb.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_ethtool.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_ethtool.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_fcoe.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_fcoe.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_mbx.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_mbx.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_osdep.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_osdep.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_phy.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_phy.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_phy.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_phy.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_sriov.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_sriov.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_type.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_type.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/kcompat.c
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/kcompat.c
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
---- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/kcompat.h
-+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/kcompat.h
-@@ -17,7 +17,7 @@
-   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- 
-   The full GNU General Public License is included in this distribution in
--  the file called "COPYING".
-+  the file called "LICENSE.GPL".
- 
-   Contact Information:
-   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/fix-unusual-interpreter.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/fix-unusual-interpreter.patch
deleted file mode 100644
index 754a413..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/fix-unusual-interpreter.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: examples: fix unusual-interpreter v2
-
-*Update in v2*
-- use #!/usr/bin/env python as usually recommended and suggested in the
-  discussion
-
-Due to regular lintian checks in Debian packaging it surfaced that these
-two scripts had a space in their #! statement which renders it to be
-human, but not shell readable.
-
-Fixes: 8673a3e8 ("examples/ip_pipeline: add config diagram generator")
-Fixes: fa667b46 ("examples/ip_pipeline: add core mappings script")
-
-This gets rid of lintian warning "W: dpdk-doc: unusual-interpreter"
-
-Forwarded: yes
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-08-02
-
---- a/examples/ip_pipeline/config/diagram-generator.py
-+++ b/examples/ip_pipeline/config/diagram-generator.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2
-+#!/usr/bin/env python
- 
- #   BSD LICENSE
- #
---- a/examples/ip_pipeline/config/pipeline-to-core-mapping.py
-+++ b/examples/ip_pipeline/config/pipeline-to-core-mapping.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/python2
-+#!/usr/bin/env python
- 
- #   BSD LICENSE
- #
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/fix-vhost-user-socket-permission.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/fix-vhost-user-socket-permission.patch
deleted file mode 100644
index e75cbc2..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/fix-vhost-user-socket-permission.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-Description: eal: provide option to set vhost_user socket owner/permissions
-
-The API doesn't hold a way to specify a owner/permission set for vhost_user
-created sockets.
-
-Projects consuming DPDK started to do 'their own workarounds' like openvswitch
-https://patchwork.ozlabs.org/patch/559043/
-https://patchwork.ozlabs.org/patch/559045/
-But for this specific example they are blocked/stalled behind a bigger
-rework (https://patchwork.ozlabs.org/patch/604898/).
-
-We need something now for existing code linking against DPDK. That implies to
-avoid changing API/ABI. So I created a DPDK EAL commandline option based ideas
-in the former patches.
-
-Fixes LP: #1546565
-
-*Update*
- - with the split libs it now nees to be listed in
-   lib/librte_eal/linuxapp/eal/rte_eal_version.map to work on link steps
- - please note that upstream gravitates towards not extending but creating a
-   new the API in DPDK as long term solution (will take a while)
- - also as listed before most affected projects seem to create their own
-   workaround.
- So over time we have to check when we can drop it at the price of a config
- transition - likely OVS 2.6 won't need it anymore.
-
-Forwarded: yes
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-09-28
-
-diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
-index 7712bd2..28776b9 100644
---- a/doc/guides/testpmd_app_ug/run_app.rst
-+++ b/doc/guides/testpmd_app_ug/run_app.rst
-@@ -156,6 +156,25 @@ See the DPDK Getting Started Guides for more information on these options.
- 
-     Use malloc instead of hugetlbfs.
- 
-+*   ``--vhost-owner``
-+
-+     When creating vhost_user sockets change owner and group to the specified value.
-+     This can be given as ``user:group``, but also only ``user`` or ``:group`` are supported.
-+
-+    Examples::
-+
-+       --vhost-owner 'libvirt-qemu:kvm'
-+       --vhost-owner 'libvirt-qemu'
-+       --vhost-owner ':kvm'
-+
-+*   ``--vhost-perm``
-+
-+    When creating vhost_user sockets set them up with these permissions.
-+
-+    For example::
-+
-+       --vhost-perm '0664'
-+
- 
- Testpmd Command-line Options
- ----------------------------
-diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
-index 481c732..2126140 100644
---- a/lib/librte_eal/common/eal_common_options.c
-+++ b/lib/librte_eal/common/eal_common_options.c
-@@ -95,6 +95,8 @@ eal_long_options[] = {
- 	{OPT_VFIO_INTR,         1, NULL, OPT_VFIO_INTR_NUM        },
- 	{OPT_VMWARE_TSC_MAP,    0, NULL, OPT_VMWARE_TSC_MAP_NUM   },
- 	{OPT_XEN_DOM0,          0, NULL, OPT_XEN_DOM0_NUM         },
-+	{OPT_VHOST_OWNER,       1, NULL, OPT_VHOST_OWNER_NUM      },
-+	{OPT_VHOST_PERM,        1, NULL, OPT_VHOST_PERM_NUM       },
- 	{0,                     0, NULL, 0                        }
- };
- 
-@@ -166,6 +168,8 @@ eal_reset_internal_config(struct internal_config *internal_cfg)
- #endif
- 	internal_cfg->vmware_tsc_map = 0;
- 	internal_cfg->create_uio_dev = 0;
-+	internal_cfg->vhost_sock_owner = NULL;
-+	internal_cfg->vhost_sock_perm = NULL;
- }
- 
- static int
-diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/librte_eal/common/eal_internal_cfg.h
-index 5f1367e..bdf34e3 100644
---- a/lib/librte_eal/common/eal_internal_cfg.h
-+++ b/lib/librte_eal/common/eal_internal_cfg.h
-@@ -83,6 +83,8 @@ struct internal_config {
- 	volatile enum rte_intr_mode vfio_intr_mode;
- 	const char *hugefile_prefix;      /**< the base filename of hugetlbfs files */
- 	const char *hugepage_dir;         /**< specific hugetlbfs directory to use */
-+	const char *vhost_sock_owner;     /**< owner:group of vhost_user sockets */
-+	const char *vhost_sock_perm;      /**< permissions of vhost_user sockets */
- 
- 	unsigned num_hugepage_sizes;      /**< how many sizes on this system */
- 	struct hugepage_info hugepage_info[MAX_HUGEPAGE_SIZES];
-diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h
-index a881c62..1161083 100644
---- a/lib/librte_eal/common/eal_options.h
-+++ b/lib/librte_eal/common/eal_options.h
-@@ -83,6 +83,10 @@ enum {
- 	OPT_VMWARE_TSC_MAP_NUM,
- #define OPT_XEN_DOM0          "xen-dom0"
- 	OPT_XEN_DOM0_NUM,
-+#define OPT_VHOST_OWNER       "vhost-owner"
-+	OPT_VHOST_OWNER_NUM,
-+#define OPT_VHOST_PERM        "vhost-perm"
-+	OPT_VHOST_PERM_NUM,
- 	OPT_LONG_MAX_NUM
- };
- 
-diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
-index a71d6f5..506cf24 100644
---- a/lib/librte_eal/common/include/rte_eal.h
-+++ b/lib/librte_eal/common/include/rte_eal.h
-@@ -252,6 +252,11 @@ static inline int rte_gettid(void)
- 	return RTE_PER_LCORE(_thread_id);
- }
- 
-+/**
-+ * Set owner/permissions on sockets if requested on EAL commandline
-+ */
-+void rte_eal_set_socket_permissions(const char *);
-+
- #ifdef __cplusplus
- }
- #endif
-diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
-index 3fb2188..dc84c5b 100644
---- a/lib/librte_eal/linuxapp/eal/eal.c
-+++ b/lib/librte_eal/linuxapp/eal/eal.c
-@@ -53,6 +53,9 @@
- #if defined(RTE_ARCH_X86)
- #include <sys/io.h>
- #endif
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <grp.h>
- 
- #include <rte_common.h>
- #include <rte_debug.h>
-@@ -344,6 +347,8 @@ eal_usage(const char *prgname)
- 	       "  --"OPT_CREATE_UIO_DEV"    Create /dev/uioX (usually done by hotplug)\n"
- 	       "  --"OPT_VFIO_INTR"         Interrupt mode for VFIO (legacy|msi|msix)\n"
- 	       "  --"OPT_XEN_DOM0"          Support running on Xen dom0 without hugetlbfs\n"
-+	       "  --"OPT_VHOST_OWNER"       Create vhost-user sockets with this owner:group\n"
-+	       "  --"OPT_VHOST_PERM"        Create vhost-user sockets with these permissions\n"
- 	       "\n");
- 	/* Allow the application to print its usage message too if hook is set */
- 	if ( rte_application_usage_hook ) {
-@@ -601,6 +606,14 @@ eal_parse_args(int argc, char **argv)
- 			internal_config.create_uio_dev = 1;
- 			break;
- 
-+		case OPT_VHOST_OWNER_NUM:
-+			internal_config.vhost_sock_owner = optarg;
-+			break;
-+
-+		case OPT_VHOST_PERM_NUM:
-+			internal_config.vhost_sock_perm = optarg;
-+			break;
-+
- 		default:
- 			if (opt < OPT_LONG_MIN_NUM && isprint(opt)) {
- 				RTE_LOG(ERR, EAL, "Option %c is not supported "
-@@ -943,3 +956,172 @@ rte_eal_check_module(const char *module_name)
- 	/* Module has been found */
- 	return 1;
- }
-+
-+/* Try to double the size of '*buf', return true
-+ * if successful, and '*sizep' will be updated with
-+ * the new size. Otherwise, return false.  */
-+static int
-+enlarge_buffer(char **buf, size_t *sizep)
-+{
-+    size_t newsize = *sizep * 2;
-+
-+    if (newsize > *sizep) {
-+        *buf = realloc(*buf, newsize);
-+        *sizep = newsize;
-+        return 1;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+get_owners_from_str(const char *user_spec, uid_t *uid, gid_t *gid)
-+{
-+	size_t bufsize = 4096;
-+
-+	char *pos = strchr(user_spec, ':');
-+	user_spec += strspn(user_spec, " \t\r\n");
-+	size_t len = pos ? (size_t)(pos - user_spec) : strlen(user_spec);
-+
-+	char *buf = NULL;
-+	struct passwd pwd, *res;
-+	int e;
-+
-+	buf = malloc(bufsize);
-+	char *user_search = NULL;
-+	if (len) {
-+		user_search = malloc(len + 1);
-+		memcpy(user_search, user_spec, len);
-+		user_search[len] = '\0';
-+		while ((e = getpwnam_r(user_search, &pwd, buf, bufsize, &res)) == ERANGE) {
-+			if (!enlarge_buffer(&buf, &bufsize)) {
-+				break;
-+			}
-+		}
-+
-+		if (e != 0) {
-+			RTE_LOG(ERR, EAL,"Failed to retrive user %s's uid (%s), aborting.",
-+				user_search, strerror(e));
-+			goto release;
-+		}
-+		if (res == NULL) {
-+			RTE_LOG(ERR, EAL,"user %s not found,  aborting.",
-+				user_search);
-+			e = -1;
-+			goto release;
-+		}
-+	} else {
-+		/* User name is not specified, use current user.  */
-+		while ((e = getpwuid_r(getuid(), &pwd, buf, bufsize, &res)) == ERANGE) {
-+			if (!enlarge_buffer(&buf, &bufsize)) {
-+				break;
-+			}
-+		}
-+
-+		if (e != 0) {
-+			RTE_LOG(ERR, EAL,"Failed to retrive current user's uid "
-+				"(%s), aborting.", strerror(e));
-+			goto release;
-+		}
-+		user_search = strdup(pwd.pw_name);
-+	}
-+
-+	if (uid)
-+		*uid = pwd.pw_uid;
-+
-+	free(buf);
-+	buf = NULL;
-+
-+	if (pos) {
-+		char *grpstr = pos + 1;
-+		grpstr += strspn(grpstr, " \t\r\n");
-+
-+		if (*grpstr) {
-+			struct group grp, *res;
-+
-+			bufsize = 4096;
-+			buf = malloc(bufsize);
-+			while ((e = getgrnam_r(grpstr, &grp, buf, bufsize, &res))
-+					 == ERANGE) {
-+				if (!enlarge_buffer(&buf, &bufsize)) {
-+					break;
-+				}
-+			}
-+
-+			if (e) {
-+				RTE_LOG(ERR, EAL,"Failed to get group entry for %s, "
-+					"(%s), aborting.", grpstr,
-+					strerror(e));
-+				goto release;
-+			}
-+			if (res == NULL) {
-+				RTE_LOG(ERR, EAL,"Group %s not found, aborting.",
-+					grpstr);
-+				e = -1;
-+				goto release;
-+			}
-+
-+			if (gid)
-+				*gid = grp.gr_gid;
-+		}
-+	}
-+
-+ release:
-+	free(buf);
-+	free(user_search);
-+	return e;
-+}
-+
-+static void
-+vhost_set_permissions(const char *vhost_sock_location)
-+{
-+	unsigned long int mode = strtoul(internal_config.vhost_sock_perm, NULL, 0);
-+	int err = chmod(vhost_sock_location, (mode_t)mode);
-+	if (err) {
-+		RTE_LOG(ERR, EAL,"vhost-user socket cannot set"
-+			" permissions to %s (%s).\n",
-+			internal_config.vhost_sock_perm, strerror(err));
-+		return;
-+	}
-+	RTE_LOG(INFO, EAL,"Socket %s changed permissions"
-+			" to %s\n", vhost_sock_location,
-+			internal_config.vhost_sock_perm);
-+}
-+
-+static void
-+vhost_set_ownership(const char *vhost_sock_location)
-+{
-+	uid_t vhuid=0;
-+	gid_t vhgid=0;
-+
-+	if (get_owners_from_str(internal_config.vhost_sock_owner, &vhuid, &vhgid)) {
-+		RTE_LOG(ERR, EAL,"vhost-user socket unable to get"
-+			" specified user/group: %s\n",
-+			internal_config.vhost_sock_owner);
-+		return;
-+	}
-+
-+	int err = chown(vhost_sock_location, vhuid, vhgid);
-+	if (err) {
-+		RTE_LOG(ERR, EAL,"vhost-user socket unable to set"
-+			" ownership to %s (%s).\n",
-+			internal_config.vhost_sock_owner, strerror(err));
-+		return;
-+	}
-+
-+	RTE_LOG(INFO, EAL,"Socket %s changed ownership"
-+			" to %s.\n", vhost_sock_location,
-+			internal_config.vhost_sock_owner);
-+}
-+
-+void
-+rte_eal_set_socket_permissions(const char *path)
-+{
-+	if (internal_config.vhost_sock_perm) {
-+		vhost_set_permissions(path);
-+	}
-+
-+	if (internal_config.vhost_sock_owner) {
-+		vhost_set_ownership(path);
-+	}
-+}
-diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
-index db8c984..bb92e57 100644
---- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
-+++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
-@@ -139,6 +139,7 @@ DPDK_2.2 {
- 	rte_keepalive_register_core;
- 	rte_xen_dom0_supported;
- 	rte_xen_mem_phy2mch;
-+	rte_eal_set_socket_permissions;
- 
- } DPDK_2.1;
- 
-diff --git a/lib/librte_vhost/vhost_user/vhost-net-user.c b/lib/librte_vhost/vhost_user/vhost-net-user.c
-index b35594d..dbdb8ad 100644
---- a/lib/librte_vhost/vhost_user/vhost-net-user.c
-+++ b/lib/librte_vhost/vhost_user/vhost-net-user.c
-@@ -79,6 +79,8 @@ struct vhost_user {
- 	pthread_mutex_t mutex;
- };
- 
-+#include <rte_eal.h>
-+
- #define MAX_VIRTIO_BACKLOG 128
- 
- static void vhost_user_server_new_connection(int fd, void *data, int *remove);
-@@ -699,6 +701,7 @@
- 		vsocket->is_server = true;
- 		ret = vhost_user_create_server(vsocket);
- 	}
-+	rte_eal_set_socket_permissions(path);
- 	if (ret < 0) {
- 		free(vsocket->path);
- 		free(vsocket);
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch
deleted file mode 100644
index 0493053..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Description: scripts: make load-devel-config not to appear as executable
-
-Quoting the first line of the script: "#! /bin/echo must be loaded with ."
-Given that we should drop the .sh file ending as well as the executable
-flag - both are not needed to source the file.
-
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-
-Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15100/
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-08-03
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -27,7 +27,7 @@
- F: scripts/check-maintainers.sh
- F: scripts/check-git-log.sh
- F: scripts/checkpatches.sh
--F: scripts/load-devel-config.sh
-+F: scripts/load-devel-config
- F: scripts/test-build.sh
- 
- Stable Branches
---- a/scripts/checkpatches.sh
-+++ b/scripts/checkpatches.sh
-@@ -33,7 +33,7 @@
- # Load config options:
- # - DPDK_CHECKPATCH_PATH
- # - DPDK_CHECKPATCH_LINE_LENGTH
--. $(dirname $(readlink -e $0))/load-devel-config.sh
-+. $(dirname $(readlink -e $0))/load-devel-config
- 
- length=${DPDK_CHECKPATCH_LINE_LENGTH:-80}
- 
---- /dev/null
-+++ b/scripts/load-devel-config
-@@ -0,0 +1,12 @@
-+# Load DPDK devel config and allow override
-+# from system file
-+test ! -r /etc/dpdk/devel.config ||
-+        . /etc/dpdk/devel.config
-+# from user file
-+test ! -r ~/.config/dpdk/devel.config ||
-+        . ~/.config/dpdk/devel.config
-+# from local file
-+test ! -r $(dirname $(readlink -m $0))/../.develconfig ||
-+        . $(dirname $(readlink -m $0))/../.develconfig
-+
-+# The config files must export variables in the shell style
---- a/scripts/load-devel-config.sh
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#! /bin/echo must be loaded with .
--
--# Load DPDK devel config and allow override
--# from system file
--test ! -r /etc/dpdk/devel.config ||
--        . /etc/dpdk/devel.config
--# from user file
--test ! -r ~/.config/dpdk/devel.config ||
--        . ~/.config/dpdk/devel.config
--# from local file
--test ! -r $(dirname $(readlink -m $0))/../.develconfig ||
--        . $(dirname $(readlink -m $0))/../.develconfig
--
--# The config files must export variables in the shell style
---- a/scripts/test-build.sh
-+++ b/scripts/test-build.sh
-@@ -48,7 +48,7 @@
- # - DPDK_NOTIFY (notify-send)
- # - LIBSSO_SNOW3G_PATH
- # - LIBSSO_KASUMI_PATH
--. $(dirname $(readlink -e $0))/load-devel-config.sh
-+. $(dirname $(readlink -e $0))/load-devel-config
- 
- print_usage () {
- 	echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]"
-@@ -211,7 +211,7 @@
- 	# reload config with DPDK_TARGET set
- 	DPDK_TARGET=$target
- 	reset_env
--	. $(dirname $(readlink -e $0))/load-devel-config.sh
-+	. $(dirname $(readlink -e $0))/load-devel-config
- 
- 	options=$(echo $conf | sed 's,[^~+]*,,')
- 	dir=$conf
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/rte-compile-pre-cppflags.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/rte-compile-pre-cppflags.patch
deleted file mode 100644
index 877c62b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/rte-compile-pre-cppflags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a4d00a8bf4684a4cf101b026c7c49a993cf9b989 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <lboccass@brocade.com>
-Date: Tue, 30 Aug 2016 17:01:49 +0100
-Subject: [PATCH] mk: add missing *CPPFLAGS to rte.compile-pre.mk
-
-Some targets in mk/internal/rte.compile-pre.mk are calling CC or
-HOSTCC without passing CPPFLAGS, EXTRA_CPPFLAGS or HOST_CPPFLAGS,
-HOST_EXTRA_CPPFLAGS.
-On Debian/Ubuntu builds this means that preprocessor flags set by the
-dpkg-buildpackage environment, like hardening flags, are not
-correctly passed to all objects builds.
-
-Signed-off-by: Luca Boccassi <lboccass@brocade.com>
-
-Forwarded: yes
-Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15549/
-Author:  Luca Boccassi <lboccass@brocade.com>
-Last-Update: 2016-08-30
----
- mk/internal/rte.compile-pre.mk | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/mk/internal/rte.compile-pre.mk
-+++ b/mk/internal/rte.compile-pre.mk
-@@ -74,18 +74,18 @@ CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-)
- 
- # command to compile a .c file to generate an object
- ifeq ($(USE_HOST),1)
--C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CFLAGS) \
--	$(CFLAGS_$(@)) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
-+C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \
-+	$(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
- C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
- C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)","  HOSTCC $(@)")
- else
--C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
--	$(CFLAGS_$(@)) $(EXTRA_CFLAGS) -o $@ -c $<
-+C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \
-+	$(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
- C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
- C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)","  CC $(@)")
- endif
- PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c
--PMDINFO_CC = $(CC) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
-+PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
- PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@
- PMDINFO_TO_O = if grep -q 'PMD_REGISTER_DRIVER(.*)' $<; then \
- 	echo "$(if $V,$(PMDINFO_GEN),  PMDINFO $@.pmd.c)" && \
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/rte-devel-build-env.patch b/ovs_build/dpdk_16.07.fuel/debian/patches/rte-devel-build-env.patch
deleted file mode 100644
index a44885b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/rte-devel-build-env.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5a75a37716f69905af29fbd81aef44625eb69a8b Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <lboccass@brocade.com>
-Date: Wed, 14 Sep 2016 11:47:06 +0100
-Subject: [PATCH] mk: use ?= instead of := for RTE_DEVEL_BUILD
-
-RTE_DEVEL_BUILD is set to := y in mk/rte.vars.mk, which makes it
-impossible to override via an environment variable, and forces users
-to pass it inline in the make call.
-Use ?= instead to have it pick up the environment variable as well.
-
-Cc: <stable@dpdk.org>
-Signed-off-by: Luca Boccassi <lboccass@brocade.com>
-
-Forwarded: yes
-Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15795/
-Author:  Luca Boccassi <lboccass@brocade.com>
-Last-Update: 2016-09-14
----
- mk/rte.vars.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
-index 28982a5..21ee0ca 100644
---- a/mk/rte.vars.mk
-+++ b/mk/rte.vars.mk
-@@ -104,7 +104,7 @@ export RTE_TOOLCHAIN
- 
- # developer build automatically enabled in a git tree
- ifneq ($(wildcard $(RTE_SDK)/.git),)
--RTE_DEVEL_BUILD := y
-+RTE_DEVEL_BUILD ?= y
- endif
- 
- # SRCDIR is the current source directory
--- 
-2.1.4
-
diff --git a/ovs_build/dpdk_16.07.fuel/debian/patches/series b/ovs_build/dpdk_16.07.fuel/debian/patches/series
deleted file mode 100644
index c68b612..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/patches/series
+++ /dev/null
@@ -1,13 +0,0 @@
-fix-vhost-user-socket-permission.patch
-fix-double-license-info.patch
-fix-unusual-interpreter.patch
-dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch
-make-load-devel-config-not-to-appear-as-executable.patch
-rte-compile-pre-cppflags.patch
-rte-devel-build-env.patch
-dpdk-dev-v2-1-4-doc-move-tool-guides-in-their-own-subdirectory.patch
-dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch
-dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch
-dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch
-dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch
-dpdk-dev-examples-ip_pipeline-fix-pmd-driver-parameter.patch
diff --git a/ovs_build/dpdk_16.07.fuel/debian/prep-modules b/ovs_build/dpdk_16.07.fuel/debian/prep-modules
deleted file mode 100755
index 3e1f9f8..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/prep-modules
+++ /dev/null
@@ -1,118 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c)  2009-2016 Andreas Beckmann <anbe@debian.org>
-#                2010-2016 Russ Allbery <rra@debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this script.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This script originally comes from:
-# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/prep-modules?view=markup
-# The original copyright and license (GPL2+) can be found at:
-# https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright?view=markup
-#
-# Prepares to build kernel modules.  This script figures out and munges
-# version strings.  The goal is:
-#
-#  * Set the package name to dpdk-modules-$(KVERS) where $(KVERS) is the
-#    major kernel revision plus the debian subrevision and whatever
-#    architecture string is appropriate if building against the stock Debian
-#    kernels.  $(KVERS) should be identical to the version component contained
-#    in the Debian kernel package names (in other words, the ABI version, not
-#    the package version).
-#
-#  * Make the package recommend linux-image-$(KVERS) as appropriate for the
-#    kernel version that we're building against.  Use recommend rather than
-#    depends since the user may have built their own kernel outside of the
-#    Debian package infrastructure.
-#
-#  * Save the version number of the binary package in debian/VERSION for later
-#    use by dh_gencontrol.  This will be the version number of the source
-#    package followed by a + and the version number of the kernel package that
-#    we're building against.  If the kernel package version contains an epoch,
-#    try to hack our way into doing the right thing by using that epoch number
-#    as our own.  This isn't quite the right thing, but seems reasonably good.
-#
-# This script generates debian/control from debian/control.template using sed.
-# Unfortunately, substvars cannot be used since the name of the package is
-# modified and substvars happens too late.  It also outputs debian/VERSION,
-# containing the version of the binary package.
-
-set -e
-
-if [ "$#" -ne 1 ]; then
-    echo "Usage: $0 <kernel-source-location>"
-    exit 1
-fi
-
-# We can get the kernel version from one of three places.  If KVERS and KDREV
-# are both already set in the environment (which will be the case when invoked
-# by make-kpkg or module-assistant), use them.  Otherwise, if we have a kernel
-# source directory that contains debian/changelog (generated by make-kpkg),
-# parse that file to find the version information.  Finally, if neither works,
-# extract the kernel version from the kernel headers, append INT_SUBARCH to
-# that version if it's available, and assume a kernel package revision of -1
-# if none is provided.
-#
-# Set the variables $dpdk_kvers, which will hold the revision of the kernel,
-# and $dpdk_kdrev, which will hold the version of the kernel package that
-# we're building against.
-
-changelog="$1/debian/changelog"
-if [ -n "$KVERS" ] && [ -n "$KDREV" ]; then
-    dpdk_kvers="${KVERS}${INT_SUBARCH}"
-    dpdk_kdrev="${KDREV}"
-elif [ ! -f "$changelog" ] ; then
-    if [ -n "$KVERS" ] ; then
-        dpdk_kvers="$KVERS"
-    else
-        dpdk_kvers=`perl debian/kernel-version "$1"`
-    fi
-    if [ -z "$KDREV" ] ; then
-        dpdk_kdrev="${dpdk_kvers}-1"
-    else
-        dpdk_kvers="${dpdk_kvers}${INT_SUBARCH}"
-        dpdk_kdrev="${KDREV}"
-    fi
-else
-    if [ -n "$KVERS" ] ; then
-        dpdk_kvers="$KVERS"
-    else
-        dpdk_kvers=`head -1 "$changelog" \
-            | sed -e 's/.*source-\([^ ]*\) (\([^)]*\)).*/\1/'`
-    fi
-    dpdk_kdrev=`head -1 "$changelog" \
-        | sed -e 's/.*source-\([^ ]*\) (\([^)]*\)).*/\2/'`
-fi
-
-# Sanitize.
-dpdk_kvers="$(echo "$dpdk_kvers" | tr _ -)"
-dpdk_kdrev="$(echo "$dpdk_kdrev" | tr _ -)"
-
-# Generate the control file from the template.
-
-sed "s/#KVERS#/${dpdk_kvers}/g" debian/control.modules.in > debian/control.modules
-
-# Now, calcuate the binary package version.  Extract the epoch from the kernel
-# package revision and add it to the beginning of the binary package version
-# if present.  Then, concatenate the source version, '+', and the kernel
-# package revision without the epoch.
-
-dpdk_version=`head -1 debian/changelog | sed -e 's/.*(\([^)]*\)).*/\1/'`
-dpdk_epoch=`echo ${dpdk_kdrev} | sed -n -e 's/^\([0-9]*\):.*/\1/p'`
-dpdk_version="${dpdk_version}+`echo ${dpdk_kdrev} | sed 's/^[0-9]*://'`"
-if [ -n "$dpdk_epoch" ] ; then
-    dpdk_version="${dpdk_epoch}:${dpdk_version}"
-fi
-
-echo "$dpdk_version" > debian/VERSION
diff --git a/ovs_build/dpdk_16.07.fuel/debian/rules b/ovs_build/dpdk_16.07.fuel/debian/rules
deleted file mode 100755
index 281dfae..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/rules
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
-
-VERSION := $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
-
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-include /usr/share/dpkg/default.mk
-
-DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-export DEB_CFLAGS_MAINT_APPEND  = -fPIC
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-include /usr/share/dpkg/buildflags.mk
-export EXTRA_CFLAGS=$(CFLAGS)
-export EXTRA_CPPFLAGS=$(CPPFLAGS)
-export HOST_EXTRA_CFLAGS=$(CFLAGS)
-export HOST_EXTRA_CPPFLAGS=$(CPPFLAGS)
-# need to be stripped as DPDK build system adds them and it would be -Wl,-Wl,opt
-export EXTRA_LDFLAGS=$(shell echo $(LDFLAGS) | sed 's/-Wl,//g')
-# HOST_CC build system does not add -Wl ...
-export EXTRA_HOST_LDFLAGS=$(LDFLAGS)
-
-export RTE_DEVEL_BUILD=n
-
-# People rebuilding this package can overwrite DPDK_CONFIG, RTE_MACHINE and
-# RTE_TARGET via DEB_BUILD_OPTIONS if they like
-ifneq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-    DPDK_CONFIG ?= $(patsubst dpdk_config=%,%,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-endif
-ifneq (,$(filter rte_machine=%,$(DEB_BUILD_OPTIONS)))
-    RTE_MACHINE ?= $(patsubst rte_machine=%,%,$(filter rte_machine=%,$(DEB_BUILD_OPTIONS)))
-endif
-ifneq (,$(filter rte_target=%,$(DEB_BUILD_OPTIONS)))
-    RTE_TARGET ?= $(patsubst rte_target=%,%,$(filter rte_target=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64))
-DPDK_CONFIG ?= "arm64-armv8a-linuxapp-gcc"
-RTE_MACHINE ?= "armv8a"
-RTE_TARGET ?= "arm64-armv8a-linuxapp-gcc"
-else
-DPDK_CONFIG ?= "$(DEB_HOST_GNU_CPU)-native-linuxapp-gcc"
-RTE_MACHINE ?= "default"
-RTE_TARGET ?= "$(DEB_HOST_GNU_CPU)-default-linuxapp-gcc"
-endif
-DPDK_STATIC_DIR = "debian/build/static-root"
-DPDK_SHARED_DIR = "debian/build/shared-root"
-
-# kernel_modules can be passed via DEB_BUILD_OPTIONS to enable building the
-# optional binary kernel modules package. By default it will be built against
-# the current kernel, or ksrc can be passed with a path to the target kernel
-# sources instead.
-ifeq (,$(findstring kernel_modules,$(DEB_BUILD_OPTIONS)))
-DPDK_CONFIG_BUILD_KMOD=n
-KSRC=""
-else
-ifneq (,$(filter ksrc=%,$(DEB_BUILD_OPTIONS)))
-    KSRC := $(patsubst ksrc=%,%,$(filter ksrc=%,$(DEB_BUILD_OPTIONS)))
-else
-    KSRC := /lib/modules/$(shell uname -r)/build
-endif
-
-KVERS := $(shell perl debian/kernel-version $(KSRC))
-export KVERS
-
-DPDK_CONFIG_BUILD_KMOD=y
-
-# Since the binary module package is generated at build time depending on the
-# local kernel version, we have to append the new package in d/control.
-# We cannot use a separate control file since that wouldn't work with
-# dpkg-genchanges, and also would require a lot of overrides for debhelpers.
-get_built_using	?= $(filter-out (=),$(shell dpkg-query -f='$${source:Package} (=$${source:Version})' -W $1))
-
-override_dh_gencontrol:
-	dh_gencontrol
-	dh_gencontrol -p dpdk-modules-$(KVERS) -- \
-		-v`cat debian/VERSION` \
-		-V'built:using:kernel=$(call get_built_using,linux-headers-$(KVERS))'
-
-build:
-	@if [ x"$(KVERS)" = x ] ; then \
-	    echo 'No version in $(KSRC)/include/linux/version.h' >&2; \
-	    exit 1; \
-	fi
-	sh debian/prep-modules $(KSRC)
-	cat debian/control.modules >> debian/control
-	dh $@ --with python2,dkms
-endif
-
-%:
-	dh $@ --with python2,dkms
-
-override_dh_auto_clean:
-	rm -rf debian/build debian/tmp debian/dpdk-modules-* \
-		debian/control.modules debian/VERSION
-	sed -i '/Package: dpdk-modules-/,/`tail -n1 debian/control.modules.in`/d' debian/control
-	test -L config/defconfig_$(DPDK_CONFIG) && rm -f config/defconfig_$(DPDK_CONFIG) || true
-
-override_dh_auto_configure:
-	# Add support for a custom defconfig file in the debian directory.
-ifneq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-	test -e config/defconfig_$(DPDK_CONFIG) || ln -fs ../debian/defconfig_$(DPDK_CONFIG) config/defconfig_$(DPDK_CONFIG)
-endif
-	# report dpkg-buildflags status to build log
-	dpkg-buildflags --status
-	echo EXTRA_CFLAGS $$EXTRA_CFLAGS
-	echo EXTRA_LDFLAGS: $$EXTRA_LDFLAGS
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) T=$(DPDK_CONFIG) config
-ifeq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-	sed -ri -e 's,(RTE_MACHINE=).*,\1$(RTE_MACHINE),' \
-		-e 's,(RTE_NEXT_ABI=).*,\1n,' \
-		-e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
-		-e 's,(CONFIG_RTE_KNI_KMOD=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
-		-e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \
-		-e 's,(LIBRTE_PMD_XENVIRT=).*,\1y,' \
-		-e 's,(CONFIG_RTE_EAL_PMD_PATH=).*,\1"/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/dpdk-pmds/",' \
-		$(DPDK_STATIC_DIR)/.config
-endif
-	dh_auto_configure
-
-override_dh_auto_build-indep:
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html \
-		doc-guides-man
-
-override_dh_auto_install-indep:
-	# Package: dpdk-doc
-	# All files based on the install-doc rule (includes examples)
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) prefix=/usr \
-		DESTDIR=debian/dpdk-doc install-doc
-
-override_dh_auto_build-arch:
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) RTE_KERNELDIR=$(KSRC) build
-	# Unfortunately the decision about having static or shared libraries is
-	# made for the whole build, which then produces only .a or .so files
-	# (but not both).
-	# And the target layout for target selection has no field for the
-	# type of library.
-	# Right now I hack this by doing a second build which only differs in
-	# the selection of shared libs.
-	# Shared libs should be default, so the previous static build is only
-	# used to get static libraries.
-	cp -a $(DPDK_STATIC_DIR) $(DPDK_SHARED_DIR)
-	sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' \
-		$(DPDK_SHARED_DIR)/.config
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) build
-
-override_dh_auto_install-arch: LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-override_dh_auto_install-arch:
-	# Package: dpdk (runtime)
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) prefix=/usr \
-		DESTDIR=debian/dpdk install-runtime
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr \
-		DESTDIR=debian/dpdk install-runtime
-	mkdir -p debian/dpdk/etc/dpdk
-	cp debian/dpdk.interfaces debian/dpdk/etc/dpdk/interfaces
-	rm debian/dpdk/usr/sbin/dpdk-devbind
-	mkdir -p debian/dpdk/sbin
-	ln -s /usr/share/dpdk/tools/dpdk-devbind.py \
-		debian/dpdk/sbin/dpdk-devbind
-	# do not provide dpdk-pmdinfo in path for now  (LP: #1630073)
-	rm debian/dpdk/usr/bin/dpdk-pmdinfo
-	# Package: dpdk-dev (build environment)
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr \
-		DESTDIR=debian/dpdk-dev install-sdk
-	cp $(DPDK_SHARED_DIR)/.config debian/dpdk-dev/usr/share/dpdk/config
-	sed -e 's/SDK_TARGET/$(RTE_TARGET)/' debian/dpdk-sdk-env.sh.in > \
-		debian/dpdk-dev/usr/share/dpdk/dpdk-sdk-env.sh
-	# Package: libdpdk-dev (bare headers, static devel libs and linker
-	# script)
-	mkdir -p debian/libdpdk-dev/$(LIBDIR)
-	# linker script
-	mv debian/dpdk/usr/lib/libdpdk.so debian/libdpdk-dev/$(LIBDIR)/
-	# includes
-	mkdir -p debian/libdpdk-dev/usr/include
-	mv debian/dpdk-dev/usr/include/dpdk debian/libdpdk-dev/usr/include/
-	# all static libs are in the dev package
-	mv debian/dpdk/usr/lib/lib*.a debian/libdpdk-dev/$(LIBDIR)/
-	# symlinks to last .so's are in the non versioned libdpdk-dev as well
-	# this allows multiple libdpdk-<NAME><VER> at different VER concurrently
-	# libdpdk-dev depends on all sublibs so symlinks are never broken
-	mv debian/dpdk/usr/lib/*.so debian/libdpdk-dev/$(LIBDIR)/
-	# Package(s): libdpdk-<NAME><VER> (bare runtime libs)
-	for lib in $$(ls -1 debian/dpdk/usr/lib/*.so.*); do \
-	  BN=$$(basename $${lib}); \
-	  VER=$$(echo $${BN} | sed -e 's/^.*\.so\.//'); \
-	  LN=$$(echo $${BN} | sed -e 's/\.so\.[0-9]*$$//' | tr '_' '-'); \
-	  if echo $${LN} | grep -q ".*[0-9]$$"; then \
-	    PKG=$${LN}-$${VER}; \
-	  else \
-	    PKG=$${LN}$${VER}; \
-	  fi; \
-	  LIBF="$$(basename $${lib})"; \
-	  LIBD="debian/$${PKG}/$(LIBDIR)"; \
-	  echo "moving $${lib} for library $${PKG}"; \
-	  mkdir -p $${LIBD}; \
-	  mv $${lib} $${LIBD}; \
-	  if [ "$${LIBF#librte_pmd_}x" != "$${LIBF}x" ]; then \
-	    mkdir -p $${LIBD}/dpdk-pmds; \
-	    echo "PMD: linking $${LIBF} into RTE_EAL_PMD_PATH at $${LIBD}/dpdk-pmds/"; \
-	    ln -s --relative --target-directory=$${LIBD}/dpdk-pmds/ $${LIBD}/$${LIBF}; \
-	  fi; \
-	  if [ "$${LIBF#librte_eal}x" != "$${LIBF}x" ]; then \
-	    mkdir -p $${LIBD}/dpdk-pmds; \
-	  fi; \
-	done
-	# pkg-config
-	mkdir -p debian/libdpdk-dev/$(LIBDIR)/pkgconfig
-	LIBS=$$(sed -e 's/GROUP ( \(.*\) )/\1/' -e 's/lib/-l/g' -e 's/\.so//g' \
-		$(CURDIR)/debian/libdpdk-dev/$(LIBDIR)/libdpdk.so); \
-	sed -e "s/@DPDK_LIBS@/$${LIBS}/" -e "s/@VERSION@/$(VERSION)/" \
-		debian/libdpdk.pc.in > debian/libdpdk-dev/$(LIBDIR)/pkgconfig/libdpdk.pc
-	# Package: dpdk-igb-uio-dkms
-	mkdir -p debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION)
-	cp lib/librte_eal/linuxapp/igb_uio/* \
-		debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION)
-	# Package: dpdk-rte-kni-dkms
-	mkdir -p debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
-	cp -a lib/librte_eal/linuxapp/kni/* \
-		debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
-ifneq (,$(KVERS))
-	# Package: dpdk-modules-<kernel version>
-	mkdir -p debian/dpdk-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net
-	cp -a debian/build/shared-root/kmod/* \
-		debian/dpdk-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net
-endif
-
-override_dh_dkms:
-	dh_dkms -V $(VERSION)
-
-override_dh_installinit:
-	dh_installinit --no-start --no-restart-on-upgrade
-
-override_dh_systemd_start:
-	dh_systemd_start --no-start --no-restart-on-upgrade
-
-override_dh_auto_test:
-
diff --git a/ovs_build/dpdk_16.07.fuel/debian/source/format b/ovs_build/dpdk_16.07.fuel/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ovs_build/dpdk_16.07.fuel/debian/source/options b/ovs_build/dpdk_16.07.fuel/debian/source/options
deleted file mode 100644
index 5fd30a1..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-extend-diff-ignore = '(^|/)(\.gitreview|\.git)$'
diff --git a/ovs_build/dpdk_16.07.fuel/debian/tests/check-dpdk-supported-arch.sh b/ovs_build/dpdk_16.07.fuel/debian/tests/check-dpdk-supported-arch.sh
deleted file mode 100644
index 3de6e46..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/tests/check-dpdk-supported-arch.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-arch=$(dpkg --print-architecture)
-case $arch in
-    amd64|arm64|i386)
-        echo "Architecture ${arch} supported, go on with test"
-        ;;
-    *)
-        echo "Architecture ${arch} not supported, SKIP test"
-        exit 0
-        ;;
-esac
diff --git a/ovs_build/dpdk_16.07.fuel/debian/tests/control b/ovs_build/dpdk_16.07.fuel/debian/tests/control
deleted file mode 100644
index 5afed74..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/tests/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Tests: test-initscripts
-Restrictions: allow-stderr, isolation-machine, needs-root
-Depends: dpdk [amd64 arm64 i386], gawk, mount, systemd, sysvinit-utils
-
-Tests: test-linkage
-Restrictions: allow-stderr
-Depends: libdpdk-dev [amd64 arm64 i386], libc6, libc6-dev, gcc,
- grep, libpcap-dev, libxenstore3.0 [amd64 arm64 i386], pax-utils
-
-Tests: test-dkms
-Restrictions: allow-stderr, isolation-machine, needs-root
-Depends: kmod, dpdk-igb-uio-dkms [amd64 arm64 i386],
- dpdk-rte-kni-dkms [amd64 arm64 i386]
diff --git a/ovs_build/dpdk_16.07.fuel/debian/tests/test-dkms b/ovs_build/dpdk_16.07.fuel/debian/tests/test-dkms
deleted file mode 100644
index 5db36af..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/tests/test-dkms
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-set -eu
-
-basedir=$(dirname "$0")
-. "${basedir}"/check-dpdk-supported-arch.sh
-
-if [ -d /var/lib/dkms ]; then
-    (cd /var/lib/dkms; find -name "make.log" -print0 | xargs -0 tar c) > "$ADT_ARTIFACTS/dkms-make-logs.tar"
-fi
-
-# check that the dkms build fine (on dep install), load and unload
-printf "\n\nChecking igb_uio\n"
-modinfo igb_uio
-modprobe igb_uio
-rmmod igb_uio
-echo "OK"
-
-printf "\n\nChecking igb_uio\n"
-modinfo rte_kni
-modprobe rte_kni
-rmmod rte_kni
-echo "OK"
diff --git a/ovs_build/dpdk_16.07.fuel/debian/tests/test-initscripts b/ovs_build/dpdk_16.07.fuel/debian/tests/test-initscripts
deleted file mode 100644
index 069c57b..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/tests/test-initscripts
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-set -e
-
-basedir=$(dirname "$0")
-. "${basedir}"/check-dpdk-supported-arch.sh
-
-# Overall that could require up to 1.2G for hugepages in the test environment
-EXPECT2MHP=10
-# Some page sizes like e.g. 1G might not be available in all test environments
-# The test still configures 1 page of 1G size.
-# One of two things will happen, depending on the test environment:
-# - has 1G huge page size => they will tried to be allocated (usually env is
-#   too small, but we want to see it fail gracefully for that)
-#   We will not check for the 1G alloc, as we know it often fails in small adt's
-# - has no 1G huge page size (HW feature) => we check if it fails gracefully
-EXPECT1GHP=1
-
-DPDK_CONF="/etc/dpdk/dpdk.conf"
-DPDK_INTERF="/etc/dpdk/interfaces"
-
-checkhp() {
-    MMDIR="/sys/kernel/mm/hugepages/${1}"
-    EXPECTHP="${2}"
-    if [ -d "$MMDIR" -a -r "$MMDIR/nr_hugepages" ]; then
-        hpcount=$(cat "$MMDIR/nr_hugepages")
-        if [ "${hpcount}" -ne "${EXPECTHP}" ]; then
-            echo "Hugepages (${hpcount}) not as expected (${EXPECTHP})"
-            exit 1
-        else
-            echo "Hugepages ok (${hpcount})"
-        fi
-    fi
-}
-
-checkstatus() {
-    MARK=${1}
-    EXPMPCOUNT=${2}
-    PRE=${3}
-    POST=${4}
-    EXPECTEDSTATUS=${5}
-    echo "Status after ${MARK}"
-    echo "Status of the Service"
-    ${PRE} status "${POST}" || true
-
-    GOTSTATUS=$(${PRE} status "${POST}" | awk '/^ *Active: / { print $2 }')
-    if [ "${GOTSTATUS}" != "${EXPECTEDSTATUS}" ]; then
-        echo "Service status (${GOTSTATUS}) not as expected (${EXPECTEDSTATUS})"
-        exit 1
-    else
-        echo "Service status (${GOTSTATUS}) as expected"
-    fi
-
-    echo "Status of hugetlbfs mount points"
-    # this section is ok to create bad RCs when no mounts are available
-    set +e
-    grep hugetlbfs < /proc/mounts
-    htlbfscount=$(grep -c hugetlbfs < /proc/mounts)
-    set -e
-
-    # we have to reduce the expected mountpoint count in case some sizes are
-    # not supported by the current kernel/environment
-    if [ ${EXPMPCOUNT} -gt 0 ]; then
-        if [ ! -d /sys/kernel/mm/hugepages/hugepages-2048kB ]; then
-            EXPMPCOUNT=$((EXPMPCOUNT-1))
-        fi
-        if [ ! -d /sys/kernel/mm/hugepages/hugepages-1048576kB ]; then
-            EXPMPCOUNT=$((EXPMPCOUNT-1))
-        fi
-    fi
-
-    if [ "${htlbfscount}" -eq "${EXPMPCOUNT}" ]; then
-        echo "MP Count (${htlbfscount}) as expected (${EXPMPCOUNT})"
-    else
-        echo "MP Count (${htlbfscount}) not as expected (${EXPMPCOUNT})"
-        exit 1
-    fi
-
-    # check if setting HP worked
-    if [ "${EXPMPCOUNT}" -ne "0" ]; then
-        checkhp "hugepages-2048kB" "${EXPECT2MHP}"
-        # We do not check 1G alloc, as it is known to be often not available
-    fi
-}
-
-resetservice() {
-    # help a bit with memory fragmentation regarding huge page allocation
-    sync
-    echo 3 > /proc/sys/vm/drop_caches
-
-    # stopping and resetting Service
-    systemctl stop dpdk.service || /bin/true
-    systemctl reset-failed dpdk.service || /bin/true
-
-    echo "Unmounting all potential hugetlbfs mounts"
-    awk '/hugetlbfs/ {print $2}' /proc/mounts | while read hugetlbmount; do
-        umount -v "$hugetlbmount"
-    done
-}
-
-checkinitstyle() {
-    # We want to verify that
-    # - initially our environment has no hugetlbfs mount
-    # - a system without hugetlbfs mount gets it mounted
-    # - a restart of the service does neither drop nor duplicate the mount
-    PRE=${1}
-    POST=${2}
-    TYPE=${3}
-    printf "\n\n### Checking Type %s ###\n" "${TYPE}"
-    resetservice
-    checkstatus "${TYPE}-BEGIN" 0 "${PRE}" "${POST}" "inactive"
-    echo "### Starting Service ###"
-    ${PRE} start "${POST}"
-    checkstatus "${TYPE}-START" 2 "${PRE}" "${POST}" "active"
-    echo "### Restarting Service ###"
-    ${PRE} restart "${POST}"
-    checkstatus "${TYPE}-RESTART" 2 "${PRE}" "${POST}" "active"
-}
-
-echo "NR_2M_PAGES=$EXPECT2MHP" >> ${DPDK_CONF}
-echo "NR_1G_PAGES=$EXPECT1GHP" >> ${DPDK_CONF}
-
-# We can't rely on any real device for DPDK tests in adt-* environments. But
-# we can expect all kind of broken configuration not to break it (would be
-# detected via set -e).
-# So add all kind of known-to-be-broken definitions and expect it not to fail.
-cat <<EOF > ${DPDK_INTERF}
-# wrong bus
-pTi 0000:04:00.0 uio-pci-generic
-# not enough parms
-0000:04:00.0 uio-pci-generic
-# empty line
-
-# non existing device
-pci 1234:56:78.9 uio-pci-generic
-EOF
-
-# some had issues in the past caused by different init systems, so we test all
-# Direct Calls
-checkinitstyle "/etc/init.d/dpdk" "" "Direct"
-# System V style init
-checkinitstyle "service dpdk" "" "SysV"
-# SystemD style init
-checkinitstyle "systemctl" "dpdk.service" "SystemD"
diff --git a/ovs_build/dpdk_16.07.fuel/debian/tests/test-linkage b/ovs_build/dpdk_16.07.fuel/debian/tests/test-linkage
deleted file mode 100644
index fabe1c8..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/tests/test-linkage
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-set -eu
-
-basedir=$(dirname "$0")
-. "${basedir}"/check-dpdk-supported-arch.sh
-
-cat > testlinkage.c << EOF
-#include <stdio.h>
-#include "dpdk/rte_common.h"
-
-int main()
-{
-        printf("Hello rte_exit %p\n", rte_exit);
-        return 0;
-}
-EOF
-
-# -ldpdk actually refers to a linker script now, not a real .so
-# with broken linkage this will fail with undefined symbols
-printf "\n\nChecking compile with link against DPDK\n"
-gcc -v testlinkage.c -o testlinkage.bin -Wall -Werror -ldpdk
-echo "OK"
-
-printf "\n\nLinkage info\n"
-lddtree testlinkage.bin
-
-printf "\n\nChecking for expected internal libraries\n"
-# a few of the sublibs that it should use
-lddtree testlinkage.bin | grep '^    librte_eal.so'
-echo "OK"
-
-printf "\n\nChecking for expected secondary library dependencies\n"
-lddtree testlinkage.bin | grep '^        libpthread.so'
-lddtree testlinkage.bin | grep '^        librt.so'
-echo "OK"
-
-printf "\n\nChecking for expected feature dependent library dependencies\n"
-# features only used by the lib that we enabled
-ldd /usr/lib/*/librte_pmd_pcap.so | grep libpcap
-ldd /usr/lib/*/librte_pmd_xenvirt.so | grep libxenstore
-echo "OK"
-
-printf "\n\nChecking test execution\n"
-# It doesn't do much, but it should work - so calling it is a minor extra test.
-# It is known to fail without SSE3 in e.g. some adt environments, in that
-# case check at least that we get the correct error message (this will trigger
-# a test fail if it neither finds the success nor the expected error message)
-(./testlinkage.bin 2>&1 || /bin/true ) | \
-grep -E 'ERROR: This system does not support "SSSE3".|Hello rte_exit 0x'
-
-echo "OK"
diff --git a/ovs_build/dpdk_16.07.fuel/debian/watch b/ovs_build/dpdk_16.07.fuel/debian/watch
deleted file mode 100644
index 5de4f73..0000000
--- a/ovs_build/dpdk_16.07.fuel/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://fast.dpdk.org/rel/dpdk-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/automake.mk b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/automake.mk
deleted file mode 100644
index 95e07dd..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/automake.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-check-debian-changelog-version:
-	@DEB_VERSION=`echo '$(VERSION)' | sed 's/pre/~pre/'`;		     \
-	if $(FGREP) '($(DEB_VERSION)' $(srcdir)/debian/changelog >/dev/null; \
-	then								     \
-	  :;								     \
-	else								     \
-	  echo "Update debian/changelog to mention version $(VERSION)";	     \
-	  exit 1;							     \
-	fi
-ALL_LOCAL += check-debian-changelog-version
-DIST_HOOKS += check-debian-changelog-version
-
-$(srcdir)/debian/copyright: AUTHORS debian/copyright.in
-	$(AM_V_GEN) \
-	{ sed -n -e '/%AUTHORS%/q' -e p < $(srcdir)/debian/copyright.in;   \
-	  sed '1,/^$$/d' $(srcdir)/AUTHORS |				   \
-		sed -n -e '/^$$/q' -e 's/^/  /p';			   \
-	  sed -e '1,/%AUTHORS%/d' $(srcdir)/debian/copyright.in;	   \
-	} > $@
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/compat b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/control b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/control
deleted file mode 100644
index e0c27c5..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/control
+++ /dev/null
@@ -1,54 +0,0 @@
-Source: openvswitch-dpdk
-Section: net
-Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Open vSwitch developers <dev@openvswitch.org>
-Uploaders: Ben Pfaff <pfaffben@debian.org>,
-           Simon Horman <horms@debian.org>,
-Build-Depends: autoconf (>= 2.64),
-               automake (>= 1.10) | automake1.10,
-               bzip2,
-               debhelper (>= 9~),
-               dh-autoreconf,
-               dh-systemd (>= 1.5),
-               graphviz,
-               libdpdk-dev,
-               libfuse-dev,
-               libssl-dev,
-               libtool,
-               openssl,
-               procps,
-               python-all (>= 2.6.6-3~),
-               python-qt4,
-               python-twisted-conch,
-               python-zopeinterface,
-Standards-Version: 3.9.6
-Homepage: http://openvswitch.org/
-XS-Testsuite: autopkgtest
-
-Package: openvswitch-switch-dpdk
-Architecture: i386 amd64 arm64
-Depends: dpdk,
-         openvswitch-switch (>= 2.4.0),
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends},
-Enhances: openvswitch-switch,
-Description: DPDK enabled Open vSwitch switch implementation
- Open vSwitch is a production quality, multilayer, software-based,
- Ethernet virtual switch. It is designed to enable massive network
- automation through programmatic extension, while still supporting
- standard management interfaces and protocols (e.g. NetFlow, IPFIX,
- sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
- to support distribution across multiple physical servers similar to
- VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
- .
- openvswitch-switch provides the userspace components and utilities for
- the Open vSwitch kernel-based switch.
- .
- DPDK is a set of libraries for fast packet processing. Applications run
- in user-space and communicate directly with dedicated network interfaces.
- This package contains the runtime environment to run DPDK applications.
- .
- This package provides a DPDK enabled implementation of the ovs-vswitchd
- binary.
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright
deleted file mode 100644
index d840e4e..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright
+++ /dev/null
@@ -1,716 +0,0 @@
-The original sources for this package can be found at:
-
-	http://openvswitch.org/
-
-Upstream Authors (from AUTHORS):
-
-%AUTHORS%
-
-Upstream Copyright Holders:
-
-	Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
-	Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
-	Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
-	and authors listed above.
-	Copyright (c) 2011 Gaetano Catalli
-	Copyright (C) 2000-2003 Geoffrey Wossum (gwossum@acm.org)
-	Copyright (C) 2000 The NetBSD Foundation, Inc.
-	Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
-	Copyright (c) 1982, 1986, 1990, 1993 The Regents of the University of California.
-	Copyright (c) 2008, 2012 Vincent Bernat <bernat@luffy.cx>
-	Copyright (c) 2014 Michael Chapman
-	Copyright (c) 2014 WindRiver, Inc.
-	Copyright (c) 2014 Avaya, Inc.
-
-License:
-
-* The following components are licensed under the
-  GNU Lesser General Public License version 2.1 only
-  with the exception clause below as a pre-amble.
-
-	xenserver/etc_xensource_scripts_vif
-	xenserver/opt_xensource_libexec_InterfaceReconfigure.py
-	xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
-	xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
-	xenserver/opt_xensource_libexec_interface-reconfigure
-	xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
-
-	* These components are only distributed in the source package.
-	  They do not appear in any binary packages.
-
-  On Debian systems, the complete text of the
-  GNU Lesser General Public License version 2.1 can be found in
-  `/usr/share/common-licenses/LGPL-2.1'
-
-  The exception clause pre-amble reads:
-
-  As a special exception to the GNU Lesser General Public License, you
-  may link, statically or dynamically, a "work that uses the Library"
-  with a publicly distributed version of the Library to produce an
-  executable file containing portions of the Library, and distribute
-  that executable file under terms of your choice, without any of the
-  additional requirements listed in clause 6 of the GNU Lesser General
-  Public License.  By "a publicly distributed version of the Library",
-  we mean either the unmodified Library as distributed, or a
-  modified version of the Library that is distributed under the
-  conditions defined in clause 3 of the GNU Library General Public
-  License.  This exception does not however invalidate any other reasons
-  why the executable file might be covered by the GNU Lesser General
-  Public License.
-
-* The following components are licensed under the
-  GNU Lesser General Public License version 2.1.
-
-	utilities/bugtool/ovs-bugtool
-	utilities/bugtool/ovs-bugtool-*
-	utilities/bugtool/plugins/kernel-info/openvswitch.xml
-	utilities/bugtool/plugins/network-status/openvswitch.xml
-	utilities/bugtool/plugins/system-configuration.xml
-	utilities/bugtool/plugins/system-configuration/openvswitch.xml
-
-  On Debian systems, the complete text of the
-  GNU Lesser General Public License version 2.1 can be found in
-  `/usr/share/common-licenses/LGPL-2.1'
-
-* The following component is licensed under the GNU General Public License
-  version 2.
-
-	datapath/
-
-  On Debian systems, the complete text of the GNU General Public License
-  version 2 can be found in `/usr/share/common-licenses/GPL-2'
-
-* The following file is licensed under the GNU General Public License
-  version 2.
-
-	build-aux/cccl
-
-* The following files are licensed under the 2-clause BSD license.
-
-	lib/getopt_long.c
-	include/windows/getopt.h
-
-* The following files are licensed under the 3-clause BSD-license
-
-	include/windows/netinet/icmp6.h
-	include/windows/netinet/ip6.h
-	lib/strsep.c
-
-* The following components are dual-licensed under the
-  GNU General Public License version 2 and the Apache License Version 2.0.
-
-	datapath/linux/compat/include/linux/openvswitch.h
-
-  On Debian systems, the complete text of the GNU General Public License
-  version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-  On Debian systems, the complete text of the Apache License version 2.0
-  can be found in '/usr/share/common-licenses/Apache-2.0'.
-
-* The following components are licensed under the terms of either the
-  Sun Industry Standard Source License 1.1 or the InMon sFlow License:
-
-	lib/sflow.h
-	lib/sflow_agent.c
-	lib/sflow_api.h
-	lib/sflow_poller.c
-	lib/sflow_receiver.c
-	lib/sflow_sampler.c
-
-  These licenses are available, respectively, the following URLs:
-
-        http://host-sflow.sourceforge.net/sissl.html
-        http://www.inmon.com/technology/sflowlicense.txt
-
-  The full text of each license is also appended to the end of this
-  file.
-
-* The following components are licensed for use as desired without restriction:
-
-	lib/crc32c.c
-
-* The following components are licensed under the
-  Python Software Foundation License Version 2.
-
-	python/compat/uuid.py
-	python/compat/argparse.py
-
-	* These components are only distributed in the source package.
-	  They do not appear in any binary packages.
-
-   PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-   --------------------------------------------
-
-   1. This LICENSE AGREEMENT is between the Python Software Foundation
-   ("PSF"), and the Individual or Organization ("Licensee") accessing and
-   otherwise using this software ("Python") in source or binary form and
-   its associated documentation.
-
-   2. Subject to the terms and conditions of this License Agreement, PSF
-   hereby grants Licensee a nonexclusive, royalty-free, world-wide
-   license to reproduce, analyze, test, perform and/or display publicly,
-   prepare derivative works, distribute, and otherwise use Python
-   alone or in any derivative version, provided, however, that PSF's
-   License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-   2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation;
-   All Rights Reserved" are retained in Python alone or in any derivative
-   version prepared by Licensee.
-
-   3. In the event Licensee prepares a derivative work that is based on
-   or incorporates Python or any part thereof, and wants to make
-   the derivative work available to others as provided herein, then
-   Licensee hereby agrees to include in any such work a brief summary of
-   the changes made to Python.
-
-   4. PSF is making Python available to Licensee on an "AS IS"
-   basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-   IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-   DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-   FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-   INFRINGE ANY THIRD PARTY RIGHTS.
-
-   5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-   FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-   A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-   OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-   6. This License Agreement will automatically terminate upon a material
-   breach of its terms and conditions.
-
-   7. Nothing in this License Agreement shall be deemed to create any
-   relationship of agency, partnership, or joint venture between PSF and
-   Licensee.  This License Agreement does not grant permission to use PSF
-   trademarks or trade name in a trademark sense to endorse or promote
-   products or services of Licensee, or any third party.
-
-   8. By copying, installing or otherwise using Python, Licensee
-   agrees to be bound by the terms and conditions of this License
-   Agreement.
-
-* lib/ovs.tmac in the source distribution, and manpages in the
-  binaries, includes troff macros from groff 1.21 that contain the
-  following notice:
-
-    .\" an-ext.tmac
-    .\"
-    .\" Written by Eric S. Raymond <esr@thyrsus.com>
-    .\"            Werner Lemberg <wl@gnu.org>
-    .\"
-    .\" Version 2007-Feb-02
-    .\"
-    .\" Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
-    .\" You may freely use, modify and/or distribute this file.
-
-* m4/absolute-header.m4, by Derek Price, and m4/include_next.m4, by
-  Paul Eggert and Derek Price bear the following notices:
-
-    Copyright (C) 2006-2013 Free Software Foundation, Inc.
-    This file is free software; the Free Software Foundation
-    gives unlimited permission to copy and/or distribute it,
-    with or without modifications, as long as this notice is preserved.
-
-* The following files are licensed under the ISC-license
-
-    lib/lldp/aa-structs.h
-    lib/lldp/lldpd.c
-    lib/lldp/lldpd.h
-    lib/lldp/lldpd-structs.c
-    lib/lldp/lldpd-structs.h
-    lib/lldp/lldp.c
-    lib/lldp/lldp-tlv.h
-    lib/lldp/lldp-const.h
-
-* All other components of this package are licensed under
-  The Apache License Version 2.0.
-
-  On Debian systems, the complete text of the Apache License version 2.0
-  can be found in '/usr/share/common-licenses/Apache-2.0'.
-
-----------------------------------------------------------------------
-
-Retrieved from http://host-sflow.sourceforge.net/sissl.html, 2011-12-12:
-
-   Sun Industry Standards Source License - Version 1.1
-
-   1.0 DEFINITIONS
-
-   1.1 "Commercial Use" means distribution or otherwise making the
-   Original Code available to a third party.
-
-   1.2 "Contributor Version" means the combination of the Original Code,
-   and the Modifications made by that particular Contributor.
-
-   1.3 "Electronic Distribution Mechanism" means a mechanism generally
-   accepted in the software development community for the electronic
-   transfer of data.
-
-   1.4 "Executable" means Original Code in any form other than Source
-   Code.
-
-   1.5 "Initial Developer" means the individual or entity identified as
-   the Initial Developer in the Source Code notice required by Exhibit A.
-
-   1.6 "Larger Work" means a work which combines Original Code or portions
-   thereof with code not governed by the terms of this License.
-
-   1.7 "License" means this document.
-
-   1.8 "Licensable" means having the right to grant, to the maximum extent
-   possible, whether at the time of the initial grant or subsequently
-   acquired, any and all of the rights conveyed herein.
-
-   1.9 "Modifications" means any addition to or deletion from the
-   substance or structure of either the Original Code or any previous
-   Modifications. A Modification is:
-
-   A. Any addition to or deletion from the contents of a file containing
-   Original Code or previous Modifications.
-
-   B. Any new file that contains any part of the Original Code or previous
-   Modifications.
-
-   1.10 "Original Code" means Source Code of computer software code which
-   is described in the Source Code notice required by Exhibit A as
-   Original Code.
-
-   1.11 "Patent Claims" means any patent claim(s), now owned or hereafter
-   acquired, including without limitation, method, process, and apparatus
-   claims, in any patent Licensable by grantor.
-
-   1.12 "Source Code" means the preferred form of the Original Code for
-   making modifications to it, including all modules it contains, plus any
-   associated interface definition files, or scripts used to control
-   compilation and installation of an Executable.
-
-   1.13 "Standards" means the standards identified in Exhibit B.
-
-   1.14 "You" (or "Your") means an individual or a legal entity exercising
-   rights under, and complying with all of the terms of, this License or a
-   future version of this License issued under Section 6.1. For legal
-   entities, "You'' includes any entity which controls, is controlled by,
-   or is under common control with You. For purposes of this definition,
-   "control'' means (a) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (b) ownership of more than fifty percent (50%) of the
-   outstanding shares or beneficial ownership of such entity.
-
-   2.0 SOURCE CODE LICENSE
-
-   2.1 The Initial Developer Grant
-   The Initial Developer hereby grants You a world-wide, royalty-free,
-   non-exclusive license, subject to third party intellectual property
-   claims:
-
-   (a) under intellectual property rights (other than patent or trademark)
-   Licensable by Initial Developer to use, reproduce, modify, display,
-   perform, sublicense and distribute the Original Code (or portions
-   thereof) with or without Modifications, and/or as part of a Larger
-   Work; and
-
-   (b) under Patents Claims infringed by the making, using or selling of
-   Original Code, to make, have made, use, practice, sell, and offer for
-   sale, and/or otherwise dispose of the Original Code (or portions
-   thereof).
-
-   (c) the licenses granted in this Section 2.1(a) and (b) are effective
-   on the date Initial Developer first distributes Original Code under the
-   terms of this License.
-
-   (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
-   1) for code that You delete from the Original Code; 2) separate from
-   the Original Code; or 3) for infringements caused by: i) the
-   modification of the Original Code or ii) the combination of the
-   Original Code with other software or devices, including but not limited
-   to Modifications.
-   3.0 DISTRIBUTION OBLIGATIONS
-
-   3.1 Application of License.
-   The Source Code version of Original Code may be distributed only under
-   the terms of this License or a future version of this License released
-   under Section 6.1, and You must include a copy of this License with
-   every copy of the Source Code You distribute. You may not offer or
-   impose any terms on any Source Code version that alters or restricts
-   the applicable version of this License or the recipients' rights
-   hereunder. Your license for shipment of the Contributor Version is
-   conditioned upon Your full compliance with this Section. The
-   Modifications which You create must comply with all requirements set
-   out by the Standards body in effect one hundred twenty (120) days
-   before You ship the Contributor Version. In the event that the
-   Modifications do not meet such requirements, You agree to publish
-   either (i) any deviation from the Standards protocol resulting from
-   implementation of Your Modifications and a reference implementation of
-   Your Modifications or (ii) Your Modifications in Source Code form, and
-   to make any such deviation and reference implementation or
-   Modifications available to all third parties under the same terms as
-   this license on a royalty free basis within thirty (30) days of Your
-   first customer shipment of Your Modifications.
-
-   3.2 Required Notices.
-   You must duplicate the notice in Exhibit A in each file of the Source
-   Code. If it is not possible to put such notice in a particular Source
-   Code file due to its structure, then You must include such notice in a
-   location (such as a relevant directory) where a user would be likely to
-   look for such a notice. If You created one or more Modification(s) You
-   may add Your name as a Contributor to the notice described in Exhibit
-   A. You must also duplicate this License in any documentation for the
-   Source Code where You describe recipients' rights or ownership rights
-   relating to Initial Code. You may choose to offer, and to charge a fee
-   for, warranty, support, indemnity or liability obligations to one or
-   more recipients of Your version of the Code. However, You may do so
-   only on Your own behalf, and not on behalf of the Initial Developer.
-   You must make it absolutely clear than any such warranty, support,
-   indemnity or liability obligation is offered by You alone, and You
-   hereby agree to indemnify the Initial Developer for any liability
-   incurred by the Initial Developer as a result of warranty, support,
-   indemnity or liability terms You offer.
-
-   3.3 Distribution of Executable Versions.
-   You may distribute Original Code in Executable and Source form only if
-   the requirements of Sections 3.1 and 3.2 have been met for that
-   Original Code, and if You include a notice stating that the Source Code
-   version of the Original Code is available under the terms of this
-   License. The notice must be conspicuously included in any notice in an
-   Executable or Source versions, related documentation or collateral in
-   which You describe recipients' rights relating to the Original Code.
-   You may distribute the Executable and Source versions of Your version
-   of the Code or ownership rights under a license of Your choice, which
-   may contain terms different from this License, provided that You are in
-   compliance with the terms of this License. If You distribute the
-   Executable and Source versions under a different license You must make
-   it absolutely clear that any terms which differ from this License are
-   offered by You alone, not by the Initial Developer. You hereby agree to
-   indemnify the Initial Developer for any liability incurred by the
-   Initial Developer as a result of any such terms You offer.
-
-   3.4 Larger Works.
-   You may create a Larger Work by combining Original Code with other code
-   not governed by the terms of this License and distribute the Larger
-   Work as a single product. In such a case, You must make sure the
-   requirements of this License are fulfilled for the Original Code.
-
-   4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
-
-   If it is impossible for You to comply with any of the terms of this
-   License with respect to some or all of the Original Code due to
-   statute, judicial order, or regulation then You must: (a) comply with
-   the terms of this License to the maximum extent possible; and (b)
-   describe the limitations and the code they affect. Such description
-   must be included in the LEGAL file described in Section 3.2 and must be
-   included with all distributions of the Source Code. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-   5.0 APPLICATION OF THIS LICENSE
-
-   This License applies to code to which the Initial Developer has
-   attached the notice in Exhibit A and to related Modifications as set
-   out in Section 3.1.
-
-   6.0 VERSIONS OF THE LICENSE
-
-   6.1 New Versions.
-   Sun may publish revised and/or new versions of the License from time to
-   time. Each version will be given a distinguishing version number.
-
-   6.2 Effect of New Versions.
-   Once Original Code has been published under a particular version of the
-   License, You may always continue to use it under the terms of that
-   version. You may also choose to use such Original Code under the terms
-   of any subsequent version of the License published by Sun. No one other
-   than Sun has the right to modify the terms applicable to Original Code.
-
-   7.0 DISCLAIMER OF WARRANTY
-
-   ORIGINAL CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-   WITHOUT LIMITATION, WARRANTIES THAT THE ORIGINAL CODE IS FREE OF
-   DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-   THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE ORIGINAL CODE
-   IS WITH YOU. SHOULD ANY ORIGINAL CODE PROVE DEFECTIVE IN ANY RESPECT,
-   YOU (NOT THE INITIAL DEVELOPER) ASSUME THE COST OF ANY NECESSARY
-   SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-   CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY ORIGINAL
-   CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-   8.0 TERMINATION
-
-   8.1 This License and the rights granted hereunder will terminate
-   automatically if You fail to comply with terms herein and fail to cure
-   such breach within 30 days of becoming aware of the breach. All
-   sublicenses to the Original Code which are properly granted shall
-   survive any termination of this License. Provisions which, by their
-   nature, must remain in effect beyond the termination of this License
-   shall survive.
-
-   8.2 In the event of termination under Section 8.1 above, all end user
-   license agreements (excluding distributors and resellers) which have
-   been validly granted by You or any distributor hereunder prior to
-   termination shall survive termination.
-
-   9.0 LIMIT OF LIABILITY
-
-   UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-   (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-   DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF ORIGINAL CODE,
-   OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-   INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-   CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-   WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-   COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-   INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-   LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-   RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-   PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-   EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
-   EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-   10.0 U.S. GOVERNMENT END USERS
-
-   U.S. Government: If this Software is being acquired by or on behalf of
-   the U.S. Government or by a U.S. Government prime contractor or
-   subcontractor (at any tier), then the Government's rights in the
-   Software and accompanying documentation shall be only as set forth in
-   this license; this is in accordance with 48 C.F.R. 227.7201 through
-   227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48
-   C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-
-   11.0 MISCELLANEOUS
-
-   This License represents the complete agreement concerning subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. This License shall be governed by
-   California law provisions (except to the extent applicable law, if any,
-   provides otherwise), excluding its conflict-of-law provisions. With
-   respect to disputes in which at least one party is a citizen of, or an
-   entity chartered or registered to do business in the United States of
-   America, any litigation relating to this License shall be subject to
-   the jurisdiction of the Federal Courts of the Northern District of
-   California, with venue lying in Santa Clara County, California, with
-   the losing party responsible for costs, including without limitation,
-   court costs and reasonable attorneys' fees and expenses. The
-   application of the United Nations Convention on Contracts for the
-   International Sale of Goods is expressly excluded. Any law or
-   regulation which provides that the language of a contract shall be
-   construed against the drafter shall not apply to this License.
-
-   EXHIBIT A - Sun Standards License
-"The contents of this file are subject to the Sun Standards
-License Version 1.1 (the "License");
-You may not use this file except in compliance with the
-License. You may obtain a copy of the
-License at _______________________________.
-
-Software distributed under the License is distributed on
-an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
-express or implied. See the License for the specific
-language governing rights and limitations under the License.
-
-The Original Code is ______________________________________.
-
-The Initial Developer of the Original Code is:
-InMon Corp.
-
-Portions created by: _______________________________________
-
-are Copyright (C): _______________________________________
-
-All Rights Reserved.
-
-Contributor(s): _______________________________________
-
-   EXHIBIT B - Standards
-
-   The Standard is defined as the following:
-
-   sFlow Specification, located at
-   [1]http://sflow.org/developers/specifications.php
-
-References
-
-   1. http://sflow.org/developers/specifications.php
-
-----------------------------------------------------------------------
-
-Retrieved from http://www.inmon.com/technology/sflowlicense.txt, 2011-12-12:
-
-LICENSE AGREEMENT
-
-PLEASE READ THIS LICENSE AGREEMENT ("AGREEMENT") CAREFULLY BEFORE REPRODUCING OR IN ANY WAY
-UTILIZING THE sFlow(R) SOFTWARE ("SOFTWARE") AND/OR ANY ACCOMPANYING DOCUMENTATION
-("DOCUMENTATION") AND/OR THE RELATED SPECIFICATIONS ("SPECIFICATIONS").  YOUR REPRODUCTION
-OR USE OF THE SOFTWARE AND/OR THE DOCUMENTATION AND/OR THE SPECIFICATIONS CONSTITUTES YOUR
-ACCEPTANCE OF THE TERMS AND CONDITIONS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO BE BOUND
-BY THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU MAY NOT REPRODUCE OR IN ANY WAY UTILIZE
-THE SOFTWARE OR THE DOCUMENTATION OR THE SPECIFICATIONS.
-
-1.	Definitions.
-
-"Documentation" means the user manuals, training materials, and operating materials, if any,
-InMon provides to Licensee under this Agreement.
-
-"InMon" means InMon Corporation, its affiliates and subsidiaries.
-
-"Intellectual Property Rights" means any trade secrets, patents, including without
-limitation any patents covering the Software, copyrights, know-how, moral rights and
-similar rights of any type under the laws of any governmental authority, domestic or
-foreign, including all applications and registrations relating to any of the foregoing.
-
-"Licensee Hardware" means all computers, routers, or other equipment owned or controlled by
-or on behalf of Licensee.
-
-"Products" means any and all software applications, computers, routers, or other equipment
-manufactured by or on behalf of Licensee for the purpose of resale or lease to any other
-third party, or otherwise made available by Licensee free of charge.
-
-"Software" means the sFlow(R) software programs, in source or binary code format, that
-Licensee licenses from InMon under this Agreement and any bug fixes or error corrections
-which InMon may provide to Licensee.
-
-"Specifications" means the published specifications provided or otherwise made available by
-InMon at: http://www.sflow.org.
-
-"Trademark" means InMon's "sFlow(R)" trademark.
-
-2.	License Grant.
-
-2.1	Software, Documentation and Specifications License Grant.  InMon hereby grants to
-Licensee, under all of InMon's Intellectual Property Rights therein, a perpetual (subject
-to InMon's termination rights under Section 7 below), nonexclusive, royalty-free, worldwide,
-transferable, sublicensable license, to:  (i) use and reproduce the Software, the
-Documentation, and the Specifications; (ii) modify the Software; (iii) implement the
-Specifications in the Products; (iv) install the Software, or software in which the
-Specifications have been implemented, on Licensee Hardware and Products, and (v) distribute
-any Products that include the Software, the Documentation, or software in which the
-Specifications have been implemented.
-
-2.2	Trademark License.  InMon hereby grants to Licensee a perpetual (subject to InMon's
-termination rights under Section 7 below), nonexclusive, royalty-free, worldwide,
-transferable, sublicensable license to use the Trademark on or in connection with the
-Software, the Documentation, the Specifications and any software that implements the
-Specifications.
-
-2.3	Restrictions.  Licensee agrees that it will not use the Software in a way
-inconsistent with the license granted in Section 2.1.  Further, Licensee agrees that, in
-exercising its rights under the license granted to it in this Agreement, Licensee will:
-(i) strictly adhere to and fully comply with the Specifications; (ii) use the Trademark,
-and no other mark, to identify the Software, the Documentation, the Specifications and any
-Products that implement the Specifications; (iii) place, in a font or graphic design
-designated by InMon,  the phrase "sFlow(R)" on any technical documentation,
-sales/marketing materials, catalogs, or other such materials relating to products it
-manufactures or markets which it has configured to be compatible with the Software or
-otherwise implement the Specifications; (iv) in connection with any Products shipped to or
-sold in other countries that include the Software or any software that implements the
-Specifications, comply with the patent and trademark laws and practice of such other
-country; and (v) not alter or impair any acknowledgment of copyright or trademark rights of
-InMon that may appear in or on the Software, the Documentation or the Specifications.  In
-the event InMon determines that Licensee is not complying with its obligations under
-clauses (i)-(v) above, InMon shall notify Licensee of such non-compliance, and if Licensee
-fails to correct such non-compliance within three (3) months, InMon may immediately
-terminate this Agreement as provided under paragraph 7 below and pursue any and all
-actions and remedies as it deems necessary, including, but not limited to breach of
-contract.
-
-3.	Ownership.  Except for the license expressly granted in Section 2, Inmon hereby
-retains all right, title, and interest in and to the Trademark and all its Intellectual
-Property Rights in the Software, the Documentation and the Specifications.  Licensee
-obtains no rights hereunder in the Trademark, Software, Documentation or Specifications by
-implication, estoppel or otherwise.  Licensee acknowledges that the Trademark, Software,
-Documentation and Specifications are being licensed and not sold under this Agreement, and
-that this Agreement does not transfer title in the Trademark, Software, Documentation or
-Specifications, or any copy thereof, to Licensee.
-
-4.	Support.  Inmon shall have no obligation under this Agreement to (a) supply
-maintenance or support, bug fixes or error corrections to the Licensed Software,
-(b) supply future versions of the Licensed Software or (c) provide Licensed Software
-development tools to Licensee.
-
-5.	Warranty.  INMON HEREBY DISCLAIMS ALL WARRANTIES, EITHER EXPRESS, IMPLIED OR
-STATUTORY, WITH RESPECT TO THE TRADEMARK, THE SOFTWARE, THE DOCUMENTATION, THE
-SPECIFICATIONS. OR OTHERWISE, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT OF ANY INTELLECTUAL
-PROPERTY RIGHTS.
-
-6.	Limitation of Liability.  IN NO EVENT SHALL INMON OR ITS SUPPLIERS OR LICENSORS BE
-LIABLE FOR ANY CONSEQUENTIAL, INCIDENTAL, SPECIAL, INDIRECT OR EXEMPLARY DAMAGES WHATSOEVER,
-WHETHER RELATED TO OR ARISING OUT OF THIS AGREEMENT, THE TRADEMARK, THE SOFTWARE, THE
-DOCUMENTATION, THE SPECIFICATIONS, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, DAMAGES FOR
-LOSS OF PROFITS, BUSINESS INTERRUPTION, LOSS OF DATA, COSTS OF PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES OR FOR ANY CLAIM OR DEMAND AGAINST LICENSEE BY ANY OTHER PARTY, OR OTHER
-PECUNIARY LOSS, EVEN IF INMON HAS BEEN ADVISED OF OR KNOWS OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-7.	Term and Termination.  The term of this Agreement will begin on the Effective Date,
-which shall be deemed to be the date of delivery of the Software and/or Documentation and/or
-Specifications to Licensee, and shall continue indefinitely unless and until terminated by
-Licensee's giving written notice of termination to InMon, or by InMon pursuant to InMon's
-termination rights as set forth in Section 2.3 above.  Upon any termination of this
-Agreement, Licensee shall cease exercising its license rights under this Agreement,
-including the right to distribute Products that incorporate the Software or Documentation
-or that implement the Specifications.  The rights and obligations contained in Sections 1,
-3, 5, 6, 7, and 8 shall survive any termination of this Agreement.
-
-8.	General Provisions.
-
-8.1	Assignment.  This Agreement shall be binding upon and inure to the benefit of the
-parties hereto and their permitted successors and permitted assigns.  InMon will have the
-right to assign this Agreement without notice to Licensee.  Licensee may assign or transfer
-(whether by merger, operation of law or in any other manner) any of its rights or delegate
-any of its obligations hereunder without the prior written consent of InMon, provided the
-assignee assumes in writing all of Licensee's obligations hereunder.
-
-8.2	Notices.  All notices permitted or required under this Agreement shall be in
-writing and shall be delivered in person or mailed by first class, registered or certified
-mail, postage prepaid, to the address of the party specified in this Agreement or such
-other address as either party may specify in writing.  Such notice shall be deemed to have
-been given upon receipt.
-
-8.3	Non-Waiver.  No term or provision hereof shall be deemed waived, and no breach
-excused, unless such waiver or consent shall be in writing and signed by the party claimed
-to have waived or consented.  Any consent or waiver, whether express or implied, shall not
-constitute a consent or waiver of, or excuse for any separate, different or subsequent
-breach.
-
-8.4	Independent Contractor.  The parties' relationship shall be solely that of
-independent contractors, and nothing contained in this Agreement shall be construed to make
-either party an agent, partner, representative or principal of the other for any purpose.
-
-8.5	Choice of Law and Forum.  This Agreement shall be governed by and construed under
-the laws of the State of California, without giving effect to such state's conflict of laws
-principles.  The parties hereby submit to the personal jurisdiction of, and agree that any
-legal proceeding with respect to or arising under this Agreement shall be brought in, the
-United States District Court for the Northern District of California or the state courts
-of the State of California for the County of San Francisco.
-
-8.6	U.S. Government Licenses.  The Software and Documentation are considered a
-"commercial item" as that term is defined at 48 C.F.R 2.101, or "commercial computer
-software" and "commercial computer software documentation" as such terms are used in
-48 C.F.R 12.212 of the Federal Acquisition Regulations and its successors, and
-48 C.F.R. 227.7202 of the DoD FAR Supplement and its successors.
-
-8.7	Severability.  If any provision of this Agreement is held to be unenforceable under
-applicable law, then such provision shall be excluded from this Agreement and the balance
-of this Agreement shall be interpreted as if such provision were so excluded and shall be
-enforceable in accordance with its terms.  The court in its discretion may substitute for
-the excluded provision an enforceable provision which in economic substance reasonably
-approximates the excluded provision.
-
-8.8	Compliance With Law.  Licensee shall comply with all applicable laws and
-regulations (including privacy laws and regulations) having application to or governing its
- use and/or operation of the Software and agrees to indemnify and hold InMon harmless from
-and against any claims, damages, losses or obligations suffered or incurred by InMon
-arising from its failure to so comply.
-
-8.9	Entire Agreement; Amendment.  This Agreement constitutes the final, complete and
-entire agreement between the parties with respect to the subject matter hereof, and
-supersedes any previous proposals, negotiations, agreements, or arrangements, whether
-verbal or written, made between the parties with respect to such subject matter.  This
-Agreement shall control over any additional or conflicting terms in any of Licensee's
-purchase orders or other business forms.  This Agreement may only be amended or modified
-by mutual agreement of authorized representatives of the parties in writing.
-
-InMon Corp.
-580 California Street, 5th Floor, San Francisco, CA 94104
-Phone: (415) 283-3260
-URL:   www.inmon.com
-Email: info@inmon.com
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright.in b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright.in
deleted file mode 100644
index d840e4e..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/copyright.in
+++ /dev/null
@@ -1,716 +0,0 @@
-The original sources for this package can be found at:
-
-	http://openvswitch.org/
-
-Upstream Authors (from AUTHORS):
-
-%AUTHORS%
-
-Upstream Copyright Holders:
-
-	Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
-	Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
-	Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
-	and authors listed above.
-	Copyright (c) 2011 Gaetano Catalli
-	Copyright (C) 2000-2003 Geoffrey Wossum (gwossum@acm.org)
-	Copyright (C) 2000 The NetBSD Foundation, Inc.
-	Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
-	Copyright (c) 1982, 1986, 1990, 1993 The Regents of the University of California.
-	Copyright (c) 2008, 2012 Vincent Bernat <bernat@luffy.cx>
-	Copyright (c) 2014 Michael Chapman
-	Copyright (c) 2014 WindRiver, Inc.
-	Copyright (c) 2014 Avaya, Inc.
-
-License:
-
-* The following components are licensed under the
-  GNU Lesser General Public License version 2.1 only
-  with the exception clause below as a pre-amble.
-
-	xenserver/etc_xensource_scripts_vif
-	xenserver/opt_xensource_libexec_InterfaceReconfigure.py
-	xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
-	xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
-	xenserver/opt_xensource_libexec_interface-reconfigure
-	xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
-
-	* These components are only distributed in the source package.
-	  They do not appear in any binary packages.
-
-  On Debian systems, the complete text of the
-  GNU Lesser General Public License version 2.1 can be found in
-  `/usr/share/common-licenses/LGPL-2.1'
-
-  The exception clause pre-amble reads:
-
-  As a special exception to the GNU Lesser General Public License, you
-  may link, statically or dynamically, a "work that uses the Library"
-  with a publicly distributed version of the Library to produce an
-  executable file containing portions of the Library, and distribute
-  that executable file under terms of your choice, without any of the
-  additional requirements listed in clause 6 of the GNU Lesser General
-  Public License.  By "a publicly distributed version of the Library",
-  we mean either the unmodified Library as distributed, or a
-  modified version of the Library that is distributed under the
-  conditions defined in clause 3 of the GNU Library General Public
-  License.  This exception does not however invalidate any other reasons
-  why the executable file might be covered by the GNU Lesser General
-  Public License.
-
-* The following components are licensed under the
-  GNU Lesser General Public License version 2.1.
-
-	utilities/bugtool/ovs-bugtool
-	utilities/bugtool/ovs-bugtool-*
-	utilities/bugtool/plugins/kernel-info/openvswitch.xml
-	utilities/bugtool/plugins/network-status/openvswitch.xml
-	utilities/bugtool/plugins/system-configuration.xml
-	utilities/bugtool/plugins/system-configuration/openvswitch.xml
-
-  On Debian systems, the complete text of the
-  GNU Lesser General Public License version 2.1 can be found in
-  `/usr/share/common-licenses/LGPL-2.1'
-
-* The following component is licensed under the GNU General Public License
-  version 2.
-
-	datapath/
-
-  On Debian systems, the complete text of the GNU General Public License
-  version 2 can be found in `/usr/share/common-licenses/GPL-2'
-
-* The following file is licensed under the GNU General Public License
-  version 2.
-
-	build-aux/cccl
-
-* The following files are licensed under the 2-clause BSD license.
-
-	lib/getopt_long.c
-	include/windows/getopt.h
-
-* The following files are licensed under the 3-clause BSD-license
-
-	include/windows/netinet/icmp6.h
-	include/windows/netinet/ip6.h
-	lib/strsep.c
-
-* The following components are dual-licensed under the
-  GNU General Public License version 2 and the Apache License Version 2.0.
-
-	datapath/linux/compat/include/linux/openvswitch.h
-
-  On Debian systems, the complete text of the GNU General Public License
-  version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-  On Debian systems, the complete text of the Apache License version 2.0
-  can be found in '/usr/share/common-licenses/Apache-2.0'.
-
-* The following components are licensed under the terms of either the
-  Sun Industry Standard Source License 1.1 or the InMon sFlow License:
-
-	lib/sflow.h
-	lib/sflow_agent.c
-	lib/sflow_api.h
-	lib/sflow_poller.c
-	lib/sflow_receiver.c
-	lib/sflow_sampler.c
-
-  These licenses are available, respectively, the following URLs:
-
-        http://host-sflow.sourceforge.net/sissl.html
-        http://www.inmon.com/technology/sflowlicense.txt
-
-  The full text of each license is also appended to the end of this
-  file.
-
-* The following components are licensed for use as desired without restriction:
-
-	lib/crc32c.c
-
-* The following components are licensed under the
-  Python Software Foundation License Version 2.
-
-	python/compat/uuid.py
-	python/compat/argparse.py
-
-	* These components are only distributed in the source package.
-	  They do not appear in any binary packages.
-
-   PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-   --------------------------------------------
-
-   1. This LICENSE AGREEMENT is between the Python Software Foundation
-   ("PSF"), and the Individual or Organization ("Licensee") accessing and
-   otherwise using this software ("Python") in source or binary form and
-   its associated documentation.
-
-   2. Subject to the terms and conditions of this License Agreement, PSF
-   hereby grants Licensee a nonexclusive, royalty-free, world-wide
-   license to reproduce, analyze, test, perform and/or display publicly,
-   prepare derivative works, distribute, and otherwise use Python
-   alone or in any derivative version, provided, however, that PSF's
-   License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-   2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation;
-   All Rights Reserved" are retained in Python alone or in any derivative
-   version prepared by Licensee.
-
-   3. In the event Licensee prepares a derivative work that is based on
-   or incorporates Python or any part thereof, and wants to make
-   the derivative work available to others as provided herein, then
-   Licensee hereby agrees to include in any such work a brief summary of
-   the changes made to Python.
-
-   4. PSF is making Python available to Licensee on an "AS IS"
-   basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-   IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-   DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-   FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-   INFRINGE ANY THIRD PARTY RIGHTS.
-
-   5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-   FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-   A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-   OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-   6. This License Agreement will automatically terminate upon a material
-   breach of its terms and conditions.
-
-   7. Nothing in this License Agreement shall be deemed to create any
-   relationship of agency, partnership, or joint venture between PSF and
-   Licensee.  This License Agreement does not grant permission to use PSF
-   trademarks or trade name in a trademark sense to endorse or promote
-   products or services of Licensee, or any third party.
-
-   8. By copying, installing or otherwise using Python, Licensee
-   agrees to be bound by the terms and conditions of this License
-   Agreement.
-
-* lib/ovs.tmac in the source distribution, and manpages in the
-  binaries, includes troff macros from groff 1.21 that contain the
-  following notice:
-
-    .\" an-ext.tmac
-    .\"
-    .\" Written by Eric S. Raymond <esr@thyrsus.com>
-    .\"            Werner Lemberg <wl@gnu.org>
-    .\"
-    .\" Version 2007-Feb-02
-    .\"
-    .\" Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
-    .\" You may freely use, modify and/or distribute this file.
-
-* m4/absolute-header.m4, by Derek Price, and m4/include_next.m4, by
-  Paul Eggert and Derek Price bear the following notices:
-
-    Copyright (C) 2006-2013 Free Software Foundation, Inc.
-    This file is free software; the Free Software Foundation
-    gives unlimited permission to copy and/or distribute it,
-    with or without modifications, as long as this notice is preserved.
-
-* The following files are licensed under the ISC-license
-
-    lib/lldp/aa-structs.h
-    lib/lldp/lldpd.c
-    lib/lldp/lldpd.h
-    lib/lldp/lldpd-structs.c
-    lib/lldp/lldpd-structs.h
-    lib/lldp/lldp.c
-    lib/lldp/lldp-tlv.h
-    lib/lldp/lldp-const.h
-
-* All other components of this package are licensed under
-  The Apache License Version 2.0.
-
-  On Debian systems, the complete text of the Apache License version 2.0
-  can be found in '/usr/share/common-licenses/Apache-2.0'.
-
-----------------------------------------------------------------------
-
-Retrieved from http://host-sflow.sourceforge.net/sissl.html, 2011-12-12:
-
-   Sun Industry Standards Source License - Version 1.1
-
-   1.0 DEFINITIONS
-
-   1.1 "Commercial Use" means distribution or otherwise making the
-   Original Code available to a third party.
-
-   1.2 "Contributor Version" means the combination of the Original Code,
-   and the Modifications made by that particular Contributor.
-
-   1.3 "Electronic Distribution Mechanism" means a mechanism generally
-   accepted in the software development community for the electronic
-   transfer of data.
-
-   1.4 "Executable" means Original Code in any form other than Source
-   Code.
-
-   1.5 "Initial Developer" means the individual or entity identified as
-   the Initial Developer in the Source Code notice required by Exhibit A.
-
-   1.6 "Larger Work" means a work which combines Original Code or portions
-   thereof with code not governed by the terms of this License.
-
-   1.7 "License" means this document.
-
-   1.8 "Licensable" means having the right to grant, to the maximum extent
-   possible, whether at the time of the initial grant or subsequently
-   acquired, any and all of the rights conveyed herein.
-
-   1.9 "Modifications" means any addition to or deletion from the
-   substance or structure of either the Original Code or any previous
-   Modifications. A Modification is:
-
-   A. Any addition to or deletion from the contents of a file containing
-   Original Code or previous Modifications.
-
-   B. Any new file that contains any part of the Original Code or previous
-   Modifications.
-
-   1.10 "Original Code" means Source Code of computer software code which
-   is described in the Source Code notice required by Exhibit A as
-   Original Code.
-
-   1.11 "Patent Claims" means any patent claim(s), now owned or hereafter
-   acquired, including without limitation, method, process, and apparatus
-   claims, in any patent Licensable by grantor.
-
-   1.12 "Source Code" means the preferred form of the Original Code for
-   making modifications to it, including all modules it contains, plus any
-   associated interface definition files, or scripts used to control
-   compilation and installation of an Executable.
-
-   1.13 "Standards" means the standards identified in Exhibit B.
-
-   1.14 "You" (or "Your") means an individual or a legal entity exercising
-   rights under, and complying with all of the terms of, this License or a
-   future version of this License issued under Section 6.1. For legal
-   entities, "You'' includes any entity which controls, is controlled by,
-   or is under common control with You. For purposes of this definition,
-   "control'' means (a) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (b) ownership of more than fifty percent (50%) of the
-   outstanding shares or beneficial ownership of such entity.
-
-   2.0 SOURCE CODE LICENSE
-
-   2.1 The Initial Developer Grant
-   The Initial Developer hereby grants You a world-wide, royalty-free,
-   non-exclusive license, subject to third party intellectual property
-   claims:
-
-   (a) under intellectual property rights (other than patent or trademark)
-   Licensable by Initial Developer to use, reproduce, modify, display,
-   perform, sublicense and distribute the Original Code (or portions
-   thereof) with or without Modifications, and/or as part of a Larger
-   Work; and
-
-   (b) under Patents Claims infringed by the making, using or selling of
-   Original Code, to make, have made, use, practice, sell, and offer for
-   sale, and/or otherwise dispose of the Original Code (or portions
-   thereof).
-
-   (c) the licenses granted in this Section 2.1(a) and (b) are effective
-   on the date Initial Developer first distributes Original Code under the
-   terms of this License.
-
-   (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
-   1) for code that You delete from the Original Code; 2) separate from
-   the Original Code; or 3) for infringements caused by: i) the
-   modification of the Original Code or ii) the combination of the
-   Original Code with other software or devices, including but not limited
-   to Modifications.
-   3.0 DISTRIBUTION OBLIGATIONS
-
-   3.1 Application of License.
-   The Source Code version of Original Code may be distributed only under
-   the terms of this License or a future version of this License released
-   under Section 6.1, and You must include a copy of this License with
-   every copy of the Source Code You distribute. You may not offer or
-   impose any terms on any Source Code version that alters or restricts
-   the applicable version of this License or the recipients' rights
-   hereunder. Your license for shipment of the Contributor Version is
-   conditioned upon Your full compliance with this Section. The
-   Modifications which You create must comply with all requirements set
-   out by the Standards body in effect one hundred twenty (120) days
-   before You ship the Contributor Version. In the event that the
-   Modifications do not meet such requirements, You agree to publish
-   either (i) any deviation from the Standards protocol resulting from
-   implementation of Your Modifications and a reference implementation of
-   Your Modifications or (ii) Your Modifications in Source Code form, and
-   to make any such deviation and reference implementation or
-   Modifications available to all third parties under the same terms as
-   this license on a royalty free basis within thirty (30) days of Your
-   first customer shipment of Your Modifications.
-
-   3.2 Required Notices.
-   You must duplicate the notice in Exhibit A in each file of the Source
-   Code. If it is not possible to put such notice in a particular Source
-   Code file due to its structure, then You must include such notice in a
-   location (such as a relevant directory) where a user would be likely to
-   look for such a notice. If You created one or more Modification(s) You
-   may add Your name as a Contributor to the notice described in Exhibit
-   A. You must also duplicate this License in any documentation for the
-   Source Code where You describe recipients' rights or ownership rights
-   relating to Initial Code. You may choose to offer, and to charge a fee
-   for, warranty, support, indemnity or liability obligations to one or
-   more recipients of Your version of the Code. However, You may do so
-   only on Your own behalf, and not on behalf of the Initial Developer.
-   You must make it absolutely clear than any such warranty, support,
-   indemnity or liability obligation is offered by You alone, and You
-   hereby agree to indemnify the Initial Developer for any liability
-   incurred by the Initial Developer as a result of warranty, support,
-   indemnity or liability terms You offer.
-
-   3.3 Distribution of Executable Versions.
-   You may distribute Original Code in Executable and Source form only if
-   the requirements of Sections 3.1 and 3.2 have been met for that
-   Original Code, and if You include a notice stating that the Source Code
-   version of the Original Code is available under the terms of this
-   License. The notice must be conspicuously included in any notice in an
-   Executable or Source versions, related documentation or collateral in
-   which You describe recipients' rights relating to the Original Code.
-   You may distribute the Executable and Source versions of Your version
-   of the Code or ownership rights under a license of Your choice, which
-   may contain terms different from this License, provided that You are in
-   compliance with the terms of this License. If You distribute the
-   Executable and Source versions under a different license You must make
-   it absolutely clear that any terms which differ from this License are
-   offered by You alone, not by the Initial Developer. You hereby agree to
-   indemnify the Initial Developer for any liability incurred by the
-   Initial Developer as a result of any such terms You offer.
-
-   3.4 Larger Works.
-   You may create a Larger Work by combining Original Code with other code
-   not governed by the terms of this License and distribute the Larger
-   Work as a single product. In such a case, You must make sure the
-   requirements of this License are fulfilled for the Original Code.
-
-   4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
-
-   If it is impossible for You to comply with any of the terms of this
-   License with respect to some or all of the Original Code due to
-   statute, judicial order, or regulation then You must: (a) comply with
-   the terms of this License to the maximum extent possible; and (b)
-   describe the limitations and the code they affect. Such description
-   must be included in the LEGAL file described in Section 3.2 and must be
-   included with all distributions of the Source Code. Except to the
-   extent prohibited by statute or regulation, such description must be
-   sufficiently detailed for a recipient of ordinary skill to be able to
-   understand it.
-
-   5.0 APPLICATION OF THIS LICENSE
-
-   This License applies to code to which the Initial Developer has
-   attached the notice in Exhibit A and to related Modifications as set
-   out in Section 3.1.
-
-   6.0 VERSIONS OF THE LICENSE
-
-   6.1 New Versions.
-   Sun may publish revised and/or new versions of the License from time to
-   time. Each version will be given a distinguishing version number.
-
-   6.2 Effect of New Versions.
-   Once Original Code has been published under a particular version of the
-   License, You may always continue to use it under the terms of that
-   version. You may also choose to use such Original Code under the terms
-   of any subsequent version of the License published by Sun. No one other
-   than Sun has the right to modify the terms applicable to Original Code.
-
-   7.0 DISCLAIMER OF WARRANTY
-
-   ORIGINAL CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-   WITHOUT LIMITATION, WARRANTIES THAT THE ORIGINAL CODE IS FREE OF
-   DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-   THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE ORIGINAL CODE
-   IS WITH YOU. SHOULD ANY ORIGINAL CODE PROVE DEFECTIVE IN ANY RESPECT,
-   YOU (NOT THE INITIAL DEVELOPER) ASSUME THE COST OF ANY NECESSARY
-   SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-   CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY ORIGINAL
-   CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-   8.0 TERMINATION
-
-   8.1 This License and the rights granted hereunder will terminate
-   automatically if You fail to comply with terms herein and fail to cure
-   such breach within 30 days of becoming aware of the breach. All
-   sublicenses to the Original Code which are properly granted shall
-   survive any termination of this License. Provisions which, by their
-   nature, must remain in effect beyond the termination of this License
-   shall survive.
-
-   8.2 In the event of termination under Section 8.1 above, all end user
-   license agreements (excluding distributors and resellers) which have
-   been validly granted by You or any distributor hereunder prior to
-   termination shall survive termination.
-
-   9.0 LIMIT OF LIABILITY
-
-   UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-   (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-   DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF ORIGINAL CODE,
-   OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-   INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-   CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-   WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-   COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-   INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-   LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-   RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-   PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-   EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
-   EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-   10.0 U.S. GOVERNMENT END USERS
-
-   U.S. Government: If this Software is being acquired by or on behalf of
-   the U.S. Government or by a U.S. Government prime contractor or
-   subcontractor (at any tier), then the Government's rights in the
-   Software and accompanying documentation shall be only as set forth in
-   this license; this is in accordance with 48 C.F.R. 227.7201 through
-   227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48
-   C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-
-   11.0 MISCELLANEOUS
-
-   This License represents the complete agreement concerning subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. This License shall be governed by
-   California law provisions (except to the extent applicable law, if any,
-   provides otherwise), excluding its conflict-of-law provisions. With
-   respect to disputes in which at least one party is a citizen of, or an
-   entity chartered or registered to do business in the United States of
-   America, any litigation relating to this License shall be subject to
-   the jurisdiction of the Federal Courts of the Northern District of
-   California, with venue lying in Santa Clara County, California, with
-   the losing party responsible for costs, including without limitation,
-   court costs and reasonable attorneys' fees and expenses. The
-   application of the United Nations Convention on Contracts for the
-   International Sale of Goods is expressly excluded. Any law or
-   regulation which provides that the language of a contract shall be
-   construed against the drafter shall not apply to this License.
-
-   EXHIBIT A - Sun Standards License
-"The contents of this file are subject to the Sun Standards
-License Version 1.1 (the "License");
-You may not use this file except in compliance with the
-License. You may obtain a copy of the
-License at _______________________________.
-
-Software distributed under the License is distributed on
-an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
-express or implied. See the License for the specific
-language governing rights and limitations under the License.
-
-The Original Code is ______________________________________.
-
-The Initial Developer of the Original Code is:
-InMon Corp.
-
-Portions created by: _______________________________________
-
-are Copyright (C): _______________________________________
-
-All Rights Reserved.
-
-Contributor(s): _______________________________________
-
-   EXHIBIT B - Standards
-
-   The Standard is defined as the following:
-
-   sFlow Specification, located at
-   [1]http://sflow.org/developers/specifications.php
-
-References
-
-   1. http://sflow.org/developers/specifications.php
-
-----------------------------------------------------------------------
-
-Retrieved from http://www.inmon.com/technology/sflowlicense.txt, 2011-12-12:
-
-LICENSE AGREEMENT
-
-PLEASE READ THIS LICENSE AGREEMENT ("AGREEMENT") CAREFULLY BEFORE REPRODUCING OR IN ANY WAY
-UTILIZING THE sFlow(R) SOFTWARE ("SOFTWARE") AND/OR ANY ACCOMPANYING DOCUMENTATION
-("DOCUMENTATION") AND/OR THE RELATED SPECIFICATIONS ("SPECIFICATIONS").  YOUR REPRODUCTION
-OR USE OF THE SOFTWARE AND/OR THE DOCUMENTATION AND/OR THE SPECIFICATIONS CONSTITUTES YOUR
-ACCEPTANCE OF THE TERMS AND CONDITIONS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO BE BOUND
-BY THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU MAY NOT REPRODUCE OR IN ANY WAY UTILIZE
-THE SOFTWARE OR THE DOCUMENTATION OR THE SPECIFICATIONS.
-
-1.	Definitions.
-
-"Documentation" means the user manuals, training materials, and operating materials, if any,
-InMon provides to Licensee under this Agreement.
-
-"InMon" means InMon Corporation, its affiliates and subsidiaries.
-
-"Intellectual Property Rights" means any trade secrets, patents, including without
-limitation any patents covering the Software, copyrights, know-how, moral rights and
-similar rights of any type under the laws of any governmental authority, domestic or
-foreign, including all applications and registrations relating to any of the foregoing.
-
-"Licensee Hardware" means all computers, routers, or other equipment owned or controlled by
-or on behalf of Licensee.
-
-"Products" means any and all software applications, computers, routers, or other equipment
-manufactured by or on behalf of Licensee for the purpose of resale or lease to any other
-third party, or otherwise made available by Licensee free of charge.
-
-"Software" means the sFlow(R) software programs, in source or binary code format, that
-Licensee licenses from InMon under this Agreement and any bug fixes or error corrections
-which InMon may provide to Licensee.
-
-"Specifications" means the published specifications provided or otherwise made available by
-InMon at: http://www.sflow.org.
-
-"Trademark" means InMon's "sFlow(R)" trademark.
-
-2.	License Grant.
-
-2.1	Software, Documentation and Specifications License Grant.  InMon hereby grants to
-Licensee, under all of InMon's Intellectual Property Rights therein, a perpetual (subject
-to InMon's termination rights under Section 7 below), nonexclusive, royalty-free, worldwide,
-transferable, sublicensable license, to:  (i) use and reproduce the Software, the
-Documentation, and the Specifications; (ii) modify the Software; (iii) implement the
-Specifications in the Products; (iv) install the Software, or software in which the
-Specifications have been implemented, on Licensee Hardware and Products, and (v) distribute
-any Products that include the Software, the Documentation, or software in which the
-Specifications have been implemented.
-
-2.2	Trademark License.  InMon hereby grants to Licensee a perpetual (subject to InMon's
-termination rights under Section 7 below), nonexclusive, royalty-free, worldwide,
-transferable, sublicensable license to use the Trademark on or in connection with the
-Software, the Documentation, the Specifications and any software that implements the
-Specifications.
-
-2.3	Restrictions.  Licensee agrees that it will not use the Software in a way
-inconsistent with the license granted in Section 2.1.  Further, Licensee agrees that, in
-exercising its rights under the license granted to it in this Agreement, Licensee will:
-(i) strictly adhere to and fully comply with the Specifications; (ii) use the Trademark,
-and no other mark, to identify the Software, the Documentation, the Specifications and any
-Products that implement the Specifications; (iii) place, in a font or graphic design
-designated by InMon,  the phrase "sFlow(R)" on any technical documentation,
-sales/marketing materials, catalogs, or other such materials relating to products it
-manufactures or markets which it has configured to be compatible with the Software or
-otherwise implement the Specifications; (iv) in connection with any Products shipped to or
-sold in other countries that include the Software or any software that implements the
-Specifications, comply with the patent and trademark laws and practice of such other
-country; and (v) not alter or impair any acknowledgment of copyright or trademark rights of
-InMon that may appear in or on the Software, the Documentation or the Specifications.  In
-the event InMon determines that Licensee is not complying with its obligations under
-clauses (i)-(v) above, InMon shall notify Licensee of such non-compliance, and if Licensee
-fails to correct such non-compliance within three (3) months, InMon may immediately
-terminate this Agreement as provided under paragraph 7 below and pursue any and all
-actions and remedies as it deems necessary, including, but not limited to breach of
-contract.
-
-3.	Ownership.  Except for the license expressly granted in Section 2, Inmon hereby
-retains all right, title, and interest in and to the Trademark and all its Intellectual
-Property Rights in the Software, the Documentation and the Specifications.  Licensee
-obtains no rights hereunder in the Trademark, Software, Documentation or Specifications by
-implication, estoppel or otherwise.  Licensee acknowledges that the Trademark, Software,
-Documentation and Specifications are being licensed and not sold under this Agreement, and
-that this Agreement does not transfer title in the Trademark, Software, Documentation or
-Specifications, or any copy thereof, to Licensee.
-
-4.	Support.  Inmon shall have no obligation under this Agreement to (a) supply
-maintenance or support, bug fixes or error corrections to the Licensed Software,
-(b) supply future versions of the Licensed Software or (c) provide Licensed Software
-development tools to Licensee.
-
-5.	Warranty.  INMON HEREBY DISCLAIMS ALL WARRANTIES, EITHER EXPRESS, IMPLIED OR
-STATUTORY, WITH RESPECT TO THE TRADEMARK, THE SOFTWARE, THE DOCUMENTATION, THE
-SPECIFICATIONS. OR OTHERWISE, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT OF ANY INTELLECTUAL
-PROPERTY RIGHTS.
-
-6.	Limitation of Liability.  IN NO EVENT SHALL INMON OR ITS SUPPLIERS OR LICENSORS BE
-LIABLE FOR ANY CONSEQUENTIAL, INCIDENTAL, SPECIAL, INDIRECT OR EXEMPLARY DAMAGES WHATSOEVER,
-WHETHER RELATED TO OR ARISING OUT OF THIS AGREEMENT, THE TRADEMARK, THE SOFTWARE, THE
-DOCUMENTATION, THE SPECIFICATIONS, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, DAMAGES FOR
-LOSS OF PROFITS, BUSINESS INTERRUPTION, LOSS OF DATA, COSTS OF PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES OR FOR ANY CLAIM OR DEMAND AGAINST LICENSEE BY ANY OTHER PARTY, OR OTHER
-PECUNIARY LOSS, EVEN IF INMON HAS BEEN ADVISED OF OR KNOWS OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-7.	Term and Termination.  The term of this Agreement will begin on the Effective Date,
-which shall be deemed to be the date of delivery of the Software and/or Documentation and/or
-Specifications to Licensee, and shall continue indefinitely unless and until terminated by
-Licensee's giving written notice of termination to InMon, or by InMon pursuant to InMon's
-termination rights as set forth in Section 2.3 above.  Upon any termination of this
-Agreement, Licensee shall cease exercising its license rights under this Agreement,
-including the right to distribute Products that incorporate the Software or Documentation
-or that implement the Specifications.  The rights and obligations contained in Sections 1,
-3, 5, 6, 7, and 8 shall survive any termination of this Agreement.
-
-8.	General Provisions.
-
-8.1	Assignment.  This Agreement shall be binding upon and inure to the benefit of the
-parties hereto and their permitted successors and permitted assigns.  InMon will have the
-right to assign this Agreement without notice to Licensee.  Licensee may assign or transfer
-(whether by merger, operation of law or in any other manner) any of its rights or delegate
-any of its obligations hereunder without the prior written consent of InMon, provided the
-assignee assumes in writing all of Licensee's obligations hereunder.
-
-8.2	Notices.  All notices permitted or required under this Agreement shall be in
-writing and shall be delivered in person or mailed by first class, registered or certified
-mail, postage prepaid, to the address of the party specified in this Agreement or such
-other address as either party may specify in writing.  Such notice shall be deemed to have
-been given upon receipt.
-
-8.3	Non-Waiver.  No term or provision hereof shall be deemed waived, and no breach
-excused, unless such waiver or consent shall be in writing and signed by the party claimed
-to have waived or consented.  Any consent or waiver, whether express or implied, shall not
-constitute a consent or waiver of, or excuse for any separate, different or subsequent
-breach.
-
-8.4	Independent Contractor.  The parties' relationship shall be solely that of
-independent contractors, and nothing contained in this Agreement shall be construed to make
-either party an agent, partner, representative or principal of the other for any purpose.
-
-8.5	Choice of Law and Forum.  This Agreement shall be governed by and construed under
-the laws of the State of California, without giving effect to such state's conflict of laws
-principles.  The parties hereby submit to the personal jurisdiction of, and agree that any
-legal proceeding with respect to or arising under this Agreement shall be brought in, the
-United States District Court for the Northern District of California or the state courts
-of the State of California for the County of San Francisco.
-
-8.6	U.S. Government Licenses.  The Software and Documentation are considered a
-"commercial item" as that term is defined at 48 C.F.R 2.101, or "commercial computer
-software" and "commercial computer software documentation" as such terms are used in
-48 C.F.R 12.212 of the Federal Acquisition Regulations and its successors, and
-48 C.F.R. 227.7202 of the DoD FAR Supplement and its successors.
-
-8.7	Severability.  If any provision of this Agreement is held to be unenforceable under
-applicable law, then such provision shall be excluded from this Agreement and the balance
-of this Agreement shall be interpreted as if such provision were so excluded and shall be
-enforceable in accordance with its terms.  The court in its discretion may substitute for
-the excluded provision an enforceable provision which in economic substance reasonably
-approximates the excluded provision.
-
-8.8	Compliance With Law.  Licensee shall comply with all applicable laws and
-regulations (including privacy laws and regulations) having application to or governing its
- use and/or operation of the Software and agrees to indemnify and hold InMon harmless from
-and against any claims, damages, losses or obligations suffered or incurred by InMon
-arising from its failure to so comply.
-
-8.9	Entire Agreement; Amendment.  This Agreement constitutes the final, complete and
-entire agreement between the parties with respect to the subject matter hereof, and
-supersedes any previous proposals, negotiations, agreements, or arrangements, whether
-verbal or written, made between the parties with respect to such subject matter.  This
-Agreement shall control over any additional or conflicting terms in any of Licensee's
-purchase orders or other business forms.  This Agreement may only be amended or modified
-by mutual agreement of authorized representatives of the parties in writing.
-
-InMon Corp.
-580 California Street, 5th Floor, San Francisco, CA 94104
-Phone: (415) 283-3260
-URL:   www.inmon.com
-Email: info@inmon.com
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.README.Debian b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.README.Debian
deleted file mode 100644
index d55099b..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.README.Debian
+++ /dev/null
@@ -1,42 +0,0 @@
-openvswitch-switch-dpdk
------------------------
-
-This package provides a DPDK enabled version of the OpenvSwitch vswitchd
-binary; by default, the ovs-vswitchd binary from openvswitch-switch will
-be used:
-
-  $ update-alternatives --query ovs-vswitchd
-  Name: ovs-vswitchd
-  Link: /usr/sbin/ovs-vswitchd
-  Status: auto
-  Best: /usr/lib/openvswitch-switch/ovs-vswitchd
-  Value: /usr/lib/openvswitch-switch/ovs-vswitchd
-
-  Alternative: /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
-  Priority: 50
-
-  Alternative: /usr/lib/openvswitch-switch/ovs-vswitchd
-  Priority: 100
-
-DPDK provides fast packet processing in userspace, and has some specific
-requirements in terms of system configuration - see the upstream
-documentation for more details:
-
-  /usr/share/doc/openvswitch-common/INSTALL.DPDK.md.gz
-
-DPDK has a minimum CPU feature set of SSE3, so is not appropriate for all
-amd64 CPU types hence is not enabled by default.
-
-To switch to the DPDK version:
-
-   sudo update-alternatives --set ovs-vswitchd \
-        /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
-   sudo service openvswitch-switch restart
-
-and to switch back:
-
-   sudo update-alternatives --set ovs-vswitchd \
-        /usr/lib/openvswitch-switch/ovs-vswitchd
-   sudo service openvswitch-switch restart
-
- -- James Page <james.page@ubuntu.com>  Tue, 21 Jul 2015 12:06:49 +0100
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.postinst b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.postinst
deleted file mode 100644
index cafae09..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -rf /usr/sbin/ovs-vswitchd
-update-alternatives --install /usr/sbin/ovs-vswitchd ovs-vswitchd \
-    /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk 50
-
-#DEBHELPER#
-
-exit 0
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.prerm b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.prerm
deleted file mode 100644
index 82b2136..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/openvswitch-switch-dpdk.prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --remove ovs-vswitchd /usr/lib/openvswitch-switch/ovs-vswitchd-dpdk
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/ovs-monitor-ipsec b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/ovs-monitor-ipsec
deleted file mode 100755
index 414d18b..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/ovs-monitor-ipsec
+++ /dev/null
@@ -1,494 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# A daemon to monitor attempts to create GRE-over-IPsec tunnels.
-# Uses racoon and setkey to support the configuration.  Assumes that
-# OVS has complete control over IPsec configuration for the box.
-
-# xxx To-do:
-#  - Doesn't actually check that Interface is connected to bridge
-#  - If a certificate is badly formed, Racoon will refuse to start.  We
-#    should do a better job of verifying certificates are valid before
-#    adding an interface to racoon.conf.
-
-
-import argparse
-import glob
-import os
-import subprocess
-import sys
-
-import ovs.dirs
-from ovs.db import error
-from ovs.db import types
-import ovs.util
-import ovs.daemon
-import ovs.db.idl
-import ovs.unixctl
-import ovs.unixctl.server
-import ovs.vlog
-
-vlog = ovs.vlog.Vlog("ovs-monitor-ipsec")
-root_prefix = ''                # Prefix for absolute file names, for testing.
-SETKEY = "/usr/sbin/setkey"
-exiting = False
-
-
-def unixctl_exit(conn, unused_argv, unused_aux):
-    global exiting
-    exiting = True
-    conn.reply(None)
-
-
-# Class to configure the racoon daemon, which handles IKE negotiation
-class Racoon:
-    # Default locations for files
-    conf_file = "/etc/racoon/racoon.conf"
-    cert_dir = "/etc/racoon/certs"
-    psk_file = "/etc/racoon/psk.txt"
-
-    # Racoon configuration header we use for IKE
-    conf_header = """# Configuration file generated by Open vSwitch
-#
-# Do not modify by hand!
-
-path pre_shared_key "%s";
-path certificate "%s";
-
-"""
-
-    # Racoon configuration footer we use for IKE
-    conf_footer = """sainfo anonymous {
-        pfs_group 2;
-        lifetime time 1 hour;
-        encryption_algorithm aes;
-        authentication_algorithm hmac_sha1, hmac_md5;
-        compression_algorithm deflate;
-}
-
-"""
-
-    # Certificate entry template.
-    cert_entry = """remote %s {
-        exchange_mode main;
-        nat_traversal on;
-        ike_frag on;
-        certificate_type x509 "%s" "%s";
-        my_identifier asn1dn;
-        peers_identifier asn1dn;
-        peers_certfile x509 "%s";
-        verify_identifier on;
-        proposal {
-                encryption_algorithm aes;
-                hash_algorithm sha1;
-                authentication_method rsasig;
-                dh_group 2;
-        }
-}
-
-"""
-
-    # Pre-shared key template.
-    psk_entry = """remote %s {
-        exchange_mode main;
-        nat_traversal on;
-        proposal {
-                encryption_algorithm aes;
-                hash_algorithm sha1;
-                authentication_method pre_shared_key;
-                dh_group 2;
-        }
-}
-
-"""
-
-    def __init__(self):
-        self.psk_hosts = {}
-        self.cert_hosts = {}
-
-        if not os.path.isdir(root_prefix + self.cert_dir):
-            os.mkdir(self.cert_dir)
-
-        # Clean out stale peer certs from previous runs
-        for ovs_cert in glob.glob("%s%s/ovs-*.pem"
-                                  % (root_prefix, self.cert_dir)):
-            try:
-                os.remove(ovs_cert)
-            except OSError:
-                vlog.warn("couldn't remove %s" % ovs_cert)
-
-        # Replace racoon's conf file with our template
-        self.commit()
-
-    def reload(self):
-        exitcode = subprocess.call([root_prefix + "/etc/init.d/racoon",
-                                    "reload"])
-        if exitcode != 0:
-            # Racoon is finicky about its configuration file and will
-            # refuse to start if it sees something it doesn't like
-            # (e.g., a certificate file doesn't exist).  Try restarting
-            # the process before giving up.
-            vlog.warn("attempting to restart racoon")
-            exitcode = subprocess.call([root_prefix + "/etc/init.d/racoon",
-                                        "restart"])
-            if exitcode != 0:
-                vlog.warn("couldn't reload racoon")
-
-    def commit(self):
-        # Rewrite the Racoon configuration file
-        conf_file = open(root_prefix + self.conf_file, 'w')
-        conf_file.write(Racoon.conf_header % (self.psk_file, self.cert_dir))
-
-        for host, vals in self.cert_hosts.iteritems():
-            conf_file.write(Racoon.cert_entry % (host, vals["certificate"],
-                    vals["private_key"], vals["peer_cert_file"]))
-
-        for host in self.psk_hosts:
-            conf_file.write(Racoon.psk_entry % host)
-
-        conf_file.write(Racoon.conf_footer)
-        conf_file.close()
-
-        # Rewrite the pre-shared keys file; it must only be readable by root.
-        orig_umask = os.umask(0077)
-        psk_file = open(root_prefix + Racoon.psk_file, 'w')
-        os.umask(orig_umask)
-
-        psk_file.write("# Generated by Open vSwitch...do not modify by hand!")
-        psk_file.write("\n\n")
-        for host, vals in self.psk_hosts.iteritems():
-            psk_file.write("%s   %s\n" % (host, vals["psk"]))
-        psk_file.close()
-
-        self.reload()
-
-    def _add_psk(self, host, psk):
-        if host in self.cert_hosts:
-            raise error.Error("host %s already defined for cert" % host)
-
-        self.psk_hosts[host] = psk
-        self.commit()
-
-    def _verify_certs(self, vals):
-        # Racoon will refuse to start if the certificate files don't
-        # exist, so verify that they're there.
-        if not os.path.isfile(root_prefix + vals["certificate"]):
-            raise error.Error("'certificate' file does not exist: %s"
-                    % vals["certificate"])
-        elif not os.path.isfile(root_prefix + vals["private_key"]):
-            raise error.Error("'private_key' file does not exist: %s"
-                    % vals["private_key"])
-
-        # Racoon won't start if a given certificate or private key isn't
-        # valid.  This is a weak test, but will detect the most flagrant
-        # errors.
-        if vals["peer_cert"].find("-----BEGIN CERTIFICATE-----") == -1:
-            raise error.Error("'peer_cert' is not in valid PEM format")
-
-        cert = open(root_prefix + vals["certificate"]).read()
-        if cert.find("-----BEGIN CERTIFICATE-----") == -1:
-            raise error.Error("'certificate' is not in valid PEM format")
-
-        cert = open(root_prefix + vals["private_key"]).read()
-        if cert.find("-----BEGIN RSA PRIVATE KEY-----") == -1:
-            raise error.Error("'private_key' is not in valid PEM format")
-
-    def _add_cert(self, host, vals):
-        if host in self.psk_hosts:
-            raise error.Error("host %s already defined for psk" % host)
-
-        if vals["certificate"] == None:
-            raise error.Error("'certificate' not defined for %s" % host)
-        elif vals["private_key"] == None:
-            # Assume the private key is stored in the same PEM file as
-            # the certificate.  We make a copy of "vals" so that we don't
-            # modify the original "vals", which would cause the script
-            # to constantly think that the configuration has changed
-            # in the database.
-            vals = vals.copy()
-            vals["private_key"] = vals["certificate"]
-
-        self._verify_certs(vals)
-
-        # The peer's certificate comes to us in PEM format as a string.
-        # Write that string to a file for Racoon to use.
-        f = open(root_prefix + vals["peer_cert_file"], "w")
-        f.write(vals["peer_cert"])
-        f.close()
-
-        self.cert_hosts[host] = vals
-        self.commit()
-
-    def _del_cert(self, host):
-        peer_cert_file = self.cert_hosts[host]["peer_cert_file"]
-        del self.cert_hosts[host]
-        self.commit()
-        try:
-            os.remove(root_prefix + peer_cert_file)
-        except OSError:
-            pass
-
-    def add_entry(self, host, vals):
-        if vals["peer_cert"]:
-            self._add_cert(host, vals)
-        elif vals["psk"]:
-            self._add_psk(host, vals)
-
-    def del_entry(self, host):
-        if host in self.cert_hosts:
-            self._del_cert(host)
-        elif host in self.psk_hosts:
-            del self.psk_hosts[host]
-            self.commit()
-
-
-# Class to configure IPsec on a system using racoon for IKE and setkey
-# for maintaining the Security Association Database (SAD) and Security
-# Policy Database (SPD).  Only policies for GRE are supported.
-class IPsec:
-    def __init__(self):
-        self.sad_flush()
-        self.spd_flush()
-        self.racoon = Racoon()
-        self.entries = []
-
-    def call_setkey(self, cmds):
-        try:
-            p = subprocess.Popen([root_prefix + SETKEY, "-c"],
-                                 stdin=subprocess.PIPE,
-                                 stdout=subprocess.PIPE)
-        except:
-            vlog.err("could not call %s%s" % (root_prefix, SETKEY))
-            sys.exit(1)
-
-        # xxx It is safer to pass the string into the communicate()
-        # xxx method, but it didn't work for slightly longer commands.
-        # xxx An alternative may need to be found.
-        p.stdin.write(cmds)
-        return p.communicate()[0]
-
-    def get_spi(self, local_ip, remote_ip, proto="esp"):
-        # Run the setkey dump command to retrieve the SAD.  Then, parse
-        # the output looking for SPI buried in the output.  Note that
-        # multiple SAD entries can exist for the same "flow", since an
-        # older entry could be in a "dying" state.
-        spi_list = []
-        host_line = "%s %s" % (local_ip, remote_ip)
-        results = self.call_setkey("dump ;\n").split("\n")
-        for i in range(len(results)):
-            if results[i].strip() == host_line:
-                # The SPI is in the line following the host pair
-                spi_line = results[i + 1]
-                if (spi_line[1:4] == proto):
-                    spi = spi_line.split()[2]
-                    spi_list.append(spi.split('(')[1].rstrip(')'))
-        return spi_list
-
-    def sad_flush(self):
-        self.call_setkey("flush;\n")
-
-    def sad_del(self, local_ip, remote_ip):
-        # To delete all SAD entries, we should be able to use setkey's
-        # "deleteall" command.  Unfortunately, it's fundamentally broken
-        # on Linux and not documented as such.
-        cmds = ""
-
-        # Delete local_ip->remote_ip SAD entries
-        spi_list = self.get_spi(local_ip, remote_ip)
-        for spi in spi_list:
-            cmds += "delete %s %s esp %s;\n" % (local_ip, remote_ip, spi)
-
-        # Delete remote_ip->local_ip SAD entries
-        spi_list = self.get_spi(remote_ip, local_ip)
-        for spi in spi_list:
-            cmds += "delete %s %s esp %s;\n" % (remote_ip, local_ip, spi)
-
-        if cmds:
-            self.call_setkey(cmds)
-
-    def spd_flush(self):
-        self.call_setkey("spdflush;\n")
-
-    def spd_add(self, local_ip, remote_ip):
-        cmds = ("spdadd %s %s gre -P out ipsec esp/transport//require;\n" %
-                    (local_ip, remote_ip))
-        cmds += ("spdadd %s %s gre -P in ipsec esp/transport//require;\n" %
-                    (remote_ip, local_ip))
-        self.call_setkey(cmds)
-
-    def spd_del(self, local_ip, remote_ip):
-        cmds = "spddelete %s %s gre -P out;\n" % (local_ip, remote_ip)
-        cmds += "spddelete %s %s gre -P in;\n" % (remote_ip, local_ip)
-        self.call_setkey(cmds)
-
-    def add_entry(self, local_ip, remote_ip, vals):
-        if remote_ip in self.entries:
-            raise error.Error("host %s already configured for ipsec"
-                              % remote_ip)
-
-        self.racoon.add_entry(remote_ip, vals)
-        self.spd_add(local_ip, remote_ip)
-
-        self.entries.append(remote_ip)
-
-    def del_entry(self, local_ip, remote_ip):
-        if remote_ip in self.entries:
-            self.racoon.del_entry(remote_ip)
-            self.spd_del(local_ip, remote_ip)
-            self.sad_del(local_ip, remote_ip)
-
-            self.entries.remove(remote_ip)
-
-
-def update_ipsec(ipsec, interfaces, new_interfaces):
-    for name, vals in interfaces.iteritems():
-        if name not in new_interfaces:
-            ipsec.del_entry(vals["local_ip"], vals["remote_ip"])
-
-    for name, vals in new_interfaces.iteritems():
-        orig_vals = interfaces.get(name)
-        if orig_vals:
-            # Configuration for this host already exists.  Check if it's
-            # changed.  We use set difference, since we want to ignore
-            # any local additions to "orig_vals" that we've made
-            # (e.g. the "peer_cert_file" key).
-            if set(vals.items()) - set(orig_vals.items()):
-                ipsec.del_entry(vals["local_ip"], vals["remote_ip"])
-            else:
-                continue
-
-        try:
-            ipsec.add_entry(vals["local_ip"], vals["remote_ip"], vals)
-        except error.Error, msg:
-            vlog.warn("skipping ipsec config for %s: %s" % (name, msg))
-
-
-def get_ssl_cert(data):
-    for ovs_rec in data["Open_vSwitch"].rows.itervalues():
-        if ovs_rec.ssl:
-            ssl = ovs_rec.ssl[0]
-            if ssl.certificate and ssl.private_key:
-                return (ssl.certificate, ssl.private_key)
-
-    return None
-
-
-def main():
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("database", metavar="DATABASE",
-                        help="A socket on which ovsdb-server is listening.")
-    parser.add_argument("--root-prefix", metavar="DIR",
-                        help="Use DIR as alternate root directory"
-                        " (for testing).")
-
-    ovs.vlog.add_args(parser)
-    ovs.daemon.add_args(parser)
-    args = parser.parse_args()
-    ovs.vlog.handle_args(args)
-    ovs.daemon.handle_args(args)
-
-    global root_prefix
-    if args.root_prefix:
-        root_prefix = args.root_prefix
-
-    remote = args.database
-    schema_helper = ovs.db.idl.SchemaHelper()
-    schema_helper.register_columns("Interface", ["name", "type", "options"])
-    schema_helper.register_columns("Open_vSwitch", ["ssl"])
-    schema_helper.register_columns("SSL", ["certificate", "private_key"])
-    idl = ovs.db.idl.Idl(remote, schema_helper)
-
-    ovs.daemon.daemonize()
-
-    ovs.unixctl.command_register("exit", "", 0, 0, unixctl_exit, None)
-    error, unixctl_server = ovs.unixctl.server.UnixctlServer.create(None)
-    if error:
-        ovs.util.ovs_fatal(error, "could not create unixctl server", vlog)
-
-    ipsec = IPsec()
-
-    interfaces = {}
-    seqno = idl.change_seqno    # Sequence number when we last processed the db
-    while True:
-        unixctl_server.run()
-        if exiting:
-            break
-
-        idl.run()
-        if seqno == idl.change_seqno:
-            poller = ovs.poller.Poller()
-            unixctl_server.wait(poller)
-            idl.wait(poller)
-            poller.block()
-            continue
-        seqno = idl.change_seqno
-
-        ssl_cert = get_ssl_cert(idl.tables)
-
-        new_interfaces = {}
-        for rec in idl.tables["Interface"].rows.itervalues():
-            if rec.type == "ipsec_gre" or rec.type == "ipsec_gre64":
-                name = rec.name
-                options = rec.options
-                peer_cert_name = "ovs-%s.pem" % (options.get("remote_ip"))
-                entry = {
-                    "remote_ip": options.get("remote_ip"),
-                    "local_ip": options.get("local_ip", "0.0.0.0/0"),
-                    "certificate": options.get("certificate"),
-                    "private_key": options.get("private_key"),
-                    "use_ssl_cert": options.get("use_ssl_cert"),
-                    "peer_cert": options.get("peer_cert"),
-                    "peer_cert_file": Racoon.cert_dir + "/" + peer_cert_name,
-                    "psk": options.get("psk")}
-
-                if entry["peer_cert"] and entry["psk"]:
-                    vlog.warn("both 'peer_cert' and 'psk' defined for %s"
-                              % name)
-                    continue
-                elif not entry["peer_cert"] and not entry["psk"]:
-                    vlog.warn("no 'peer_cert' or 'psk' defined for %s" % name)
-                    continue
-
-                # The "use_ssl_cert" option is deprecated and will
-                # likely go away in the near future.
-                if entry["use_ssl_cert"] == "true":
-                    if not ssl_cert:
-                        vlog.warn("no valid SSL entry for %s" % name)
-                        continue
-
-                    entry["certificate"] = ssl_cert[0]
-                    entry["private_key"] = ssl_cert[1]
-
-                new_interfaces[name] = entry
-
-        if interfaces != new_interfaces:
-            update_ipsec(ipsec, interfaces, new_interfaces)
-            interfaces = new_interfaces
-
-    unixctl_server.close()
-    idl.close()
-
-
-if __name__ == '__main__':
-    try:
-        main()
-    except SystemExit:
-        # Let system.exit() calls complete normally
-        raise
-    except:
-        vlog.exception("traceback")
-        sys.exit(ovs.daemon.RESTART_EXIT_CODE)
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/patches/series b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/patches/series
deleted file mode 100644
index 8b13789..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/rules b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/rules
deleted file mode 100755
index 881774f..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/rules
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-#export DH_VERBOSE=1
-
-%:
-	dh $@ --with autoreconf,python2,systemd --parallel
-
-# use --as-needed only if supported by dh-autoreconf (to simplify backporting)
-DH_AS_NEEDED=$(shell dpkg --compare-versions $$(dpkg --status dh-autoreconf | grep Version | cut -d' ' -f2) ge 6 && echo --as-needed)
-override_dh_autoreconf:
-	dh_autoreconf $(DH_AS_NEEDED)
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-PARALLEL =
-endif
-
-override_dh_auto_configure:
-	dh_auto_configure -- --enable-ssl --with-dpdk=/usr $(DATAPATH_CONFIGURE_OPTS)
-
-override_dh_auto_test:
-# NOTE(jamespage): skip tests on powerpc until
-# https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1483572
-# is resolved
-ifneq (powerpc, $(DEB_BUILD_ARCH))
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	if $(MAKE) check TESTSUITEFLAGS='$(PARALLEL)' || \
-                $(MAKE) check TESTSUITEFLAGS='--recheck'; then :; \
-	else \
-		cat tests/testsuite.log; \
-		exit 1; \
-	fi
-endif
-endif # powerpc
-
-override_dh_auto_build:
-	dh_auto_build -- distdir=openvswitch
-
-override_dh_auto_clean:
-	rm -f python/ovs/*.pyc python/ovs/db/*.pyc
-	dh_auto_clean
-
-override_dh_install:
-	install -D vswitchd/ovs-vswitchd \
-		$(CURDIR)/debian/openvswitch-switch-dpdk/usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
-
-override_dh_installinit:
-	:
-
-override_dh_auto_install:
-	:
-
-# Helper target for creating snapshots from upstream git
-DATE=$(shell date +%Y%m%d)
-# Upstream branch to track
-BRANCH=branch-2.4
-
-get-orig-snapshot:
-	rm -Rf openvswitch-upstream
-	git clone https://github.com/openvswitch/ovs openvswitch-upstream
-	cd openvswitch-upstream && \
-		git checkout -b $(BRANCH) remotes/origin/$(BRANCH) && \
-		export COMMIT=`git rev-parse --short HEAD` && \
-		export UPSTREAM_VERSION=`head -1 NEWS | awk '{ print $$1 }' | sed 's/v//'` && \
-		git archive --format tgz --prefix=openvswitch-$$UPSTREAM_VERSION+git$(DATE)/ \
-			-o ../../openvswitch_$$UPSTREAM_VERSION~git$(DATE).$$COMMIT.orig.tar.gz $(BRANCH)
-	rm -Rf openvswitch-upstream
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/source/format b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/common b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/common
deleted file mode 100755
index ba8f27f..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/common
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --set ovs-vswitchd \
-    /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
-service openvswitch-switch restart
-
-modprobe openvswitch || true
-
-echo "kernel modules loaded: "
-# Check that ovs loaded
-lsmod | grep "openvswitch"
-echo "OK"
-
-echo "Checking daemons: "
-pgrep ovs-vswitchd
-pgrep ovsdb-server
-echo "OK"
-
-echo -n "running openflow tests using mininet"
-python `dirname $0`/openflow.py 2>&1
-echo "OK"
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/control b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/control
deleted file mode 100644
index a233244..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/control
+++ /dev/null
@@ -1,4 +0,0 @@
-Tests: kernel
-Depends: mininet (>= 2.2.0~), iperf, openvswitch-switch-dpdk,
- openvswitch-testcontroller
-Restrictions: needs-root rw-build-tree
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/kernel b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/kernel
deleted file mode 100755
index befe158..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/kernel
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-`dirname $0`/common
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow
deleted file mode 100755
index 004e994..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-service openvswitch-controller stop
-
-python `dirname $0`/openflow.py 2>&1
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow.py b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow.py
deleted file mode 100755
index 216b57c..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/tests/openflow.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import unittest
-import logging
-from mininet.net import Mininet
-import mininet.log as log
-from mininet.node import OVSController, OVSKernelSwitch
-
-Switch = OVSKernelSwitch
-Controller = OVSController
-logging.basicConfig(level=logging.DEBUG)
-log.setLogLevel('info')
-
-
-class BasicOpenflowTest(unittest.TestCase):
-
-    def addHost(self, N):
-        logging.debug("Creating host h%s and add to net.", N)
-        name = 'h%d' % N
-        ip = '10.0.0.%d' % N
-        return self.net.addHost(name, ip=ip)
-
-    def setUp(self):
-        self.net = Mininet(controller=Controller, switch=Switch)
-
-        logging.info("Creating controllers")
-        self.net.addController('c1', command='ovs-testcontroller')
-
-        logging.info("Creating switches")
-        s1 = self.net.addSwitch('s1', protocols="OpenFlow10")
-        s2 = self.net.addSwitch('s2', protocols="OpenFlow10")
-
-        logging.info("Creating hosts (7 on each switch)")
-        hosts1 = [self.addHost(n) for n in (1, 2, 3, 4, 5, 6, 7)]
-        hosts2 = [self.addHost(n) for n in (8, 9, 10, 11, 12, 13, 14)]
-
-        logging.info("Creating links")
-        for h in hosts1:
-            self.net.addLink(s1, h)
-        for h in hosts2:
-            self.net.addLink(s2, h)
-        self.net.addLink(s1, s2)
-
-        logging.info("Starting network")
-        self.net.start()
-
-    def testPingAll(self):
-        logging.info("Testing network")
-        packetLoss = self.net.pingAll()
-        self.assertTrue(
-            packetLoss == 0,
-            "Packet loss during ping test %s" %
-            packetLoss)
-
-    def testIPerfTCP(self):
-        logging.info("Running TCP performance test")
-        self.net.iperf()
-
-    def testIPerfUDP(self):
-        logging.info("Running UDP performance test")
-        self.net.iperf(l4Type='UDP')
-
-    def tearDown(self):
-        logging.info("Stopping network")
-        self.net.stop()
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/watch b/ovs_build/openvswitch_2.6-dpdk_16.07/debian/watch
deleted file mode 100644
index f42bab5..0000000
--- a/ovs_build/openvswitch_2.6-dpdk_16.07/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://openvswitch.org/releases/ openvswitch-(.*).tar.gz
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0001-Enable-current-VxLAN-gpe-work-and-meet-NSH-requireme.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0001-Enable-current-VxLAN-gpe-work-and-meet-NSH-requireme.patch
deleted file mode 100644
index 63b7597..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0001-Enable-current-VxLAN-gpe-work-and-meet-NSH-requireme.patch
+++ /dev/null
@@ -1,614 +0,0 @@
-From 9f7148f9dc03053a4a3231a7cf819c447a178a17 Mon Sep 17 00:00:00 2001
-From: Yi Yang <yi.y.yang@intel.com>
-Date: Fri, 11 Nov 2016 11:13:18 +0800
-Subject: [PATCH 1/8] Enable current VxLAN-gpe work and meet NSH requirements
-
-Signed-off-by: Yi Yang <yi.y.yang@intel.com>
----
- datapath/flow_netlink.c                           |  8 +-
- datapath/linux/compat/include/linux/openvswitch.h |  1 +
- datapath/linux/compat/include/net/vxlan.h         |  1 +
- datapath/linux/compat/vxlan.c                     |  4 +-
- datapath/vport-netdev.c                           |  3 +-
- datapath/vport-vxlan.c                            | 15 ++++
- include/openvswitch/match.h                       |  4 +
- include/openvswitch/meta-flow.h                   | 28 +++++++
- include/openvswitch/packets.h                     |  4 +-
- lib/flow.c                                        |  8 ++
- lib/match.c                                       | 34 +++++++++
- lib/meta-flow.c                                   | 36 +++++++++
- lib/netdev-vport.c                                |  2 +
- lib/nx-match.c                                    |  4 +
- lib/odp-util.c                                    | 89 ++++++++++++++++++++++-
- tests/ofproto.at                                  |  4 +-
- tests/ovs-ofctl.at                                |  4 +
- 17 files changed, 241 insertions(+), 8 deletions(-)
-
-diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
-index 0f32664..2dcae07 100644
---- a/datapath/flow_netlink.c
-+++ b/datapath/flow_netlink.c
-@@ -309,6 +309,7 @@ size_t ovs_key_attr_size(void)
- 
- static const struct ovs_len_tbl ovs_vxlan_ext_key_lens[OVS_VXLAN_EXT_MAX + 1] = {
- 	[OVS_VXLAN_EXT_GBP]	    = { .len = sizeof(u32) },
-+	[OVS_VXLAN_EXT_GPE]	    = { .len = sizeof(u32) },
- };
- 
- static const struct ovs_len_tbl ovs_tunnel_key_lens[OVS_TUNNEL_KEY_ATTR_MAX + 1] = {
-@@ -523,6 +524,9 @@ static int vxlan_tun_opt_from_nlattr(const struct nlattr *attr,
- 		case OVS_VXLAN_EXT_GBP:
- 			opts.gbp = nla_get_u32(a);
- 			break;
-+		case OVS_VXLAN_EXT_GPE:
-+			opts.gpe = nla_get_u32(a);
-+			break;
- 		default:
- 			OVS_NLERR(log, "Unknown VXLAN extension attribute %d",
- 				  type);
-@@ -709,7 +713,9 @@ static int vxlan_opt_to_nlattr(struct sk_buff *skb,
- 	if (!nla)
- 		return -EMSGSIZE;
- 
--	if (nla_put_u32(skb, OVS_VXLAN_EXT_GBP, opts->gbp) < 0)
-+	if (opts->gbp && nla_put_u32(skb, OVS_VXLAN_EXT_GBP, opts->gbp) < 0)
-+		return -EMSGSIZE;
-+	else if (opts->gpe && nla_put_u32(skb, OVS_VXLAN_EXT_GPE, opts->gpe) < 0)
- 		return -EMSGSIZE;
- 
- 	nla_nest_end(skb, nla);
-diff --git a/datapath/linux/compat/include/linux/openvswitch.h b/datapath/linux/compat/include/linux/openvswitch.h
-index 12260d8..44b7ce4 100644
---- a/datapath/linux/compat/include/linux/openvswitch.h
-+++ b/datapath/linux/compat/include/linux/openvswitch.h
-@@ -291,6 +291,7 @@ enum ovs_vport_attr {
- enum {
- 	OVS_VXLAN_EXT_UNSPEC,
- 	OVS_VXLAN_EXT_GBP,      /* Flag or __u32 */
-+	OVS_VXLAN_EXT_GPE,
- 	__OVS_VXLAN_EXT_MAX,
- };
- 
-diff --git a/datapath/linux/compat/include/net/vxlan.h b/datapath/linux/compat/include/net/vxlan.h
-index 5bc8969..5a994b2 100644
---- a/datapath/linux/compat/include/net/vxlan.h
-+++ b/datapath/linux/compat/include/net/vxlan.h
-@@ -201,6 +201,7 @@ reserved_flags2:2;
- 
- struct vxlan_metadata {
- 	u32		gbp;
-+	u32		gpe;
- };
- 
- /* per UDP socket information */
-diff --git a/datapath/linux/compat/vxlan.c b/datapath/linux/compat/vxlan.c
-index d5dbe8d..a80610b 100644
---- a/datapath/linux/compat/vxlan.c
-+++ b/datapath/linux/compat/vxlan.c
-@@ -705,7 +705,6 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
- 	if (vs->flags & VXLAN_F_GPE) {
- 		if (!vxlan_parse_gpe_hdr(&unparsed, &protocol, skb, vs->flags))
- 			goto drop;
--		raw_proto = true;
- 	}
- 
- 	if (__iptunnel_pull_header(skb, VXLAN_HLEN, protocol, raw_proto,
-@@ -896,10 +895,9 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
- 	if (vxflags & VXLAN_F_GBP)
- 		vxlan_build_gbp_hdr(vxh, vxflags, md);
- 	if (vxflags & VXLAN_F_GPE) {
--		err = vxlan_build_gpe_hdr(vxh, vxflags, skb->protocol);
-+		err = vxlan_build_gpe_hdr(vxh, vxflags, inner_protocol);
- 		if (err < 0)
- 			goto out_free;
--		inner_protocol = skb->protocol;
- 	}
- 
- 	ovs_skb_set_inner_protocol(skb, inner_protocol);
-diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
-index 970f7d3..0ee076b 100644
---- a/datapath/vport-netdev.c
-+++ b/datapath/vport-netdev.c
-@@ -102,7 +102,8 @@ struct vport *ovs_netdev_link(struct vport *vport, const char *name)
- 	}
- 
- 	if (vport->dev->flags & IFF_LOOPBACK ||
--	    vport->dev->type != ARPHRD_ETHER ||
-+	    (vport->dev->type != ARPHRD_ETHER &&
-+             vport->dev->type != ARPHRD_NONE) ||
- 	    ovs_is_internal_dev(vport->dev)) {
- 		err = -EINVAL;
- 		goto error_put;
-diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c
-index 11965c0..e32c970 100644
---- a/datapath/vport-vxlan.c
-+++ b/datapath/vport-vxlan.c
-@@ -52,6 +52,18 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb)
- 			return -EMSGSIZE;
- 
- 		nla_nest_end(skb, exts);
-+	} else if (vxlan->flags & VXLAN_F_GPE) {
-+		struct nlattr *exts;
-+
-+		exts = nla_nest_start(skb, OVS_TUNNEL_ATTR_EXTENSION);
-+		if (!exts)
-+			return -EMSGSIZE;
-+
-+		if (vxlan->flags & VXLAN_F_GPE &&
-+		    nla_put_flag(skb, OVS_VXLAN_EXT_GPE))
-+			return -EMSGSIZE;
-+
-+		nla_nest_end(skb, exts);
- 	}
- 
- 	return 0;
-@@ -59,6 +71,7 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb)
- 
- static const struct nla_policy exts_policy[OVS_VXLAN_EXT_MAX + 1] = {
- 	[OVS_VXLAN_EXT_GBP]	= { .type = NLA_FLAG, },
-+	[OVS_VXLAN_EXT_GPE]	= { .type = NLA_FLAG, },
- };
- 
- static int vxlan_configure_exts(struct vport *vport, struct nlattr *attr,
-@@ -76,6 +89,8 @@ static int vxlan_configure_exts(struct vport *vport, struct nlattr *attr,
- 
- 	if (exts[OVS_VXLAN_EXT_GBP])
- 		conf->flags |= VXLAN_F_GBP;
-+        else if (exts[OVS_VXLAN_EXT_GPE])
-+                conf->flags |= VXLAN_F_GPE;
- 
- 	return 0;
- }
-diff --git a/include/openvswitch/match.h b/include/openvswitch/match.h
-index 3b7f32f..93af1b8 100644
---- a/include/openvswitch/match.h
-+++ b/include/openvswitch/match.h
-@@ -89,6 +89,10 @@ void match_set_tun_gbp_id_masked(struct match *match, ovs_be16 gbp_id, ovs_be16
- void match_set_tun_gbp_id(struct match *match, ovs_be16 gbp_id);
- void match_set_tun_gbp_flags_masked(struct match *match, uint8_t flags, uint8_t mask);
- void match_set_tun_gbp_flags(struct match *match, uint8_t flags);
-+void match_set_tun_gpe_np_masked(struct match *match, uint8_t gpe_np, uint8_t mask);
-+void match_set_tun_gpe_np(struct match *match, uint8_t gpe_np);
-+void match_set_tun_gpe_flags_masked(struct match *match, uint8_t flags, uint8_t mask);
-+void match_set_tun_gpe_flags(struct match *match, uint8_t flags);
- void match_set_in_port(struct match *, ofp_port_t ofp_port);
- void match_set_pkt_mark(struct match *, uint32_t pkt_mark);
- void match_set_pkt_mark_masked(struct match *, uint32_t pkt_mark, uint32_t mask);
-diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h
-index b091c1b..9e569ef 100644
---- a/include/openvswitch/meta-flow.h
-+++ b/include/openvswitch/meta-flow.h
-@@ -493,6 +493,34 @@ enum OVS_PACKED_ENUM mf_field_id {
-      */
-     MFF_TUN_GBP_FLAGS,
- 
-+     /* "tun_gpe_np".
-+     *
-+     * VXLAN Generic Protocol Extension next_proto
-+     *
-+     * Type: u8.
-+     * Maskable: bitwise.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_TUN_GPE_NP(200) since v2.4.
-+     * OXM: none.
-+     */
-+    MFF_TUN_GPE_NP,
-+
-+     /* "tun_gpe_flags".
-+     *
-+     * VXLAN Generic Protocol Extension flag
-+     *
-+     * Type: u8.
-+     * Maskable: bitwise.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_TUN_GPE_FLAGS(201) since v2.4.
-+     * OXM: none.
-+     */
-+    MFF_TUN_GPE_FLAGS,
-+
- #if TUN_METADATA_NUM_OPTS == 64
-     /* "tun_metadata<N>".
-      *
-diff --git a/include/openvswitch/packets.h b/include/openvswitch/packets.h
-index 5d97309..1e82df0 100644
---- a/include/openvswitch/packets.h
-+++ b/include/openvswitch/packets.h
-@@ -34,7 +34,9 @@ struct flow_tnl {
-     ovs_be16 tp_dst;
-     ovs_be16 gbp_id;
-     uint8_t  gbp_flags;
--    uint8_t  pad1[5];        /* Pad to 64 bits. */
-+    uint8_t  gpe_np;
-+    uint8_t  gpe_flags;
-+    uint8_t  pad1[3];        /* Pad to 64 bits. */
-     struct tun_metadata metadata;
- };
- 
-diff --git a/lib/flow.c b/lib/flow.c
-index ba4f8c7..375979b 100644
---- a/lib/flow.c
-+++ b/lib/flow.c
-@@ -897,6 +897,12 @@ flow_get_metadata(const struct flow *flow, struct match *flow_metadata)
-     if (flow->tunnel.gbp_flags) {
-         match_set_tun_gbp_flags(flow_metadata, flow->tunnel.gbp_flags);
-     }
-+    if (flow->tunnel.gpe_np != htons(0)) {
-+        match_set_tun_gpe_np(flow_metadata, flow->tunnel.gpe_np);
-+    }
-+    if (flow->tunnel.gpe_flags) {
-+        match_set_tun_gpe_flags(flow_metadata, flow->tunnel.gpe_flags);
-+    }
-     tun_metadata_get_fmd(&flow->tunnel, flow_metadata);
-     if (flow->metadata != htonll(0)) {
-         match_set_metadata(flow_metadata, flow->metadata);
-@@ -1292,6 +1298,8 @@ void flow_wildcards_init_for_packet(struct flow_wildcards *wc,
-         WC_MASK_FIELD(wc, tunnel.tp_dst);
-         WC_MASK_FIELD(wc, tunnel.gbp_id);
-         WC_MASK_FIELD(wc, tunnel.gbp_flags);
-+        WC_MASK_FIELD(wc, tunnel.gpe_np);
-+        WC_MASK_FIELD(wc, tunnel.gpe_flags);
- 
-         if (!(flow->tunnel.flags & FLOW_TNL_F_UDPIF)) {
-             if (flow->tunnel.metadata.present.map) {
-diff --git a/lib/match.c b/lib/match.c
-index d78e6a1..f19648d 100644
---- a/lib/match.c
-+++ b/lib/match.c
-@@ -305,6 +305,32 @@ match_set_tun_gbp_flags(struct match *match, uint8_t flags)
- }
- 
- void
-+match_set_tun_gpe_np_masked(struct match *match, uint8_t np, uint8_t mask)
-+{
-+    match->wc.masks.tunnel.gpe_np = mask;
-+    match->flow.tunnel.gpe_np = np & mask;
-+}
-+
-+void
-+match_set_tun_gpe_np(struct match *match, uint8_t np)
-+{
-+    match_set_tun_gpe_np_masked(match, np, UINT8_MAX);
-+}
-+
-+void
-+match_set_tun_gpe_flags_masked(struct match *match, uint8_t flags, uint8_t mask)
-+{
-+    match->wc.masks.tunnel.gpe_flags = mask;
-+    match->flow.tunnel.gpe_flags = flags & mask;
-+}
-+
-+void
-+match_set_tun_gpe_flags(struct match *match, uint8_t flags)
-+{
-+    match_set_tun_gpe_flags_masked(match, flags, UINT8_MAX);
-+}
-+
-+void
- match_set_in_port(struct match *match, ofp_port_t ofp_port)
- {
-     match->wc.masks.in_port.ofp_port = u16_to_ofp(UINT16_MAX);
-@@ -1029,6 +1055,14 @@ format_flow_tunnel(struct ds *s, const struct match *match)
-         ds_put_format(s, "tun_gbp_flags=%#"PRIx8",", tnl->gbp_flags);
-     }
- 
-+    if (wc->masks.tunnel.gpe_np) {
-+        ds_put_format(s, "tun_gpe_np=%#"PRIx8",", tnl->gpe_np);
-+    }
-+
-+    if (wc->masks.tunnel.gpe_flags) {
-+        ds_put_format(s, "tun_gpe_flags=%#"PRIx8",", tnl->gpe_flags);
-+    }
-+
-     if (wc->masks.tunnel.ip_tos) {
-         ds_put_format(s, "tun_tos=%"PRIx8",", tnl->ip_tos);
-     }
-diff --git a/lib/meta-flow.c b/lib/meta-flow.c
-index d07f927..5d0721f 100644
---- a/lib/meta-flow.c
-+++ b/lib/meta-flow.c
-@@ -213,6 +213,10 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
-         return !wc->masks.tunnel.gbp_id;
-     case MFF_TUN_GBP_FLAGS:
-         return !wc->masks.tunnel.gbp_flags;
-+    case MFF_TUN_GPE_NP:
-+        return !wc->masks.tunnel.gpe_np;
-+    case MFF_TUN_GPE_FLAGS:
-+        return !wc->masks.tunnel.gpe_flags;
-     CASE_MFF_TUN_METADATA:
-         return !ULLONG_GET(wc->masks.tunnel.metadata.present.map,
-                            mf->id - MFF_TUN_METADATA0);
-@@ -434,6 +438,8 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value)
-     case MFF_TUN_TTL:
-     case MFF_TUN_GBP_ID:
-     case MFF_TUN_GBP_FLAGS:
-+    case MFF_TUN_GPE_NP:
-+    case MFF_TUN_GPE_FLAGS:
-     CASE_MFF_TUN_METADATA:
-     case MFF_METADATA:
-     case MFF_IN_PORT:
-@@ -568,6 +574,12 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow,
-     case MFF_TUN_GBP_FLAGS:
-         value->u8 = flow->tunnel.gbp_flags;
-         break;
-+    case MFF_TUN_GPE_NP:
-+        value->u8 = flow->tunnel.gpe_np;
-+        break;
-+    case MFF_TUN_GPE_FLAGS:
-+        value->u8 = flow->tunnel.gpe_flags;
-+        break;
-     case MFF_TUN_TTL:
-         value->u8 = flow->tunnel.ip_ttl;
-         break;
-@@ -823,6 +835,12 @@ mf_set_value(const struct mf_field *mf,
-     case MFF_TUN_GBP_FLAGS:
-          match_set_tun_gbp_flags(match, value->u8);
-          break;
-+    case MFF_TUN_GPE_NP:
-+         match_set_tun_gpe_np(match, value->u8);
-+         break;
-+    case MFF_TUN_GPE_FLAGS:
-+         match_set_tun_gpe_flags(match, value->u8);
-+         break;
-     case MFF_TUN_TOS:
-         match_set_tun_tos(match, value->u8);
-         break;
-@@ -1161,6 +1179,12 @@ mf_set_flow_value(const struct mf_field *mf,
-     case MFF_TUN_GBP_FLAGS:
-         flow->tunnel.gbp_flags = value->u8;
-         break;
-+    case MFF_TUN_GPE_NP:
-+        flow->tunnel.gpe_np= value->u8;
-+        break;
-+    case MFF_TUN_GPE_FLAGS:
-+        flow->tunnel.gpe_flags= value->u8;
-+        break;
-     case MFF_TUN_TOS:
-         flow->tunnel.ip_tos = value->u8;
-         break;
-@@ -1484,6 +1508,12 @@ mf_set_wild(const struct mf_field *mf, struct match *match, char **err_str)
-     case MFF_TUN_GBP_FLAGS:
-         match_set_tun_gbp_flags_masked(match, 0, 0);
-         break;
-+    case MFF_TUN_GPE_NP:
-+        match_set_tun_gpe_np_masked(match, 0, 0);
-+        break;
-+    case MFF_TUN_GPE_FLAGS:
-+        match_set_tun_gpe_flags_masked(match, 0, 0);
-+        break;
-     case MFF_TUN_TOS:
-         match_set_tun_tos_masked(match, 0, 0);
-         break;
-@@ -1793,6 +1823,12 @@ mf_set(const struct mf_field *mf,
-     case MFF_TUN_GBP_FLAGS:
-         match_set_tun_gbp_flags_masked(match, value->u8, mask->u8);
-         break;
-+    case MFF_TUN_GPE_NP:
-+        match_set_tun_gpe_np_masked(match, value->u8, mask->u8);
-+        break;
-+    case MFF_TUN_GPE_FLAGS:
-+        match_set_tun_gpe_flags_masked(match, value->u8, mask->u8);
-+        break;
-     case MFF_TUN_TTL:
-         match_set_tun_ttl_masked(match, value->u8, mask->u8);
-         break;
-diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
-index ac31da6..cff0f5c 100644
---- a/lib/netdev-vport.c
-+++ b/lib/netdev-vport.c
-@@ -526,6 +526,8 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args)
-             while (ext) {
-                 if (!strcmp(type, "vxlan") && !strcmp(ext, "gbp")) {
-                     tnl_cfg.exts |= (1 << OVS_VXLAN_EXT_GBP);
-+                } else if (!strcmp(type, "vxlan") && !strcmp(ext, "gpe")) {
-+                    tnl_cfg.exts |= (1 << OVS_VXLAN_EXT_GPE);
-                 } else {
-                     VLOG_WARN("%s: unknown extension '%s'", name, ext);
-                 }
-diff --git a/lib/nx-match.c b/lib/nx-match.c
-index b03ccf2..65d7ee3 100644
---- a/lib/nx-match.c
-+++ b/lib/nx-match.c
-@@ -1036,6 +1036,10 @@ nx_put_raw(struct ofpbuf *b, enum ofp_version oxm, const struct match *match,
-                 flow->tunnel.gbp_id, match->wc.masks.tunnel.gbp_id);
-     nxm_put_8m(b, MFF_TUN_GBP_FLAGS, oxm,
-                flow->tunnel.gbp_flags, match->wc.masks.tunnel.gbp_flags);
-+    nxm_put_8m(b, MFF_TUN_GPE_NP, oxm,
-+               flow->tunnel.gpe_np, match->wc.masks.tunnel.gpe_np);
-+    nxm_put_8m(b, MFF_TUN_GPE_FLAGS, oxm,
-+               flow->tunnel.gpe_flags, match->wc.masks.tunnel.gpe_flags);
-     tun_metadata_to_nx_match(b, oxm, match);
- 
-     /* Registers. */
-diff --git a/lib/odp-util.c b/lib/odp-util.c
-index 6d29b67..b9e8aa7 100644
---- a/lib/odp-util.c
-+++ b/lib/odp-util.c
-@@ -1755,6 +1755,7 @@ odp_actions_from_string(const char *s, const struct simap *port_names,
- 
- static const struct attr_len_tbl ovs_vxlan_ext_attr_lens[OVS_VXLAN_EXT_MAX + 1] = {
-     [OVS_VXLAN_EXT_GBP]                 = { .len = 4 },
-+    [OVS_VXLAN_EXT_GPE]                 = { .len = 4 },
- };
- 
- static const struct attr_len_tbl ovs_tun_key_attr_lens[OVS_TUNNEL_KEY_ATTR_MAX + 1] = {
-@@ -1916,7 +1917,10 @@ odp_tun_key_from_attr__(const struct nlattr *attr,
-             break;
-         case OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS: {
-             static const struct nl_policy vxlan_opts_policy[] = {
--                [OVS_VXLAN_EXT_GBP] = { .type = NL_A_U32 },
-+                [OVS_VXLAN_EXT_GBP] = { .type = NL_A_U32 ,
-+                                        .optional = true },
-+                [OVS_VXLAN_EXT_GPE] = { .type = NL_A_U32 ,
-+                                        .optional = true },
-             };
-             struct nlattr *ext[ARRAY_SIZE(vxlan_opts_policy)];
- 
-@@ -1930,6 +1934,12 @@ odp_tun_key_from_attr__(const struct nlattr *attr,
-                 tun->gbp_id = htons(gbp & 0xFFFF);
-                 tun->gbp_flags = (gbp >> 16) & 0xFF;
-             }
-+            if (ext[OVS_VXLAN_EXT_GPE]) {
-+                uint32_t gpe = nl_attr_get_u32(ext[OVS_VXLAN_EXT_GPE]);
-+
-+                tun->gpe_np = gpe & 0xFF;
-+                tun->gpe_flags = gpe >> 24;
-+            }
- 
-             break;
-         }
-@@ -2016,6 +2026,13 @@ tun_key_to_attr(struct ofpbuf *a, const struct flow_tnl *tun_key,
-         nl_msg_put_u32(a, OVS_VXLAN_EXT_GBP,
-                        (tun_key->gbp_flags << 16) | ntohs(tun_key->gbp_id));
-         nl_msg_end_nested(a, vxlan_opts_ofs);
-+    } else if (tun_key->gpe_flags || tun_key->gpe_np) {
-+        size_t vxlan_opts_ofs;
-+
-+        vxlan_opts_ofs = nl_msg_start_nested(a, OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS);
-+        nl_msg_put_u32(a, OVS_VXLAN_EXT_GPE,
-+                (tun_key->gpe_flags << 24) | (tun_key->gpe_np));
-+        nl_msg_end_nested(a, vxlan_opts_ofs);
-     }
-     tun_metadata_to_geneve_nlattr(tun_key, tun_flow_key, key_buf, a);
- 
-@@ -2410,6 +2427,26 @@ format_odp_tun_vxlan_opt(const struct nlattr *attr,
-             ds_put_cstr(ds, "),");
-             break;
-         }
-+        case OVS_VXLAN_EXT_GPE: {
-+            uint32_t key = nl_attr_get_u32(a);
-+            uint8_t np, np_mask;
-+            uint8_t flags, flags_mask;
-+
-+            np = key & 0xFF;
-+            flags = (key >> 24) & 0xFF;
-+            if (ma) {
-+                uint32_t mask = nl_attr_get_u32(ma);
-+                np_mask = mask & 0xFF;
-+                flags_mask = (mask >> 24) & 0xFF;
-+            }
-+
-+            ds_put_cstr(ds, "gpe(");
-+            format_u8x(ds, "np", np, ma ? &np_mask : NULL, verbose);
-+            format_u8x(ds, "flags", flags, ma ? &flags_mask : NULL, verbose);
-+            ds_chomp(ds, ',');
-+            ds_put_cstr(ds, "),");
-+            break;
-+        }
- 
-         default:
-             format_unknown_key(ds, a, ma);
-@@ -3705,6 +3742,40 @@ scan_vxlan_gbp(const char *s, uint32_t *key, uint32_t *mask)
- }
- 
- static int
-+scan_vxlan_gpe(const char *s, uint32_t *key, uint32_t *mask)
-+{
-+    const char *s_base = s;
-+    uint8_t np = 0, np_mask = 0;
-+    uint8_t flags = 0, flags_mask = 0;
-+
-+    if (!strncmp(s, "np=", 3)) {
-+        s += 3;
-+        s += scan_u8(s, &np, mask ? &np_mask : NULL);
-+    }
-+
-+    if (s[0] == ',') {
-+        s++;
-+    }
-+    if (!strncmp(s, "flags=", 6)) {
-+        s += 6;
-+        s += scan_u8(s, &flags, mask ? &flags_mask : NULL);
-+    }
-+
-+    if (!strncmp(s, "))", 2)) {
-+        s += 2;
-+
-+        *key = (flags << 24) | np;
-+        if (mask) {
-+            *mask = (flags_mask << 24) | np_mask;
-+        }
-+
-+        return s - s_base;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
- scan_geneve(const char *s, struct geneve_scan *key, struct geneve_scan *mask)
- {
-     const char *s_base = s;
-@@ -3831,6 +3902,21 @@ vxlan_gbp_to_attr(struct ofpbuf *a, const void *data_)
- }
- 
- static void
-+vxlan_gpe_to_attr(struct ofpbuf *a, const void *data_)
-+{
-+    const uint32_t *gpe = data_;
-+
-+    if (*gpe) {
-+        size_t vxlan_opts_ofs;
-+
-+        vxlan_opts_ofs = nl_msg_start_nested(a, OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS);
-+        nl_msg_put_u32(a, OVS_VXLAN_EXT_GPE, *gpe);
-+        nl_msg_end_nested(a, vxlan_opts_ofs);
-+    }
-+}
-+
-+
-+static void
- geneve_to_attr(struct ofpbuf *a, const void *data_)
- {
-     const struct geneve_scan *geneve = data_;
-@@ -4066,6 +4152,7 @@ parse_odp_key_mask_attr(const char *s, const struct simap *port_names,
-         SCAN_FIELD_NESTED("tp_src=", ovs_be16, be16, OVS_TUNNEL_KEY_ATTR_TP_SRC);
-         SCAN_FIELD_NESTED("tp_dst=", ovs_be16, be16, OVS_TUNNEL_KEY_ATTR_TP_DST);
-         SCAN_FIELD_NESTED_FUNC("vxlan(gbp(", uint32_t, vxlan_gbp, vxlan_gbp_to_attr);
-+        SCAN_FIELD_NESTED_FUNC("vxlan(gpe(", uint32_t, vxlan_gpe, vxlan_gpe_to_attr);
-         SCAN_FIELD_NESTED_FUNC("geneve(", struct geneve_scan, geneve,
-                                geneve_to_attr);
-         SCAN_FIELD_NESTED_FUNC("flags(", uint16_t, tun_flags, tun_flags_to_attr);
-diff --git a/tests/ofproto.at b/tests/ofproto.at
-index 6e55270..7b7f02b 100644
---- a/tests/ofproto.at
-+++ b/tests/ofproto.at
-@@ -2190,7 +2190,7 @@ head_table () {
-       instructions: meter,apply_actions,clear_actions,write_actions,write_metadata,goto_table
-       Write-Actions and Apply-Actions features:
-         actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue
--        supported on Set-Field: tun_id tun_src tun_dst tun_ipv6_src tun_ipv6_dst tun_flags tun_gbp_id tun_gbp_flags tun_metadata0 dnl
-+        supported on Set-Field: tun_id tun_src tun_dst tun_ipv6_src tun_ipv6_dst tun_flags tun_gbp_id tun_gbp_flags tun_gpe_np tun_gpe_flags tun_metadata0 dnl
- tun_metadata1 tun_metadata2 tun_metadata3 tun_metadata4 tun_metadata5 tun_metadata6 tun_metadata7 tun_metadata8 tun_metadata9 tun_metadata10 tun_metadata11 tun_metadata12 tun_metadata13 tun_metadata14 tun_metadata15 tun_metadata16 tun_metadata17 tun_metadata18 tun_metadata19 tun_metadata20 tun_metadata21 tun_metadata22 tun_metadata23 tun_metadata24 tun_metadata25 tun_metadata26 tun_metadata27 tun_metadata28 tun_metadata29 tun_metadata30 tun_metadata31 tun_metadata32 tun_metadata33 tun_metadata34 tun_metadata35 tun_metadata36 tun_metadata37 tun_metadata38 tun_metadata39 tun_metadata40 tun_metadata41 tun_metadata42 tun_metadata43 tun_metadata44 tun_metadata45 tun_metadata46 tun_metadata47 tun_metadata48 tun_metadata49 tun_metadata50 tun_metadata51 tun_metadata52 tun_metadata53 tun_metadata54 tun_metadata55 tun_metadata56 tun_metadata57 tun_metadata58 tun_metadata59 tun_metadata60 tun_metadata61 tun_metadata62 tun_metadata63 dnl
- metadata in_port in_port_oxm pkt_mark ct_mark ct_label reg0 reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 reg9 reg10 reg11 reg12 reg13 reg14 reg15 xreg0 xreg1 xreg2 xreg3 xreg4 xreg5 xreg6 xreg7 xxreg0 xxreg1 xxreg2 xxreg3 eth_src eth_dst vlan_tci vlan_vid vlan_pcp mpls_label mpls_tc mpls_ttl ip_src ip_dst ipv6_src ipv6_dst ipv6_label nw_tos ip_dscp nw_ecn nw_ttl arp_op arp_spa arp_tpa arp_sha arp_tha tcp_src tcp_dst udp_src udp_dst sctp_src sctp_dst icmp_type icmp_code icmpv6_type icmpv6_code nd_target nd_sll nd_tll
-     matching:
-@@ -2205,6 +2205,8 @@ metadata in_port in_port_oxm pkt_mark ct_mark ct_label reg0 reg1 reg2 reg3 reg4
-       tun_flags: arbitrary mask
-       tun_gbp_id: arbitrary mask
-       tun_gbp_flags: arbitrary mask
-+      tun_gpe_np: arbitrary mask
-+      tun_gpe_flags: arbitrary mask
-       tun_metadata0: arbitrary mask
-       tun_metadata1: arbitrary mask
-       tun_metadata2: arbitrary mask
-diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
-index cbb818e..2267be0 100644
---- a/tests/ovs-ofctl.at
-+++ b/tests/ovs-ofctl.at
-@@ -17,6 +17,10 @@ for test_case in \
-     'tun_gbp_id=0/0x1                            NXM,OXM' \
-     'tun_gbp_flags=0                             NXM,OXM' \
-     'tun_gbp_flags=0/0x1                         NXM,OXM' \
-+    'tun_gpe_np=0                                NXM,OXM' \
-+    'tun_gpe_np=0/0x1                            NXM,OXM' \
-+    'tun_gpe_flags=0                             NXM,OXM' \
-+    'tun_gpe_flags=0/0x1                         NXM,OXM' \
-     'tun_metadata0=0                             NXM,OXM' \
-     'tun_metadata0=0/0x1                         NXM,OXM' \
-     'tun_metadata0                               NXM,OXM' \
--- 
-2.1.0
-
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0002-Add-NSH-support-in-kernel-and-userspace-data-planes.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0002-Add-NSH-support-in-kernel-and-userspace-data-planes.patch
deleted file mode 100644
index f22e8de..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0002-Add-NSH-support-in-kernel-and-userspace-data-planes.patch
+++ /dev/null
@@ -1,3147 +0,0 @@
-From 653c2f6777a6c4f3559a55c8f5a88f4aca313788 Mon Sep 17 00:00:00 2001
-From: Yi Yang <yi.y.yang@intel.com>
-Date: Mon, 14 Nov 2016 12:08:14 +0800
-Subject: [PATCH 2/8] Add NSH support in kernel and userspace data planes
-
-features includes:
-  * push_nsh and pop_nsh actions
-  * support Ethernet+NSH and VxLAN-gpe+NSH
-  * support the same features in DPDK netdev
-  * news match fields: nsp, nsi, nshc1, nshc2, nshc3, nshc4, nsh_mdtype,
-    nsh_np, encap_eth_src, encap_eth_dst, encap_eth_type, gpe_np
-
-Signed-off-by: Yi Yang <yi.y.yang@intel.com>
----
- datapath/actions.c                                |  39 +++
- datapath/datapath.h                               |   2 +
- datapath/flow.c                                   | 101 +++++++
- datapath/flow.h                                   |   1 +
- datapath/flow_netlink.c                           |  59 +++-
- datapath/linux/compat/include/linux/openvswitch.h | 166 ++++++++++++
- include/openvswitch/automake.mk                   |   3 +-
- include/openvswitch/flow.h                        |  19 +-
- include/openvswitch/match.h                       |  24 ++
- include/openvswitch/meta-flow.h                   | 174 ++++++++++++
- include/openvswitch/ofp-actions.h                 |   4 +
- include/openvswitch/vxlangpe.h                    |  76 ++++++
- lib/dpif-netdev.c                                 |  39 ++-
- lib/dpif.c                                        |   2 +
- lib/flow.c                                        | 106 +++++++-
- lib/match.c                                       | 189 +++++++++++++
- lib/meta-flow.c                                   | 256 +++++++++++++++++-
- lib/netdev-native-tnl.c                           |  91 ++++++-
- lib/netdev-vport.c                                |  10 +-
- lib/netdev-vport.h                                |   6 +
- lib/nx-match.c                                    |  18 ++
- lib/odp-execute.c                                 |  19 ++
- lib/odp-util.c                                    | 279 ++++++++++++++++++-
- lib/odp-util.h                                    |   6 +-
- lib/ofp-actions.c                                 |  80 +++++-
- lib/packets.c                                     |  23 ++
- lib/packets.h                                     |   3 +
- ofproto/ofproto-dpif-sflow.c                      |   1 +
- ofproto/ofproto-dpif-upcall.c                     |  11 +
- ofproto/ofproto-dpif-xlate.c                      |  13 +
- ofproto/ofproto-dpif.h                            |   1 -
- ofproto/tunnel.c                                  |   1 +
- tests/ofproto.at                                  |  12 +-
- tests/tunnel.at                                   | 316 ++++++++++++++++++++++
- 34 files changed, 2115 insertions(+), 35 deletions(-)
- create mode 100644 include/openvswitch/vxlangpe.h
-
-diff --git a/datapath/actions.c b/datapath/actions.c
-index 82833d0..c979596 100644
---- a/datapath/actions.c
-+++ b/datapath/actions.c
-@@ -265,6 +265,37 @@ static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key,
- 			     ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT);
- }
- 
-+static int pop_nsh(struct sk_buff *skb, struct sw_flow_key *key)
-+{
-+	if (!pskb_may_pull(skb, ETH_NSH_TYPE1_HEADER_SIZE))
-+		return -ENOMEM;
-+	else
-+		__skb_pull(skb, ETH_NSH_TYPE1_HEADER_SIZE);
-+
-+	return 0;
-+}
-+
-+static int push_nsh(struct sk_buff *skb, struct sw_flow_key *key,
-+		     const struct ovs_action_push_nsh *nsh)
-+{
-+
-+	if (nsh->nsh_mdtype == NSH_M_TYPE1) {
-+		if (skb_cow_head(skb, ETH_NSH_TYPE1_HEADER_SIZE) < 0) {
-+			return -ENOMEM;
-+                }
-+
-+		skb_push(skb, ETH_NSH_TYPE1_HEADER_SIZE);
-+		OVS_CB(skb)->encap_eth_header = (struct encap_eth_hdr *)skb->data;
-+		OVS_CB(skb)->nsh_header = (struct nsh_hdr *)(skb->data + ENCAP_ETH_LEN);
-+		memcpy(skb->data, nsh->header, ETH_NSH_TYPE1_HEADER_SIZE);
-+                OVS_CB(skb)->encap_eth_header->encap_eth_type = htons(ETH_P_NSH);
-+	}
-+	else
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
- /* 'src' is already properly masked. */
- static void ether_addr_copy_masked(u8 *dst_, const u8 *src_, const u8 *mask_)
- {
-@@ -1140,6 +1171,14 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
- 			err = pop_vlan(skb, key);
- 			break;
- 
-+		case OVS_ACTION_ATTR_PUSH_NSH:
-+			err = push_nsh(skb, key, nla_data(a));
-+			break;
-+
-+		case OVS_ACTION_ATTR_POP_NSH:
-+			err = pop_nsh(skb, key);
-+			break;
-+
- 		case OVS_ACTION_ATTR_RECIRC:
- 			err = execute_recirc(dp, skb, key, a, rem);
- 			if (nla_is_last(a, rem)) {
-diff --git a/datapath/datapath.h b/datapath/datapath.h
-index 22bbaac..a6b2a44 100644
---- a/datapath/datapath.h
-+++ b/datapath/datapath.h
-@@ -108,6 +108,8 @@ struct ovs_skb_cb {
- 	struct vport		*input_vport;
- 	u16			mru;
- 	u32			cutlen;
-+	struct nsh_hdr          *nsh_header;
-+	struct encap_eth_hdr    *encap_eth_header;
- };
- #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
- 
-diff --git a/datapath/flow.c b/datapath/flow.c
-index 390286c..8c4d583 100644
---- a/datapath/flow.c
-+++ b/datapath/flow.c
-@@ -44,6 +44,7 @@
- #include <net/ipv6.h>
- #include <net/mpls.h>
- #include <net/ndisc.h>
-+#include <net/vxlan.h>
- 
- #include "datapath.h"
- #include "conntrack.h"
-@@ -323,6 +324,26 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
- 	return 0;
- }
- 
-+static int parse_nsh(struct sk_buff *skb, struct sw_flow_key *key){
-+        struct nsh_hdr *nsh_hdr = NULL;
-+
-+        OVS_CB(skb)->encap_eth_header = (struct encap_eth_hdr *)skb->data;
-+	nsh_hdr = (struct nsh_hdr *)((const char *)skb->data + ENCAP_ETH_LEN);
-+	OVS_CB(skb)->nsh_header = nsh_hdr;
-+	memcpy(&key->nsh.encap_eth_dst, skb->data, ENCAP_ETH_LEN);
-+	key->nsh.nsh_mdtype = nsh_hdr->base.mdtype;
-+	if (key->nsh.nsh_mdtype != NSH_M_TYPE1)
-+		return -EPERM;
-+	key->nsh.nsh_np = nsh_hdr->base.proto;
-+	key->nsh.nsi = nsh_hdr->base.svc_idx;
-+	key->nsh.nsp = nsh_hdr->base.path_hdr << 8;
-+	key->nsh.nshc1 = nsh_hdr->ctx.nshc1;
-+	key->nsh.nshc2 = nsh_hdr->ctx.nshc2;
-+	key->nsh.nshc3 = nsh_hdr->ctx.nshc3;
-+	key->nsh.nshc4 = nsh_hdr->ctx.nshc4;
-+	return 0;
-+}
-+
- static __be16 parse_ethertype(struct sk_buff *skb)
- {
- 	struct llc_snap_hdr {
-@@ -461,6 +482,22 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
- {
- 	int error;
- 	struct ethhdr *eth;
-+        int is_eth_nsh = 0;
-+
-+	/* Extract ethernet+nsh if ethernet type is 0x894F */
-+	eth = (struct ethhdr *)skb->data;
-+	if (eth->h_proto == htons(ETH_P_NSH)) {
-+		if (unlikely(parse_nsh(skb, key)))
-+			return -EINVAL;
-+		if (key->nsh.nsh_mdtype == NSH_M_TYPE1 && key->nsh.nsh_np == NSH_P_ETHERNET) {
-+			__skb_pull(skb, ENCAP_ETH_LEN + NSH_M_TYPE1_LEN);
-+                        is_eth_nsh = 1;
-+		} else {
-+			return -EINVAL;
-+		}
-+	} else {
-+                memset(&key->nsh, 0, sizeof(key->nsh));
-+	}
- 
- 	/* Flags are always used as part of stats */
- 	key->tp.flags = 0;
-@@ -685,11 +722,56 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
- 			}
- 		}
- 	}
-+
-+        if (is_eth_nsh == 1) {
-+		__skb_push(skb, ENCAP_ETH_LEN + NSH_M_TYPE1_LEN);
-+        }
-+
- 	return 0;
- }
- 
-+static void ovs_key_nsh_init(struct sw_flow_key *key) {
-+	memset(&key->nsh, 0, sizeof(key->nsh));
-+}
-+
-+static int nsh_extract(struct sk_buff *skb, struct sw_flow_key *key) {
-+	int ret;
-+
-+	/* only support NSH MD tpye1 */
-+	if (unlikely(parse_nsh(skb, key)))
-+		return -EINVAL;
-+	if (key->nsh.nsh_mdtype == NSH_M_TYPE1) {
-+		__skb_pull(skb, ENCAP_ETH_LEN + NSH_M_TYPE1_LEN);
-+		if(key->nsh.nsh_np == NSH_P_ETHERNET)
-+			ret = key_extract(skb, key);
-+		else
-+			return -EINVAL;
-+		__skb_push(skb, ENCAP_ETH_LEN + NSH_M_TYPE1_LEN);
-+
-+		return ret;
-+	} else {
-+		ovs_key_nsh_init(key);
-+	}
-+
-+	return 0;
-+}
-+
-+static bool is_nsh_header(const void *tun_opts, __be16 tun_flags, struct sk_buff *skb) {
-+	if (tun_opts && (tun_flags & TUNNEL_VXLAN_OPT)) {
-+            /* ethernet+nsh if ethernet type is 0x894F */
-+            struct ethhdr * eth = (struct ethhdr *)skb->data;
-+            if (eth->h_proto == htons(ETH_P_NSH)) {
-+		return true;
-+	    } else {
-+		return false;
-+            }
-+        }
-+	return false;
-+}
-+
- int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key)
- {
-+	ovs_key_nsh_init(key);
- 	return key_extract(skb, key);
- }
- 
-@@ -723,6 +805,15 @@ int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
- 	key->ovs_flow_hash = 0;
- 	key->recirc_id = 0;
- 
-+	/* Extract NSH and inner Ethernet if NSH header exists */
-+	if (tun_info && is_nsh_header(TUN_METADATA_OPTS(key, key->tun_opts_len), key->tun_key.tun_flags, skb)) {
-+		int ret ;
-+		ret = nsh_extract(skb, key);
-+		if (key->nsh.nsh_mdtype)
-+			return ret;
-+	} else {
-+		ovs_key_nsh_init(key);
-+	}
- 	return key_extract(skb, key);
- }
- 
-@@ -739,5 +830,15 @@ int ovs_flow_key_extract_userspace(struct net *net, const struct nlattr *attr,
- 	if (err)
- 		return err;
- 
-+	/* Extract NSH and inner Ethernet if NSH header exists */
-+	if (key && is_nsh_header(key->tun_opts, key->tun_key.tun_flags, skb)) {
-+		int ret ;
-+		ret = nsh_extract(skb, key);
-+		if (key->nsh.nsh_mdtype)
-+			return ret;
-+	} else {
-+		ovs_key_nsh_init(key);
-+	}
-+
- 	return key_extract(skb, key);
- }
-diff --git a/datapath/flow.h b/datapath/flow.h
-index 2dd0696..bfe3423 100644
---- a/datapath/flow.h
-+++ b/datapath/flow.h
-@@ -64,6 +64,7 @@ struct sw_flow_key {
- 		u16	in_port;	/* Input switch port (or DP_MAX_PORTS). */
- 	} __packed phy; /* Safe when right after 'tun_key'. */
- 	u8 tun_proto;                   /* Protocol of encapsulating tunnel. */
-+        struct ovs_key_nsh nsh;         /* network service header */
- 	u32 ovs_flow_hash;		/* Datapath computed hash value.  */
- 	u32 recirc_id;			/* Recirculation ID.  */
- 	struct {
-diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
-index 2dcae07..6952380 100644
---- a/datapath/flow_netlink.c
-+++ b/datapath/flow_netlink.c
-@@ -284,7 +284,7 @@ size_t ovs_key_attr_size(void)
- 	/* Whenever adding new OVS_KEY_ FIELDS, we should consider
- 	 * updating this function.
- 	 */
--	BUILD_BUG_ON(OVS_KEY_ATTR_TUNNEL_INFO != 26);
-+	BUILD_BUG_ON(OVS_KEY_ATTR_TUNNEL_INFO != 27);
- 
- 	return    nla_total_size(4)   /* OVS_KEY_ATTR_PRIORITY */
- 		+ nla_total_size(0)   /* OVS_KEY_ATTR_TUNNEL */
-@@ -297,6 +297,7 @@ size_t ovs_key_attr_size(void)
- 		+ nla_total_size(2)   /* OVS_KEY_ATTR_CT_ZONE */
- 		+ nla_total_size(4)   /* OVS_KEY_ATTR_CT_MARK */
- 		+ nla_total_size(16)  /* OVS_KEY_ATTR_CT_LABELS */
-+		+ nla_total_size(40)   /* OVS_KEY_ATTR_NSH */
- 		+ nla_total_size(12)  /* OVS_KEY_ATTR_ETHERNET */
- 		+ nla_total_size(2)   /* OVS_KEY_ATTR_ETHERTYPE */
- 		+ nla_total_size(4)   /* OVS_KEY_ATTR_VLAN */
-@@ -336,6 +337,7 @@ static const struct ovs_len_tbl ovs_key_lens[OVS_KEY_ATTR_MAX + 1] = {
- 	[OVS_KEY_ATTR_PRIORITY]	 = { .len = sizeof(u32) },
- 	[OVS_KEY_ATTR_IN_PORT]	 = { .len = sizeof(u32) },
- 	[OVS_KEY_ATTR_SKB_MARK]	 = { .len = sizeof(u32) },
-+	[OVS_KEY_ATTR_NSH]	 = { .len = sizeof(struct ovs_key_nsh) },
- 	[OVS_KEY_ATTR_ETHERNET]	 = { .len = sizeof(struct ovs_key_ethernet) },
- 	[OVS_KEY_ATTR_VLAN]	 = { .len = sizeof(__be16) },
- 	[OVS_KEY_ATTR_ETHERTYPE] = { .len = sizeof(__be16) },
-@@ -919,6 +921,35 @@ static int ovs_key_from_nlattrs(struct net *net, struct sw_flow_match *match,
- 	if (err)
- 		return err;
- 
-+	if (attrs & (1ULL << OVS_KEY_ATTR_NSH)) {
-+		const struct ovs_key_nsh *nsh_key;
-+
-+		nsh_key = nla_data(a[OVS_KEY_ATTR_NSH]);
-+		SW_FLOW_KEY_MEMCPY(match, nsh.encap_eth_src,
-+				nsh_key->encap_eth_src, ETH_ALEN, is_mask);
-+		SW_FLOW_KEY_MEMCPY(match, nsh.encap_eth_dst,
-+				nsh_key->encap_eth_dst, ETH_ALEN, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.encap_eth_type,
-+			       nsh_key->encap_eth_type, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nshc1,
-+				nsh_key->nshc1, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nshc2,
-+				nsh_key->nshc2, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nshc3,
-+				nsh_key->nshc3, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nshc4,
-+				nsh_key->nshc4, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nsh_mdtype,
-+				nsh_key->nsh_mdtype, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nsh_np,
-+				nsh_key->nsh_np, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nsp,
-+				nsh_key->nsp, is_mask);
-+		SW_FLOW_KEY_PUT(match, nsh.nsi,
-+				nsh_key->nsi, is_mask);
-+		attrs &= ~(1ULL << OVS_KEY_ATTR_NSH);
-+	}
-+
- 	if (attrs & (1ULL << OVS_KEY_ATTR_ETHERNET)) {
- 		const struct ovs_key_ethernet *eth_key;
- 
-@@ -1434,6 +1465,26 @@ static int __ovs_nla_put_key(const struct sw_flow_key *swkey,
- 	if (nla_put_u32(skb, OVS_KEY_ATTR_PRIORITY, output->phy.priority))
- 		goto nla_put_failure;
- 
-+	if ((swkey->nsh.nsh_mdtype || is_mask)) {
-+		struct ovs_key_nsh *nsh_key;
-+
-+		nla = nla_reserve(skb, OVS_KEY_ATTR_NSH, sizeof(*nsh_key));
-+		if (!nla)
-+			goto nla_put_failure;
-+		nsh_key = nla_data(nla);
-+		memcpy(nsh_key->encap_eth_dst, output->nsh.encap_eth_dst, ETH_ALEN);
-+		memcpy(nsh_key->encap_eth_src, output->nsh.encap_eth_src, ETH_ALEN);
-+		nsh_key->encap_eth_type = output->nsh.encap_eth_type;
-+		nsh_key->nsi = output->nsh.nsi;
-+		nsh_key->nsp = output->nsh.nsp;
-+		nsh_key->nsh_mdtype= output->nsh.nsh_mdtype;
-+		nsh_key->nsh_np= output->nsh.nsh_np;
-+		nsh_key->nshc1= output->nsh.nshc1;
-+		nsh_key->nshc2 = output->nsh.nshc2;
-+		nsh_key->nshc3 = output->nsh.nshc3;
-+		nsh_key->nshc4 = output->nsh.nshc4;
-+	}
-+
- 	if ((swkey->tun_proto || is_mask)) {
- 		const void *opts = NULL;
- 
-@@ -2235,6 +2286,8 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr,
- 			[OVS_ACTION_ATTR_POP_MPLS] = sizeof(__be16),
- 			[OVS_ACTION_ATTR_PUSH_VLAN] = sizeof(struct ovs_action_push_vlan),
- 			[OVS_ACTION_ATTR_POP_VLAN] = 0,
-+			[OVS_ACTION_ATTR_PUSH_NSH] = sizeof(struct ovs_action_push_nsh),
-+			[OVS_ACTION_ATTR_POP_NSH] = 0,
- 			[OVS_ACTION_ATTR_SET] = (u32)-1,
- 			[OVS_ACTION_ATTR_SET_MASKED] = (u32)-1,
- 			[OVS_ACTION_ATTR_SAMPLE] = (u32)-1,
-@@ -2288,6 +2341,10 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr,
- 			break;
- 		}
- 
-+		case OVS_ACTION_ATTR_PUSH_NSH:
-+		case OVS_ACTION_ATTR_POP_NSH:
-+			break;
-+
- 		case OVS_ACTION_ATTR_POP_VLAN:
- 			vlan_tci = htons(0);
- 			break;
-diff --git a/datapath/linux/compat/include/linux/openvswitch.h b/datapath/linux/compat/include/linux/openvswitch.h
-index 44b7ce4..090843a 100644
---- a/datapath/linux/compat/include/linux/openvswitch.h
-+++ b/datapath/linux/compat/include/linux/openvswitch.h
-@@ -42,6 +42,7 @@
- 
- #include <linux/types.h>
- #include <linux/if_ether.h>
-+#include <asm/byteorder.h>
- 
- /**
-  * struct ovs_header - header for OVS Generic Netlink messages.
-@@ -332,6 +333,7 @@ enum ovs_key_attr {
- 	OVS_KEY_ATTR_ENCAP,	/* Nested set of encapsulated attributes. */
- 	OVS_KEY_ATTR_PRIORITY,  /* u32 skb->priority */
- 	OVS_KEY_ATTR_IN_PORT,   /* u32 OVS dp port number */
-+	OVS_KEY_ATTR_NSH,	/* struct ovs_key_nsh, MD type 1 only */
- 	OVS_KEY_ATTR_ETHERNET,  /* struct ovs_key_ethernet */
- 	OVS_KEY_ATTR_VLAN,	/* be16 VLAN TCI */
- 	OVS_KEY_ATTR_ETHERTYPE,	/* be16 Ethernet type */
-@@ -406,6 +408,22 @@ enum ovs_frag_type {
- 
- #define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1)
- 
-+struct ovs_key_nsh {
-+        __u8    encap_eth_dst[ETH_ALEN];
-+        __u8    encap_eth_src[ETH_ALEN];
-+        __u16   encap_eth_type;
-+        __u16   pad1;
-+        __u32   nshc1;
-+        __u32   nshc2;
-+        __u32   nshc3;
-+        __u32   nshc4;
-+        __u32   nsp;
-+        __u8    nsi;
-+        __u8    nsh_mdtype;
-+        __u8    nsh_np;
-+        __u8    pad2;
-+} __packed;
-+
- struct ovs_key_ethernet {
- 	__u8	 eth_src[ETH_ALEN];
- 	__u8	 eth_dst[ETH_ALEN];
-@@ -640,6 +658,151 @@ struct ovs_action_push_vlan {
- 	__be16 vlan_tci;	/* 802.1Q TCI (VLAN ID and priority). */
- };
- 
-+/*
-+ * Network Service Header:
-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-+ * |Ver|O|C|R|R|R|R|R|R|    Length   |   MD Type   |  Next Proto   |
-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-+ * |                Service Path ID                | Service Index |
-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-+ * Ver = The version field is used to ensure backward compatibility
-+ *       going forward with future NSH updates.  It MUST be set to 0x0
-+ *       by the sender, in this first revision of NSH.
-+ *
-+ * O = OAM. when set to 0x1 indicates that this packet is an operations
-+ *     and management (OAM) packet.  The receiving SFF and SFs nodes
-+ *     MUST examine the payload and take appropriate action.
-+ *
-+ * C = context. Indicates that a critical metadata TLV is present.
-+ *
-+ * Length : total length, in 4-byte words, of NSH including the Base
-+ *          Header, the Service Path Header and the optional variable
-+ *          TLVs.
-+ * MD Type: indicates the format of NSH beyond the mandatory Base Header
-+ *          and the Service Path Header.
-+ *
-+ * Next Protocol: indicates the protocol type of the original packet. A
-+ *          new IANA registry will be created for protocol type.
-+ *
-+ * Service Path Identifier (SPI): identifies a service path.
-+ *          Participating nodes MUST use this identifier for Service
-+ *          Function Path selection.
-+ *
-+ * Service Index (SI): provides location within the SFP.
-+ *
-+ * [0] https://tools.ietf.org/html/draft-ietf-sfc-nsh-01
-+ */
-+
-+struct nsh_base {
-+#if defined(__LITTLE_ENDIAN_BITFIELD)
-+
-+	__u8    reserved_flags1:4;
-+	__u8    context_flag:1;
-+	__u8    oam_flag:1;
-+	__u8    version:2;
-+
-+	__u8    length:6;
-+	__u8    reserved_flags2:2;
-+#elif defined(__BIG_ENDIAN_BITFIELD)
-+
-+	__u8    version:2;
-+	__u8    oam_flag:1;
-+	__u8    context_flag:1;
-+	__u8    reserved_flags1:4;
-+
-+	__u8    reserved_flags2:2;
-+	__u8    length:6;
-+#else
-+#error "Bitfield Endianess not defined."
-+#endif
-+	__u8    mdtype;
-+	__u8    proto;
-+	union {
-+		struct {
-+			__u8    svc_path[3];
-+			__u8    svc_idx;
-+		};
-+		__be32 path_hdr;
-+	};
-+};
-+
-+
-+/**
-+ * struct nsh_ctx - Keeps track of NSH context data
-+ * @c<1-4>: NSH Contexts.
-+ */
-+struct nsh_ctx {
-+	__be32 nshc1;
-+	__be32 nshc2;
-+	__be32 nshc3;
-+	__be32 nshc4;
-+};
-+
-+/**
-+ * struct nshdr - Network Service header
-+ * @nsh_base: Network Service Base Header.
-+ * @nsh_ctx: Network Service Context Header.
-+ */
-+struct nsh_hdr {
-+	struct nsh_base base;
-+	struct nsh_ctx ctx;
-+};
-+
-+
-+#define ETH_P_NSH        0x894F   /* Ethertype for NSH */
-+
-+/* NSH Base Header Next Protocol */
-+#define NSH_P_IPV4        0x01
-+#define NSH_P_IPV6        0x02
-+#define NSH_P_ETHERNET    0x03
-+
-+/* MD Type Registry */
-+#define NSH_M_TYPE1     0x01
-+#define NSH_M_EXP1      0xFE
-+#define NSH_M_EXP2      0xFF
-+
-+#define NSH_DST_PORT    4790   /* UDP Port for NSH on VXLAN */
-+
-+#define NSH_M_TYPE1_LEN     24
-+
-+/* Used for masking nsp and nsi values in field nsp below */
-+#define NSH_M_NSP   0x00FFFFFF
-+#define NSH_M_NSI   0xFF000000
-+
-+/* NSH header for MD type 1. Unit is bytes */
-+#define NSH_PUSH_TYPE1_HEADER_SIZE 24
-+#define NSH_PUSH_HEADER_SIZE 256
-+
-+#define ENCAP_ETH_LEN     14
-+
-+#define ETH_NSH_TYPE1_HEADER_SIZE (NSH_PUSH_TYPE1_HEADER_SIZE + ENCAP_ETH_LEN)
-+/**
-+ * struct encap_eth - encap ethernet header for ethernet NSH
-+ * @encap_eth_src: encap ethernet source address.
-+ * @encap_eth_src: encap ethernet destination address.
-+ * @encap_eth_type: encap ethernet type.
-+ */
-+struct encap_eth_hdr {
-+	__u8 encap_eth_dst[ETH_ALEN];
-+	__u8 encap_eth_src[ETH_ALEN];
-+	__u16 encap_eth_type;
-+};
-+
-+struct eth_nsh_hdr {
-+    struct encap_eth_hdr encap_eth_header;
-+    struct nsh_hdr nsh_hdr  __attribute__((packed));
-+};
-+
-+#define ENCAP_ETH_PUSH_HEADER_SIZE 14
-+/**
-+ * struct ovs_action_push_nsh - %OVS_ACTION_ATTR_PUSH_NSH action argument.
-+ * @header
-+ */
-+struct ovs_action_push_nsh {
-+	uint8_t  nsh_mdtype;
-+	uint8_t  header[NSH_PUSH_HEADER_SIZE];
-+};
-+
- /* Data path hash algorithm for computing Datapath hash.
-  *
-  * The algorithm type only specifies the fields in a flow
-@@ -679,6 +842,7 @@ struct ovs_action_push_tnl {
- 	uint32_t out_port;
- 	uint32_t header_len;
- 	uint32_t tnl_type;     /* For logging. */
-+	uint32_t exts;
- 	uint8_t  header[TNL_PUSH_HEADER_SIZE];
- };
- #endif
-@@ -804,6 +968,8 @@ enum ovs_action_attr {
- 	OVS_ACTION_ATTR_SET,          /* One nested OVS_KEY_ATTR_*. */
- 	OVS_ACTION_ATTR_PUSH_VLAN,    /* struct ovs_action_push_vlan. */
- 	OVS_ACTION_ATTR_POP_VLAN,     /* No argument. */
-+	OVS_ACTION_ATTR_PUSH_NSH,     /* struct ovs_action_push_nsh. */
-+	OVS_ACTION_ATTR_POP_NSH,      /* No argument. */
- 	OVS_ACTION_ATTR_SAMPLE,       /* Nested OVS_SAMPLE_ATTR_*. */
- 	OVS_ACTION_ATTR_RECIRC,       /* u32 recirc_id. */
- 	OVS_ACTION_ATTR_HASH,	      /* struct ovs_action_hash. */
-diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
-index c0e276f..732b775 100644
---- a/include/openvswitch/automake.mk
-+++ b/include/openvswitch/automake.mk
-@@ -29,5 +29,6 @@ openvswitchinclude_HEADERS = \
- 	include/openvswitch/uuid.h \
- 	include/openvswitch/version.h \
- 	include/openvswitch/vconn.h \
--	include/openvswitch/vlog.h
-+	include/openvswitch/vlog.h \
-+        include/openvswitch/vxlangpe.h
- 
-diff --git a/include/openvswitch/flow.h b/include/openvswitch/flow.h
-index df80dfe..84c7997 100644
---- a/include/openvswitch/flow.h
-+++ b/include/openvswitch/flow.h
-@@ -99,6 +99,21 @@ struct flow {
-     uint32_t conj_id;           /* Conjunction ID. */
-     ofp_port_t actset_output;   /* Output port in action set. */
- 
-+    /* ETH + NSH (64-bit aligned) */
-+    struct eth_addr encap_eth_dst;     /* Encap eth destination address. */
-+    struct eth_addr encap_eth_src;     /* Encap eth source address. */
-+    ovs_be16 encap_eth_type;           /* Encap eth frame type. */
-+    uint8_t pad2[2];                   /* Pad to 64 bits. */
-+    ovs_be32 nshc1;
-+    ovs_be32 nshc2;
-+    ovs_be32 nshc3;
-+    ovs_be32 nshc4;
-+    ovs_be32 nsp;
-+    uint8_t nsi;
-+    uint8_t nsh_mdtype;
-+    uint8_t nsh_np;
-+    uint8_t pad3;
-+
-     /* L2, Order the same as in the Ethernet header! (64-bit aligned) */
-     struct eth_addr dl_dst;     /* Ethernet destination address. */
-     struct eth_addr dl_src;     /* Ethernet source address. */
-@@ -120,7 +135,7 @@ struct flow {
-     struct eth_addr arp_sha;    /* ARP/ND source hardware address. */
-     struct eth_addr arp_tha;    /* ARP/ND target hardware address. */
-     ovs_be16 tcp_flags;         /* TCP flags. With L3 to avoid matching L4. */
--    ovs_be16 pad3;              /* Pad to 64 bits. */
-+    ovs_be16 pad4;              /* Pad to 64 bits. */
- 
-     /* L4 (64-bit aligned) */
-     ovs_be16 tp_src;            /* TCP/UDP/SCTP source port/ICMP type. */
-@@ -135,7 +150,7 @@ BUILD_ASSERT_DECL(sizeof(struct flow_tnl) % sizeof(uint64_t) == 0);
- 
- /* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */
- BUILD_ASSERT_DECL(offsetof(struct flow, igmp_group_ip4) + sizeof(uint32_t)
--                  == sizeof(struct flow_tnl) + 248
-+                  == sizeof(struct flow_tnl) + 288
-                   && FLOW_WC_SEQ == 36);
- 
- /* Incremental points at which flow classification may be performed in
-diff --git a/include/openvswitch/match.h b/include/openvswitch/match.h
-index 93af1b8..c5fa48a 100644
---- a/include/openvswitch/match.h
-+++ b/include/openvswitch/match.h
-@@ -168,6 +168,30 @@ void match_set_nd_target(struct match *, const struct in6_addr *);
- void match_set_nd_target_masked(struct match *, const struct in6_addr *,
-                                 const struct in6_addr *);
- 
-+void match_set_nsp_masked(struct match *, ovs_be32 nsp, ovs_be32 mask);
-+void match_set_nsi_masked(struct match *match, uint8_t nsi, uint8_t mask);
-+void match_set_nsh_mdtype_masked(struct match *match, uint8_t nsh_mdtype, uint8_t mask);
-+void match_set_nsh_np_masked(struct match *match, uint8_t nsh_np, uint8_t mask);
-+void match_set_nshc1_masked(struct match *, ovs_be32 nshc1, ovs_be32 mask);
-+void match_set_nshc2_masked(struct match *, ovs_be32 nshc2, ovs_be32 mask);
-+void match_set_nshc3_masked(struct match *, ovs_be32 nshc3, ovs_be32 mask);
-+void match_set_nshc4_masked(struct match *, ovs_be32 nshc4, ovs_be32 mask);
-+void match_set_encap_eth_src_masked(struct match *match, const struct eth_addr encap_eth_src, const struct eth_addr mask);
-+void match_set_encap_eth_dst_masked(struct match *match, const struct eth_addr encap_eth_dst, const struct eth_addr mask);
-+void match_set_encap_eth_type_masked(struct match *match, ovs_be16 encap_eth_type, ovs_be16 mask);
-+
-+void match_set_nsp(struct match *, ovs_be32 nsp);
-+void match_set_nsi(struct match *match, uint8_t nsi);
-+void match_set_nsh_mdtype(struct match *match, uint8_t nsh_mdtype);
-+void match_set_nsh_np(struct match *match, uint8_t nsh_np);
-+void match_set_nshc1(struct match *, ovs_be32 nshc1);
-+void match_set_nshc2(struct match *, ovs_be32 nshc2);
-+void match_set_nshc3(struct match *, ovs_be32 nshc3);
-+void match_set_nshc4(struct match *, ovs_be32 nshc4);
-+void match_set_encap_eth_src(struct match *match, const struct eth_addr encap_eth_src);
-+void match_set_encap_eth_dst(struct match *match, const struct eth_addr encap_eth_dst);
-+void match_set_encap_eth_type(struct match *match, ovs_be16 encap_eth_type);
-+
- bool match_equal(const struct match *, const struct match *);
- uint32_t match_hash(const struct match *, uint32_t basis);
- 
-diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h
-index 9e569ef..fa4129c 100644
---- a/include/openvswitch/meta-flow.h
-+++ b/include/openvswitch/meta-flow.h
-@@ -1801,6 +1801,180 @@ enum OVS_PACKED_ENUM mf_field_id {
-      */
-     MFF_ND_TLL,
- 
-+    /* "nsp".
-+     *
-+     * For a packet received including a (32-bit)
-+     * network service header service path (nsp), the nsp is stored
-+     * in the low 24-bits and the high bits are zeroed.  For
-+     * other packets, the value is 0.
-+     *
-+     * Type: be32.
-+     * Maskable: bitwise.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_NSP(202) since v1.1.
-+     * OXM: none.
-+     * Prefix lookup member: nsp.
-+     */
-+    MFF_NSP,
-+
-+    /* "nsi".
-+     *
-+     * For a packet received, it includes a (8-bit)
-+     * network service header service index (nsi).
-+     *
-+     * Type: u8.
-+     * Maskable: bitwise.
-+     * Formatting: decimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_NSI(203) since v1.1.
-+     * OXM: none.
-+     * Prefix lookup member: nsi.
-+     */
-+    MFF_NSI,
-+
-+    /* "nshc1".
-+     *
-+     * For a packet received including a (32-bit)
-+     * Network Platform Context (nshc1), the nshc1 is stored
-+     * in the 32-bits.  For other packets, the value is 0.
-+     *
-+     * Type: be32.
-+     * Maskable: bitwise.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_NSH_C1(204) since v1.1.
-+     * OXM: none.
-+     * Prefix lookup member: nshc1.
-+     */
-+    MFF_NSH_C1,
-+
-+    /* "nshc2".
-+     *
-+     * For a packet received including a (32-bit)
-+     * Network Shared Context (nshc2), the nshc2 is stored
-+     * in the 32-bits.  For other packets, the value is 0.
-+     *
-+     * Type: be32.
-+     * Maskable: bitwise.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_NSH_C2(205) since v1.1.
-+     * OXM: none.
-+     * Prefix lookup member: nshc2.
-+     */
-+    MFF_NSH_C2,
-+
-+    /* "nshc3".
-+     *
-+     * For a packet received via including a (32-bit)
-+     * Service Platform Context (nshc3), the nshc3 is stored
-+     * in the 32-bits.  For other packets, the value is 0.
-+     *
-+     * Type: be32.
-+     * Maskable: bitwise.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_NSH_C3(206) since v1.1.
-+     * OXM: none.
-+     * Prefix lookup member: nshc3.
-+     */
-+    MFF_NSH_C3,
-+
-+    /* "nshc4".
-+     *
-+     * For a packet received including a (32-bit)
-+     * Service Shared Context (nshc4), the nshc4 is stored
-+     * in the 32-bits.  For other packets, the value is 0.
-+     *
-+     * Type: be32.
-+     * Maskable: bitwise.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_NSH_C4(207) since v1.1.
-+     * OXM: none.
-+     * Prefix lookup member: nshc4.
-+     */
-+    MFF_NSH_C4,
-+
-+    /* "nsh_mdtype".
-+     *
-+     * For a packet received, it includes a (8-bit)
-+     * nsh md-type field (md-type).
-+     *
-+     * Type: u8.
-+     * Maskable: bitwise.
-+     * Formatting: decimal.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_NSH_MDTYPE(208) since v1.1.
-+     * OXM: none.
-+     */
-+    MFF_NSH_MDTYPE,
-+
-+     /* "nsh_np".
-+      *
-+      * For a packet received, it includes a (8-bit)
-+      * nsh next protocol field (np).
-+      *
-+      * Type: u8.
-+      * Maskable: bitwise.
-+      * Formatting: decimal.
-+      * Prerequisites: none.
-+      * Access: read/write.
-+      * NXM: NXM_NX_NSH_NP(209) since v1.1.
-+      * OXM: none.
-+      */
-+     MFF_NSH_NP,
-+
-+	 /* "encap_eth_src".
-+     *
-+     * encap eth source address for Ethernet+NSH
-+     *
-+     * Type: MAC.
-+     * Maskable: bitwise.
-+     * Formatting: Ethernet.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_ENCAP_ETH_SRC(210) since v1.1.
-+     * OXM: none.
-+     */
-+    MFF_ENCAP_ETH_SRC,
-+
-+    /* "encap_eth_dst".
-+     *
-+     * encap eth destination address for Ethernet+NSH
-+     *
-+     * Type: MAC.
-+     * Maskable: bitwise.
-+     * Formatting: Ethernet.
-+     * Prerequisites: none.
-+     * Access: read/write.
-+     * NXM: NXM_NX_ENCAP_ETH_DST(211) since v1.1.
-+     * OXM: none.
-+     */
-+    MFF_ENCAP_ETH_DST,
-+
-+    /* "encap_eth_type".
-+     *
-+     * Encap Ethernet type.
-+     *
-+     * Type: be16.
-+     * Maskable: no.
-+     * Formatting: hexadecimal.
-+     * Prerequisites: none.
-+     * Access: read-only.
-+     * NXM: NXM_NX_ENCAP_ETH_TYPE(212) since v1.1.
-+     * OXM: none.
-+     */
-+    MFF_ENCAP_ETH_TYPE,
-+
-     MFF_N_IDS
- };
- 
-diff --git a/include/openvswitch/ofp-actions.h b/include/openvswitch/ofp-actions.h
-index 01b1790..8bef529 100644
---- a/include/openvswitch/ofp-actions.h
-+++ b/include/openvswitch/ofp-actions.h
-@@ -93,6 +93,10 @@
-     OFPACT(POP_QUEUE,       ofpact_null,        ofpact, "pop_queue")    \
-     OFPACT(FIN_TIMEOUT,     ofpact_fin_timeout, ofpact, "fin_timeout")  \
-                                                                         \
-+    /* NSH */                                                           \
-+    OFPACT(PUSH_NSH,        ofpact_null,        ofpact, "push_nsh")     \
-+    OFPACT(POP_NSH,         ofpact_null,        ofpact, "pop_nsh")      \
-+																		\
-     /* Flow table interaction. */                                       \
-     OFPACT(RESUBMIT,        ofpact_resubmit,    ofpact, "resubmit")     \
-     OFPACT(LEARN,           ofpact_learn,       specs, "learn")         \
-diff --git a/include/openvswitch/vxlangpe.h b/include/openvswitch/vxlangpe.h
-new file mode 100644
-index 0000000..b5ab7e0
---- /dev/null
-+++ b/include/openvswitch/vxlangpe.h
-@@ -0,0 +1,76 @@
-+#ifndef __OPENVSWITCH_VXLANGPE_H
-+#define __OPENVSWITCH_VXLANGPE_H 1
-+
-+#include "openvswitch/types.h"
-+
-+#define u8 uint8_t
-+#define u32 uint8_t
-+#define __be32 ovs_be32
-+
-+/*
-+ * VXLAN Generic Protocol Extension (VXLAN_F_GPE):
-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-+ * |R|R|Ver|I|P|R|O|       Reserved                |Next Protocol  |
-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-+ * |                VXLAN Network Identifier (VNI) |   Reserved    |
-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-+ *
-+ * Ver = Version. Indicates VXLAN GPE protocol version.
-+ *
-+ * P = Next Protocol Bit. The P bit is set to indicate that the
-+ *     Next Protocol field is present.
-+ *
-+ * O = OAM Flag Bit. The O bit is set to indicate that the packet
-+ *     is an OAM packet.
-+ *
-+ * Next Protocol = This 8 bit field indicates the protocol header
-+ * immediately following the VXLAN GPE header.
-+ *
-+ * https://tools.ietf.org/html/draft-ietf-nvo3-vxlan-gpe-01
-+ */
-+
-+struct vxlanhdr_gpe {
-+#ifdef WORDS_BIGENDIAN
-+	u8	reserved_flags2:2,
-+		version:2,
-+		instance_applied:1,
-+		np_applied:1,
-+		reserved_flags1:1,
-+		oam_flag:1;
-+#else
-+	u8	oam_flag:1,
-+		reserved_flags1:1,
-+		np_applied:1,
-+		instance_applied:1,
-+		version:2,
-+		reserved_flags2:2;
-+#endif
-+	u8	reserved_flags3;
-+	u8	reserved_flags4;
-+	u8	next_protocol;
-+	__be32	vx_vni;
-+};
-+
-+/* VXLAN-GPE header flags. */
-+#define VXLAN_HF_VER	((1UL <<29) | (1UL <<28))
-+#define VXLAN_HF_NP	(1UL <<26)
-+#define VXLAN_HF_OAM	(1UL <<24)
-+
-+#define VXLAN_GPE_USED_BITS (VXLAN_HF_VER | VXLAN_HF_NP | VXLAN_HF_OAM | \
-+			     0xff)
-+
-+/* VXLAN-GPE header Next Protocol. */
-+#define VXLAN_GPE_NP_IPV4      0x01
-+#define VXLAN_GPE_NP_IPV6      0x02
-+#define VXLAN_GPE_NP_ETHERNET  0x03
-+#define VXLAN_GPE_NP_NSH       0x04
-+
-+struct vxlan_metadata {
-+	u32		gbp;
-+	u32		gpe;
-+};
-+
-+#define VXLAN_F_GPE			0x4000
-+#define VXLAN_HF_GPE 0x04000000
-+
-+#endif /* __OPENVSWITCH_VXLANGPE_H */
-diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
-index 44ec1a0..c779c78 100644
---- a/lib/dpif-netdev.c
-+++ b/lib/dpif-netdev.c
-@@ -533,7 +533,7 @@ static int get_port_by_name(struct dp_netdev *dp, const char *devname,
- static void dp_netdev_free(struct dp_netdev *)
-     OVS_REQUIRES(dp_netdev_mutex);
- static int do_add_port(struct dp_netdev *dp, const char *devname,
--                       const char *type, odp_port_t port_no)
-+                       const char *type, odp_port_t port_no, uint32_t exts)
-     OVS_REQUIRES(dp->port_mutex);
- static void do_del_port(struct dp_netdev *dp, struct dp_netdev_port *)
-     OVS_REQUIRES(dp->port_mutex);
-@@ -1010,7 +1010,7 @@ create_dp_netdev(const char *name, const struct dpif_class *class,
- 
-     error = do_add_port(dp, name, dpif_netdev_port_open_type(dp->class,
-                                                              "internal"),
--                        ODPP_LOCAL);
-+                        ODPP_LOCAL, 0);
-     ovs_mutex_unlock(&dp->port_mutex);
-     if (error) {
-         dp_netdev_free(dp);
-@@ -1213,9 +1213,21 @@ hash_port_no(odp_port_t port_no)
-     return hash_int(odp_to_u32(port_no), 0);
- }
- 
-+static void add_vxlan_gpe_exts(struct netdev *netdev, uint32_t exts)
-+{
-+    const char *type = netdev_get_type(netdev);
-+    if (!strcmp(type, "vxlan")) {
-+        struct netdev_tunnel_config *cfg;
-+        cfg = netdev_get_tunnel_config(netdev);
-+
-+        if(exts & (1 << OVS_VXLAN_EXT_GPE))
-+            cfg->exts |= (1 << OVS_VXLAN_EXT_GPE);
-+    }
-+}
-+
- static int
- port_create(const char *devname, const char *type,
--            odp_port_t port_no, struct dp_netdev_port **portp)
-+            odp_port_t port_no, struct dp_netdev_port **portp, uint32_t exts)
- {
-     struct netdev_saved_flags *sf;
-     struct dp_netdev_port *port;
-@@ -1273,6 +1285,7 @@ port_create(const char *devname, const char *type,
-         }
-     }
- 
-+    add_vxlan_gpe_exts(netdev, exts);
-     port = xzalloc(sizeof *port);
-     port->port_no = port_no;
-     port->netdev = netdev;
-@@ -1321,7 +1334,7 @@ out:
- 
- static int
- do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
--            odp_port_t port_no)
-+            odp_port_t port_no, uint32_t exts)
-     OVS_REQUIRES(dp->port_mutex)
- {
-     struct dp_netdev_port *port;
-@@ -1332,7 +1345,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
-         return EEXIST;
-     }
- 
--    error = port_create(devname, type, port_no, &port);
-+    error = port_create(devname, type, port_no, &port, exts);
-     if (error) {
-         return error;
-     }
-@@ -1373,7 +1386,12 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev,
-     }
-     if (!error) {
-         *port_nop = port_no;
--        error = do_add_port(dp, dpif_port, netdev_get_type(netdev), port_no);
-+        const struct netdev_tunnel_config *cfg;
-+        uint32_t exts = 0;
-+        cfg = netdev_get_tunnel_config(netdev);
-+        if (cfg)
-+            exts = cfg->exts;
-+        error = do_add_port(dp, dpif_port, netdev_get_type(netdev), port_no, exts);
-     }
-     ovs_mutex_unlock(&dp->port_mutex);
- 
-@@ -2148,8 +2166,11 @@ dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len,
-                               struct flow *flow)
- {
-     odp_port_t in_port;
-+    enum odp_key_fitness fitness;
- 
--    if (odp_flow_key_to_flow_udpif(key, key_len, flow)) {
-+    fitness = odp_flow_key_to_flow_udpif(key, key_len, flow);
-+
-+    if (fitness) {
-         /* This should not happen: it indicates that odp_flow_key_from_flow()
-          * and odp_flow_key_to_flow() disagree on the acceptable form of a
-          * flow.  Log the problem as an error, with enough details to enable
-@@ -2161,7 +2182,7 @@ dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len,
- 
-             ds_init(&s);
-             odp_flow_format(key, key_len, NULL, 0, NULL, &s, true);
--            VLOG_ERR("internal error parsing flow key %s", ds_cstr(&s));
-+            VLOG_ERR("internal error parsing flow key %s (%s)", ds_cstr(&s), odp_key_fitness_to_string(fitness));
-             ds_destroy(&s);
-         }
- 
-@@ -4612,6 +4633,8 @@ dp_execute_cb(void *aux_, struct dp_packet_batch *packets_,
-         break;
-     }
- 
-+    case OVS_ACTION_ATTR_PUSH_NSH:
-+    case OVS_ACTION_ATTR_POP_NSH:
-     case OVS_ACTION_ATTR_PUSH_VLAN:
-     case OVS_ACTION_ATTR_POP_VLAN:
-     case OVS_ACTION_ATTR_PUSH_MPLS:
-diff --git a/lib/dpif.c b/lib/dpif.c
-index 53958c5..86e30e0 100644
---- a/lib/dpif.c
-+++ b/lib/dpif.c
-@@ -1178,6 +1178,8 @@ dpif_execute_helper_cb(void *aux_, struct dp_packet_batch *packets_,
-     }
- 
-     case OVS_ACTION_ATTR_HASH:
-+    case OVS_ACTION_ATTR_PUSH_NSH:
-+    case OVS_ACTION_ATTR_POP_NSH:
-     case OVS_ACTION_ATTR_PUSH_VLAN:
-     case OVS_ACTION_ATTR_POP_VLAN:
-     case OVS_ACTION_ATTR_PUSH_MPLS:
-diff --git a/lib/flow.c b/lib/flow.c
-index 375979b..e387c8b 100644
---- a/lib/flow.c
-+++ b/lib/flow.c
-@@ -547,6 +547,25 @@ flow_extract(struct dp_packet *packet, struct flow *flow)
-     miniflow_expand(&m.mf, flow);
- }
- 
-+/* parse Ethernet+NSH */
-+static int parse_nsh(const void *data, struct ovs_key_nsh *nsh)
-+{
-+    memcpy(&nsh->encap_eth_dst, data, ENCAP_ETH_LEN);
-+    const struct nsh_hdr *nsh_hdr = (const struct nsh_hdr *)((const char *)data + ENCAP_ETH_LEN);
-+
-+    nsh->nsh_mdtype = nsh_hdr->base.mdtype;
-+    if (nsh->nsh_mdtype != NSH_M_TYPE1)
-+        return -1;
-+    nsh->nsh_np = nsh_hdr->base.proto;
-+    nsh->nsi = nsh_hdr->base.svc_idx;
-+    nsh->nsp = nsh_hdr->base.path_hdr << 8;
-+    nsh->nshc1 = nsh_hdr->ctx.nshc1;
-+    nsh->nshc2 = nsh_hdr->ctx.nshc2;
-+    nsh->nshc3 = nsh_hdr->ctx.nshc3;
-+    nsh->nshc4 = nsh_hdr->ctx.nshc4;
-+    return 0;
-+}
-+
- /* Caller is responsible for initializing 'dst' with enough storage for
-  * FLOW_U64S * 8 bytes. */
- void
-@@ -607,6 +626,32 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst)
-         }
-     }
- 
-+    /* Extract Etherenet + NSH if the Ethernet type is 0x894F in packet */
-+    if (OVS_UNLIKELY(size < sizeof(struct eth_header)))
-+        goto out;
-+    else {
-+        const struct eth_header *eth = data;
-+        if (eth->eth_type == htons(ETH_P_NSH)) {
-+            /* extract Ethernet+nsh */
-+            struct ovs_key_nsh nsh;
-+            if (OVS_UNLIKELY(parse_nsh(data, &nsh)))
-+                goto out;
-+
-+            /* Now only support NSH mdtype 1 */
-+            if (nsh.nsh_mdtype == NSH_M_TYPE1){
-+                /* Push all field related with Ethernet+nsh at once. */
-+                miniflow_push_words(mf, encap_eth_dst, &nsh,
-+                       (sizeof (struct ovs_key_nsh)+sizeof(uint64_t) - 1) /
-+                       sizeof(uint64_t));
-+                data = (const char *)data + NSH_M_TYPE1_LEN + ENCAP_ETH_LEN;
-+            } else
-+                goto out;
-+
-+            if(nsh.nsh_np != NSH_P_ETHERNET)
-+                goto out;
-+        }
-+    }
-+
-     /* Initialize packet's layer pointer and offsets. */
-     l2 = data;
-     dp_packet_reset_offsets(packet);
-@@ -897,7 +942,7 @@ flow_get_metadata(const struct flow *flow, struct match *flow_metadata)
-     if (flow->tunnel.gbp_flags) {
-         match_set_tun_gbp_flags(flow_metadata, flow->tunnel.gbp_flags);
-     }
--    if (flow->tunnel.gpe_np != htons(0)) {
-+    if (flow->tunnel.gpe_np != 0) {
-         match_set_tun_gpe_np(flow_metadata, flow->tunnel.gpe_np);
-     }
-     if (flow->tunnel.gpe_flags) {
-@@ -1316,6 +1361,21 @@ void flow_wildcards_init_for_packet(struct flow_wildcards *wc,
-         WC_MASK_FIELD(wc, tunnel.tun_id);
-     }
- 
-+    /* NSH fields wildcarded */
-+    if (flow->nsh_mdtype) {
-+        WC_MASK_FIELD(wc, encap_eth_src);
-+        WC_MASK_FIELD(wc, encap_eth_dst);
-+        WC_MASK_FIELD(wc, encap_eth_type);
-+        WC_MASK_FIELD(wc, nshc1);
-+        WC_MASK_FIELD(wc, nshc2);
-+        WC_MASK_FIELD(wc, nshc3);
-+        WC_MASK_FIELD(wc, nshc4);
-+        WC_MASK_FIELD(wc, nsh_mdtype);
-+        WC_MASK_FIELD(wc, nsh_np);
-+        WC_MASK_FIELD(wc, nsp);
-+        WC_MASK_FIELD(wc, nsi);
-+    }
-+
-     /* metadata, regs, and conj_id wildcarded. */
- 
-     WC_MASK_FIELD(wc, skb_priority);
-@@ -1432,6 +1492,19 @@ flow_wc_map(const struct flow *flow, struct flowmap *map)
-     FLOWMAP_SET(map, ct_mark);
-     FLOWMAP_SET(map, ct_label);
- 
-+    /* NSH fields */
-+    FLOWMAP_SET(map, encap_eth_src);
-+    FLOWMAP_SET(map, encap_eth_dst);
-+    FLOWMAP_SET(map, encap_eth_type);
-+    FLOWMAP_SET(map, nshc1);
-+    FLOWMAP_SET(map, nshc2);
-+    FLOWMAP_SET(map, nshc3);
-+    FLOWMAP_SET(map, nshc4);
-+    FLOWMAP_SET(map, nsp);
-+    FLOWMAP_SET(map, nsi);
-+    FLOWMAP_SET(map, nsh_mdtype);
-+    FLOWMAP_SET(map, nsh_np);
-+
-     /* Ethertype-dependent fields. */
-     if (OVS_LIKELY(flow->dl_type == htons(ETH_TYPE_IP))) {
-         FLOWMAP_SET(map, nw_src);
-@@ -2352,6 +2425,33 @@ flow_compose_l4_csum(struct dp_packet *p, const struct flow *flow,
-     }
- }
- 
-+/* push ethernet+nsh header at the beginning of packets */
-+static void
-+flow_compose_nsh(struct dp_packet *p, const struct flow *flow)
-+{
-+    struct eth_nsh_hdr *eth_nsh_header;
-+
-+    /* Now only support mdtype1 */
-+    if (flow->nsh_mdtype != NSH_M_TYPE1)
-+        return;
-+
-+    eth_nsh_header = dp_packet_push_uninit(p, ETH_NSH_TYPE1_HEADER_SIZE);
-+    eth_nsh_header->encap_eth_header.encap_eth_dst = flow->encap_eth_dst;
-+    eth_nsh_header->encap_eth_header.encap_eth_src = flow->encap_eth_src;
-+    eth_nsh_header->encap_eth_header.encap_eth_type = htons(ETH_P_NSH);
-+
-+    memset(&eth_nsh_header->nsh_hdr, 0, sizeof (struct nsh_hdr));
-+    eth_nsh_header->nsh_hdr.base.length = 6;
-+    eth_nsh_header->nsh_hdr.base.proto = flow->nsh_np;
-+    eth_nsh_header->nsh_hdr.base.mdtype = flow->nsh_mdtype;
-+    eth_nsh_header->nsh_hdr.base.proto = flow->nsh_np;
-+    eth_nsh_header->nsh_hdr.base.path_hdr = flow->nsp >> 8 | flow->nsi << 24;
-+    eth_nsh_header->nsh_hdr.ctx.nshc1 = flow->nshc1;
-+    eth_nsh_header->nsh_hdr.ctx.nshc2 = flow->nshc2;
-+    eth_nsh_header->nsh_hdr.ctx.nshc3 = flow->nshc3;
-+    eth_nsh_header->nsh_hdr.ctx.nshc4 = flow->nshc4;
-+}
-+
- /* Puts into 'b' a packet that flow_extract() would parse as having the given
-  * 'flow'.
-  *
-@@ -2459,6 +2559,10 @@ flow_compose(struct dp_packet *p, const struct flow *flow)
-             push_mpls(p, flow->dl_type, flow->mpls_lse[--n]);
-         }
-     }
-+
-+    if (flow->nsh_mdtype) {
-+        flow_compose_nsh(p, flow);
-+    }
- }
- 
- /* Compressed flow. */
-diff --git a/lib/match.c b/lib/match.c
-index f19648d..daf0b87 100644
---- a/lib/match.c
-+++ b/lib/match.c
-@@ -878,6 +878,152 @@ match_set_nd_target_masked(struct match *match,
-     match->wc.masks.nd_target = *mask;
- }
- 
-+void
-+match_set_nsp_masked(struct match *match, ovs_be32 nsp, ovs_be32 mask)
-+{
-+    match->wc.masks.nsp = mask;
-+    match->flow.nsp = nsp & mask;
-+}
-+
-+void
-+match_set_nsi_masked(struct match *match, uint8_t nsi, uint8_t mask)
-+{
-+    match->wc.masks.nsi = mask;
-+    match->flow.nsi = nsi & mask;
-+}
-+
-+void
-+match_set_nsh_mdtype_masked(struct match *match, uint8_t nsh_mdtype, uint8_t mask)
-+{
-+    match->wc.masks.nsh_mdtype = mask;
-+    match->flow.nsh_mdtype = nsh_mdtype & mask;
-+}
-+
-+void
-+match_set_nsh_np_masked(struct match *match, uint8_t nsh_np, uint8_t mask)
-+{
-+    match->wc.masks.nsh_np = mask;
-+    match->flow.nsh_np = nsh_np & mask;
-+}
-+
-+void
-+match_set_encap_eth_src_masked(struct match *match,
-+                        const struct eth_addr encap_eth_src,
-+                        const struct eth_addr mask)
-+{
-+    set_eth_masked(encap_eth_src, mask, &match->flow.encap_eth_src, &match->wc.masks.encap_eth_src);
-+}
-+
-+void
-+match_set_encap_eth_dst_masked(struct match *match,
-+                        const struct eth_addr encap_eth_dst,
-+                        const struct eth_addr mask)
-+{
-+    set_eth_masked(encap_eth_dst, mask, &match->flow.encap_eth_dst, &match->wc.masks.encap_eth_dst);
-+}
-+
-+void
-+match_set_encap_eth_type_masked(struct match *match, ovs_be16 encap_eth_type, ovs_be16 mask)
-+{
-+    match->wc.masks.encap_eth_type = mask;
-+    match->flow.encap_eth_type = encap_eth_type & mask;
-+}
-+
-+void
-+match_set_nshc1_masked(struct match *match, ovs_be32 nshc1, ovs_be32 mask)
-+{
-+    match->wc.masks.nshc1 = mask;
-+    match->flow.nshc1 = nshc1 & mask;
-+}
-+
-+void
-+match_set_nshc2_masked(struct match *match, ovs_be32 nshc2, ovs_be32 mask)
-+{
-+    match->wc.masks.nshc2 = mask;
-+    match->flow.nshc2 = nshc2 & mask;
-+}
-+
-+void
-+match_set_nshc3_masked(struct match *match, ovs_be32 nshc3, ovs_be32 mask)
-+{
-+    match->wc.masks.nshc3 = mask;
-+    match->flow.nshc3 = nshc3 & mask;
-+}
-+
-+void
-+match_set_nshc4_masked(struct match *match, ovs_be32 nshc4, ovs_be32 mask)
-+{
-+    match->wc.masks.nshc4 = mask;
-+    match->flow.nshc4 = nshc4 & mask;
-+}
-+
-+void
-+match_set_nsp(struct match *match, ovs_be32 nsp)
-+{
-+    match_set_nsp_masked(match, nsp, OVS_BE32_MAX);
-+}
-+
-+void
-+match_set_nsi(struct match *match, uint8_t nsi)
-+{
-+    match_set_nsi_masked(match, nsi, UINT8_MAX);
-+}
-+
-+void
-+match_set_nsh_mdtype(struct match *match, uint8_t nsh_mdtype)
-+{
-+    match_set_nsh_mdtype_masked(match, nsh_mdtype, UINT8_MAX);
-+}
-+
-+void
-+match_set_nsh_np(struct match *match, uint8_t nsh_np)
-+{
-+    match_set_nsh_np_masked(match, nsh_np, UINT8_MAX);
-+}
-+
-+void
-+match_set_nshc1(struct match *match, ovs_be32 nshc1)
-+{
-+    match_set_nshc1_masked(match, nshc1, OVS_BE32_MAX);
-+}
-+
-+void
-+match_set_nshc2(struct match *match, ovs_be32 nshc2)
-+{
-+    match_set_nshc2_masked(match, nshc2, OVS_BE32_MAX);
-+}
-+
-+void
-+match_set_nshc3(struct match *match, ovs_be32 nshc3)
-+{
-+    match_set_nshc3_masked(match, nshc3, OVS_BE32_MAX);
-+}
-+
-+void
-+match_set_nshc4(struct match *match, ovs_be32 nshc4)
-+{
-+    match_set_nshc4_masked(match, nshc4, OVS_BE32_MAX);
-+}
-+
-+void
-+match_set_encap_eth_src(struct match *match, const struct eth_addr encap_eth_src)
-+{
-+    set_eth(encap_eth_src, &match->flow.encap_eth_src, &match->wc.masks.encap_eth_src);
-+}
-+
-+void
-+match_set_encap_eth_dst(struct match *match, const struct eth_addr encap_eth_dst)
-+{
-+    set_eth(encap_eth_dst, &match->flow.encap_eth_dst, &match->wc.masks.encap_eth_dst);
-+}
-+
-+void
-+match_set_encap_eth_type(struct match *match, ovs_be16 encap_eth_type)
-+{
-+    match->wc.masks.encap_eth_type = OVS_BE16_MAX;
-+    match->flow.encap_eth_type = encap_eth_type;
-+}
-+
- /* Returns true if 'a' and 'b' wildcard the same fields and have the same
-  * values for fixed fields, otherwise false. */
- bool
-@@ -1171,6 +1317,49 @@ match_format(const struct match *match, struct ds *s, int priority)
-         format_ct_label_masked(s, &f->ct_label, &wc->masks.ct_label);
-     }
- 
-+    if (wc->masks.nsi) {
-+        ds_put_format(s, "nsi=%"PRIu8",", f->nsi);
-+    }
-+
-+    if (wc->masks.nsh_mdtype) {
-+        ds_put_format(s, "nsh_mdtype=%"PRIu8",", f->nsh_mdtype);
-+    }
-+
-+    if (wc->masks.nsh_np) {
-+        ds_put_format(s, "nsh_np=%"PRIu8",", f->nsh_np);
-+    }
-+
-+    if (wc->masks.nsp) {
-+        format_be32_masked(s, "nsp", f->nsp,
-+                             wc->masks.nsp);
-+    }
-+
-+    if (wc->masks.nshc1) {
-+        format_be32_masked(s, "nshc1", f->nshc1,
-+                             wc->masks.nshc1);
-+    }
-+
-+    if (wc->masks.nshc2) {
-+        format_be32_masked(s, "nshc2", f->nshc2,
-+                             wc->masks.nshc2);
-+    }
-+
-+    if (wc->masks.nshc3) {
-+        format_be32_masked(s, "nshc3", f->nshc3,
-+                             wc->masks.nshc3);
-+    }
-+
-+    if (wc->masks.nshc4) {
-+        format_be32_masked(s, "nshc4", f->nshc4,
-+                             wc->masks.nshc4);
-+    }
-+
-+    format_eth_masked(s, "encap_eth_src", f->encap_eth_src, wc->masks.encap_eth_src);
-+    format_eth_masked(s, "encap_eth_dst", f->encap_eth_dst, wc->masks.encap_eth_dst);
-+    if (wc->masks.encap_eth_type) {
-+        ds_put_format(s, "encap_eth_type=0x%04"PRIx16",", ntohs(f->encap_eth_type));
-+    }
-+
-     if (wc->masks.dl_type) {
-         skip_type = true;
-         if (f->dl_type == htons(ETH_TYPE_IP)) {
-diff --git a/lib/meta-flow.c b/lib/meta-flow.c
-index 5d0721f..cf2e7b6 100644
---- a/lib/meta-flow.c
-+++ b/lib/meta-flow.c
-@@ -247,7 +247,28 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
-     }
-     case MFF_ACTSET_OUTPUT:
-         return !wc->masks.actset_output;
--
-+    case MFF_NSP:
-+        return !wc->masks.nsp;
-+    case MFF_NSI:
-+        return !wc->masks.nsi;
-+    case MFF_NSH_C1:
-+        return !wc->masks.nshc1;
-+    case MFF_NSH_C2:
-+        return !wc->masks.nshc2;
-+    case MFF_NSH_C3:
-+        return !wc->masks.nshc3;
-+    case MFF_NSH_C4:
-+        return !wc->masks.nshc4;
-+    case MFF_NSH_MDTYPE:
-+        return !wc->masks.nsh_mdtype;
-+    case MFF_NSH_NP:
-+        return !wc->masks.nsh_np;
-+    case MFF_ENCAP_ETH_SRC:
-+        return eth_addr_is_zero(wc->masks.encap_eth_src);
-+    case MFF_ENCAP_ETH_DST:
-+        return eth_addr_is_zero(wc->masks.encap_eth_dst);
-+    case MFF_ENCAP_ETH_TYPE:
-+        return !wc->masks.encap_eth_type;
-     case MFF_ETH_SRC:
-         return eth_addr_is_zero(wc->masks.dl_src);
-     case MFF_ETH_DST:
-@@ -477,6 +498,17 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value)
-     case MFF_ICMPV6_TYPE:
-     case MFF_ICMPV6_CODE:
-     case MFF_ND_TARGET:
-+    case MFF_NSP:
-+    case MFF_NSI:
-+    case MFF_NSH_MDTYPE:
-+    case MFF_NSH_NP:
-+    case MFF_NSH_C1:
-+    case MFF_NSH_C2:
-+    case MFF_NSH_C3:
-+    case MFF_NSH_C4:
-+    case MFF_ENCAP_ETH_SRC:
-+    case MFF_ENCAP_ETH_DST:
-+    case MFF_ENCAP_ETH_TYPE:
-     case MFF_ND_SLL:
-     case MFF_ND_TLL:
-         return true;
-@@ -640,6 +672,50 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow,
-         value->be128 = hton128(flow_get_xxreg(flow, mf->id - MFF_XXREG0));
-         break;
- 
-+    case MFF_NSP:
-+        value->be32 = flow->nsp;
-+        break;
-+
-+    case MFF_NSI:
-+        value->u8 = flow->nsi;
-+        break;
-+
-+    case MFF_NSH_C1:
-+        value->be32 = flow->nshc1;
-+        break;
-+
-+    case MFF_NSH_C2:
-+        value->be32 = flow->nshc2;
-+        break;
-+
-+    case MFF_NSH_C3:
-+        value->be32 = flow->nshc3;
-+        break;
-+
-+    case MFF_NSH_C4:
-+        value->be32 = flow->nshc4;
-+        break;
-+
-+    case MFF_NSH_MDTYPE:
-+        value->u8 = flow->nsh_mdtype;
-+        break;
-+
-+    case MFF_NSH_NP:
-+        value->u8 = flow->nsh_np;
-+        break;
-+
-+    case MFF_ENCAP_ETH_SRC:
-+        value->mac = flow->encap_eth_src;
-+        break;
-+
-+    case MFF_ENCAP_ETH_DST:
-+        value->mac = flow->encap_eth_dst;
-+        break;
-+
-+    case MFF_ENCAP_ETH_TYPE:
-+        value->be16 = flow->encap_eth_type;
-+        break;
-+
-     case MFF_ETH_SRC:
-         value->mac = flow->dl_src;
-         break;
-@@ -1013,6 +1089,50 @@ mf_set_value(const struct mf_field *mf,
-         match_set_arp_sha(match, value->mac);
-         break;
- 
-+    case MFF_NSP:
-+        match_set_nsp(match, value->be32);
-+        break;
-+
-+    case MFF_NSI:
-+        match_set_nsi(match, value->u8);
-+        break;
-+
-+    case MFF_NSH_MDTYPE:
-+        match_set_nsh_mdtype(match, value->u8);
-+        break;
-+
-+    case MFF_NSH_NP:
-+        match_set_nsh_np(match, value->u8);
-+        break;
-+
-+    case MFF_NSH_C1:
-+        match_set_nshc1(match, value->be32);
-+        break;
-+
-+    case MFF_NSH_C2:
-+        match_set_nshc2(match, value->be32);
-+        break;
-+
-+    case MFF_NSH_C3:
-+        match_set_nshc3(match, value->be32);
-+        break;
-+
-+    case MFF_NSH_C4:
-+        match_set_nshc4(match, value->be32);
-+        break;
-+
-+    case MFF_ENCAP_ETH_SRC:
-+        match_set_encap_eth_src(match, value->mac);
-+        break;
-+
-+    case MFF_ENCAP_ETH_DST:
-+        match_set_encap_eth_dst(match, value->mac);
-+        break;
-+
-+    case MFF_ENCAP_ETH_TYPE:
-+        match_set_encap_eth_type(match, value->be16);
-+        break;
-+
-     case MFF_ARP_THA:
-     case MFF_ND_TLL:
-         match_set_arp_tha(match, value->mac);
-@@ -1245,6 +1365,50 @@ mf_set_flow_value(const struct mf_field *mf,
-         flow_set_xxreg(flow, mf->id - MFF_XXREG0, ntoh128(value->be128));
-         break;
- 
-+    case MFF_NSP:
-+        flow->nsp = value->be32;
-+        break;
-+
-+    case MFF_NSI:
-+        flow->nsi = value->u8;
-+        break;
-+
-+    case MFF_NSH_C1:
-+        flow->nshc1 = value->be32;
-+        break;
-+
-+    case MFF_NSH_C2:
-+        flow->nshc2 = value->be32;
-+        break;
-+
-+    case MFF_NSH_C3:
-+        flow->nshc3 = value->be32;
-+        break;
-+
-+    case MFF_NSH_C4:
-+        flow->nshc4 = value->be32;
-+        break;
-+
-+    case MFF_NSH_MDTYPE:
-+        flow->nsh_mdtype = value->u8;
-+        break;
-+
-+    case MFF_NSH_NP:
-+        flow->nsh_np = value->u8;
-+        break;
-+
-+    case MFF_ENCAP_ETH_SRC:
-+        flow->encap_eth_src = value->mac;
-+        break;
-+
-+    case MFF_ENCAP_ETH_DST:
-+        flow->encap_eth_dst = value->mac;
-+        break;
-+
-+    case MFF_ENCAP_ETH_TYPE:
-+        flow->encap_eth_type = value->be16;
-+        break;
-+
-     case MFF_ETH_SRC:
-         flow->dl_src = value->mac;
-         break;
-@@ -1689,6 +1853,52 @@ mf_set_wild(const struct mf_field *mf, struct match *match, char **err_str)
-         match->wc.masks.arp_sha = eth_addr_zero;
-         break;
- 
-+    case MFF_NSP:
-+        match_set_nsp_masked(match, htonl(0), htonl(0));
-+        break;
-+
-+    case MFF_NSI:
-+        match_set_nsi_masked(match, 0, 0);
-+        break;
-+
-+    case MFF_NSH_MDTYPE:
-+        match_set_nsh_mdtype_masked(match, 0, 0);
-+        break;
-+
-+    case MFF_NSH_NP:
-+        match_set_nsh_np_masked(match, 0, 0);
-+        break;
-+
-+    case MFF_NSH_C1:
-+        match_set_nshc1_masked(match, htonl(0), htonl(0));
-+        break;
-+
-+    case MFF_NSH_C2:
-+        match_set_nshc2_masked(match, htonl(0), htonl(0));
-+        break;
-+
-+    case MFF_NSH_C3:
-+        match_set_nshc3_masked(match, htonl(0), htonl(0));
-+        break;
-+
-+    case MFF_NSH_C4:
-+        match_set_nshc4_masked(match, htonl(0), htonl(0));
-+        break;
-+
-+    case MFF_ENCAP_ETH_SRC:
-+        match->flow.encap_eth_src= eth_addr_zero;
-+        match->wc.masks.encap_eth_src = eth_addr_zero;
-+        break;
-+
-+    case MFF_ENCAP_ETH_DST:
-+        match->flow.encap_eth_dst= eth_addr_zero;
-+        match->wc.masks.encap_eth_dst = eth_addr_zero;
-+        break;
-+
-+    case MFF_ENCAP_ETH_TYPE:
-+        match_set_encap_eth_type_masked(match, htons(0), htons(0));
-+        break;
-+
-     case MFF_ARP_THA:
-     case MFF_ND_TLL:
-         match->flow.arp_tha = eth_addr_zero;
-@@ -1890,6 +2100,50 @@ mf_set(const struct mf_field *mf,
-         match_set_arp_sha_masked(match, value->mac, mask->mac);
-         break;
- 
-+    case MFF_NSP:
-+        match_set_nsp_masked(match, value->be32, mask->be32);
-+        break;
-+
-+    case MFF_NSI:
-+        match_set_nsi_masked(match, value->u8, mask->u8);
-+        break;
-+
-+    case MFF_NSH_MDTYPE:
-+        match_set_nsh_mdtype_masked(match, value->u8, mask->u8);
-+        break;
-+
-+    case MFF_NSH_NP:
-+        match_set_nsh_np_masked(match, value->u8, mask->u8);
-+        break;
-+
-+    case MFF_NSH_C1:
-+        match_set_nshc1_masked(match, value->be32, mask->be32);
-+        break;
-+
-+    case MFF_NSH_C2:
-+        match_set_nshc2_masked(match, value->be32, mask->be32);
-+        break;
-+
-+    case MFF_NSH_C3:
-+        match_set_nshc3_masked(match, value->be32, mask->be32);
-+        break;
-+
-+    case MFF_NSH_C4:
-+        match_set_nshc4_masked(match, value->be32, mask->be32);
-+        break;
-+
-+    case MFF_ENCAP_ETH_SRC:
-+        match_set_encap_eth_src_masked(match, value->mac, mask->mac);
-+        break;
-+
-+    case MFF_ENCAP_ETH_DST:
-+        match_set_encap_eth_dst_masked(match, value->mac, mask->mac);
-+        break;
-+
-+    case MFF_ENCAP_ETH_TYPE:
-+        match_set_encap_eth_type_masked(match, value->be16, mask->be16);
-+        break;
-+
-     case MFF_ARP_THA:
-     case MFF_ND_TLL:
-         match_set_arp_tha_masked(match, value->mac, mask->mac);
-diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
-index ce2582f..2fe2722 100644
---- a/lib/netdev-native-tnl.c
-+++ b/lib/netdev-native-tnl.c
-@@ -44,6 +44,7 @@
- #include "unaligned.h"
- #include "unixctl.h"
- #include "openvswitch/vlog.h"
-+#include "openvswitch/vxlangpe.h"
- 
- VLOG_DEFINE_THIS_MODULE(native_tnl);
- static struct vlog_rate_limit err_rl = VLOG_RATE_LIMIT_INIT(60, 5);
-@@ -209,6 +210,9 @@ netdev_tnl_push_udp_header(struct dp_packet *packet,
-     struct udp_header *udp;
-     int ip_tot_size;
- 
-+    if ((data->tnl_type == OVS_VPORT_TYPE_VXLAN) && (data->exts & (1 << VXLAN_GPE_POP_ETH)))
-+        dp_packet_reset_packet(packet, ENCAP_ETH_LEN);
-+
-     udp = netdev_tnl_push_ip_header(packet, data->header, data->header_len, &ip_tot_size);
- 
-     /* set udp src port */
-@@ -478,6 +482,8 @@ netdev_vxlan_pop_header(struct dp_packet *packet)
-     struct flow_tnl *tnl = &md->tunnel;
-     struct vxlanhdr *vxh;
-     unsigned int hlen;
-+    ovs_be32 flag;
-+    ovs_be32 vni;
- 
-     pkt_metadata_init_tnl(md);
-     if (VXLAN_HLEN > dp_packet_l4_size(packet)) {
-@@ -489,17 +495,59 @@ netdev_vxlan_pop_header(struct dp_packet *packet)
-         goto err;
-     }
- 
--    if (get_16aligned_be32(&vxh->vx_flags) != htonl(VXLAN_FLAGS) ||
--       (get_16aligned_be32(&vxh->vx_vni) & htonl(0xff))) {
--        VLOG_WARN_RL(&err_rl, "invalid vxlan flags=%#x vni=%#x\n",
--                     ntohl(get_16aligned_be32(&vxh->vx_flags)),
--                     ntohl(get_16aligned_be32(&vxh->vx_vni)));
--        goto err;
--    }
--    tnl->tun_id = htonll(ntohl(get_16aligned_be32(&vxh->vx_vni)) >> 8);
--    tnl->flags |= FLOW_TNL_F_KEY;
-+    /* vxlan-gpe packets*/
-+    flag = get_16aligned_be32(&vxh->vx_flags);
-+    vni = get_16aligned_be32(&vxh->vx_vni);
-+
-+    if (flag & VXLAN_HF_GPE) {
-+        flag &= ~VXLAN_GPE_USED_BITS;
-+        if ((flag & ~VXLAN_GPE_USED_BITS) ||
-+            (vni & htonl(0xff))) {
-+
-+            VLOG_WARN_RL(&err_rl, "invalid vxlan flags=%#x vni=%#x\n for vxlan-gpe",
-+            ntohl(flag),
-+            ntohl(vni));
-+            goto err;
-+        }
-+
-+        struct vxlanhdr_gpe *gpe;
-+
-+        gpe = (struct vxlanhdr_gpe *)vxh;
-+        tnl->gpe_np = gpe->next_protocol;
- 
--    dp_packet_reset_packet(packet, hlen + VXLAN_HLEN);
-+        /* Drop the OAM packets */
-+        if (gpe->oam_flag)
-+            goto err;
-+
-+        tnl->tun_id = htonll(ntohl(vni) >> 8);
-+        tnl->flags |= FLOW_TNL_F_KEY;
-+
-+        if (tnl->gpe_np == VXLAN_GPE_NP_NSH) {
-+            /* Add a faked ethernet header which type is 0x894F, so the OVS
-+             * can receive frame starting with ethernet header.
-+             */
-+            struct eth_header * encap_eth;
-+            struct eth_header * eth = dp_packet_l2(packet);
-+
-+            memmove((char *)eth + hlen + VXLAN_HLEN - ENCAP_ETH_LEN, (char *)eth + hlen + VXLAN_HLEN + NSH_PUSH_TYPE1_HEADER_SIZE, 2 * ETH_ADDR_LEN);
-+            dp_packet_reset_packet(packet, hlen + VXLAN_HLEN - ENCAP_ETH_LEN);
-+            encap_eth = dp_packet_data(packet);
-+            encap_eth->eth_type = htons(ETH_P_NSH);
-+        } else
-+            dp_packet_reset_packet(packet, hlen + VXLAN_HLEN);
-+    } else {
-+        if (flag != htonl(VXLAN_FLAGS) ||
-+            (vni & htonl(0xff))) {
-+            VLOG_WARN_RL(&err_rl, "invalid vxlan flags=%#x vni=%#x\n",
-+                     ntohl(flag),
-+                     ntohl(vni));
-+            goto err;
-+        }
-+        tnl->tun_id = htonll(ntohl(vni) >> 8);
-+        tnl->flags |= FLOW_TNL_F_KEY;
-+
-+        dp_packet_reset_packet(packet, hlen + VXLAN_HLEN);
-+    }
- 
-     return packet;
- err:
-@@ -522,8 +570,27 @@ netdev_vxlan_build_header(const struct netdev *netdev,
- 
-     vxh = udp_build_header(tnl_cfg, data, params);
- 
--    put_16aligned_be32(&vxh->vx_flags, htonl(VXLAN_FLAGS));
--    put_16aligned_be32(&vxh->vx_vni, htonl(ntohll(params->flow->tunnel.tun_id) << 8));
-+    if(tnl_cfg->exts & (1 << OVS_VXLAN_EXT_GPE)) {
-+        struct vxlanhdr_gpe *gpe;
-+
-+        gpe = (struct vxlanhdr_gpe *)vxh;
-+        put_16aligned_be32(&vxh->vx_flags, htonl(VXLAN_FLAGS | VXLAN_HF_GPE));
-+        put_16aligned_be32(&vxh->vx_vni, htonl(ntohll(params->flow->tunnel.tun_id) << 8));
-+
-+        if (!params->flow->tunnel.gpe_np)
-+            return -1;
-+        else
-+            gpe->next_protocol = params->flow->tunnel.gpe_np;
-+
-+        if (params->flow->tunnel.gpe_flags & 0x01)
-+            gpe->oam_flag = 1;
-+
-+        if (params->flow->tunnel.gpe_np == VXLAN_GPE_NP_NSH)
-+            data->exts |= 1 << VXLAN_GPE_POP_ETH;
-+    } else {
-+        put_16aligned_be32(&vxh->vx_flags, htonl(VXLAN_FLAGS));
-+        put_16aligned_be32(&vxh->vx_vni, htonl(ntohll(params->flow->tunnel.tun_id) << 8));
-+    }
- 
-     ovs_mutex_unlock(&dev->mutex);
-     data->header_len += sizeof *vxh;
-diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
-index cff0f5c..841a070 100644
---- a/lib/netdev-vport.c
-+++ b/lib/netdev-vport.c
-@@ -525,9 +525,15 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args)
-             ext = strtok_r(str, ",", &save_ptr);
-             while (ext) {
-                 if (!strcmp(type, "vxlan") && !strcmp(ext, "gbp")) {
--                    tnl_cfg.exts |= (1 << OVS_VXLAN_EXT_GBP);
-+                    if (tnl_cfg.exts & (1 << OVS_VXLAN_EXT_GPE))
-+                        VLOG_WARN("VXLAN_GPE extension exists, VxLAN_GBP extension can't be added.");
-+                    else
-+                        tnl_cfg.exts |= (1 << OVS_VXLAN_EXT_GBP);
-                 } else if (!strcmp(type, "vxlan") && !strcmp(ext, "gpe")) {
--                    tnl_cfg.exts |= (1 << OVS_VXLAN_EXT_GPE);
-+                    if (tnl_cfg.exts & (1 << OVS_VXLAN_EXT_GBP))
-+                        VLOG_WARN("VXLAN_GBP extension exists, VxLAN_GPE extension can't be added.");
-+                    else
-+                        tnl_cfg.exts |= (1 << OVS_VXLAN_EXT_GPE);
-                 } else {
-                     VLOG_WARN("%s: unknown extension '%s'", name, ext);
-                 }
-diff --git a/lib/netdev-vport.h b/lib/netdev-vport.h
-index 048aa6e..b19cbd2 100644
---- a/lib/netdev-vport.h
-+++ b/lib/netdev-vport.h
-@@ -48,6 +48,12 @@ enum { NETDEV_VPORT_NAME_BUFSIZE = 16 };
- #else
- enum { NETDEV_VPORT_NAME_BUFSIZE = 256 };
- #endif
-+
-+enum OVS_ACTION_PUSH_VXLAN_EXTS {
-+    VXLAN_GPE_POP_ETH,      /* Pop ethernet header when the field next_proto
-+                             * is 4 in vxlan-gpe header
-+                             */
-+};
- const char *netdev_vport_get_dpif_port(const struct netdev *,
-                                        char namebuf[], size_t bufsize)
-     OVS_WARN_UNUSED_RESULT;
-diff --git a/lib/nx-match.c b/lib/nx-match.c
-index 65d7ee3..0c108f4 100644
---- a/lib/nx-match.c
-+++ b/lib/nx-match.c
-@@ -948,6 +948,24 @@ nx_put_raw(struct ofpbuf *b, enum ofp_version oxm, const struct match *match,
-                    ofputil_port_to_ofp11(flow->actset_output));
-     }
- 
-+    /* NSH */
-+    nxm_put_32m(b, MFF_NSP, oxm, flow->nsp, match->wc.masks.nsp);
-+    nxm_put_8m(b, MFF_NSI, oxm, flow->nsi, match->wc.masks.nsi);
-+    nxm_put_8m(b, MFF_NSH_MDTYPE, oxm, flow->nsh_mdtype, match->wc.masks.nsh_mdtype);
-+    nxm_put_8m(b, MFF_NSH_NP, oxm, flow->nsh_np, match->wc.masks.nsh_np);
-+    nxm_put_32m(b, MFF_NSH_C1, oxm, flow->nshc1, match->wc.masks.nshc1);
-+    nxm_put_32m(b, MFF_NSH_C2, oxm, flow->nshc2, match->wc.masks.nshc2);
-+    nxm_put_32m(b, MFF_NSH_C3, oxm, flow->nshc3, match->wc.masks.nshc3);
-+    nxm_put_32m(b, MFF_NSH_C4, oxm, flow->nshc4, match->wc.masks.nshc4);
-+
-+    nxm_put_eth_masked(b, MFF_ENCAP_ETH_SRC, oxm,
-+                       flow->encap_eth_src, match->wc.masks.encap_eth_src);
-+    nxm_put_eth_masked(b, MFF_ENCAP_ETH_DST, oxm,
-+                       flow->encap_eth_dst, match->wc.masks.encap_eth_dst);
-+    nxm_put_16m(b, MFF_ENCAP_ETH_TYPE, oxm,
-+                ofputil_dl_type_to_openflow(flow->encap_eth_type),
-+                match->wc.masks.encap_eth_type);
-+
-     /* Ethernet. */
-     nxm_put_eth_masked(b, MFF_ETH_SRC, oxm,
-                        flow->dl_src, match->wc.masks.dl_src);
-diff --git a/lib/odp-execute.c b/lib/odp-execute.c
-index 5a43904..20e3106 100644
---- a/lib/odp-execute.c
-+++ b/lib/odp-execute.c
-@@ -336,6 +336,7 @@ odp_execute_set_action(struct dp_packet *packet, const struct nlattr *a)
-     case OVS_KEY_ATTR_CT_ZONE:
-     case OVS_KEY_ATTR_CT_MARK:
-     case OVS_KEY_ATTR_CT_LABELS:
-+    case OVS_KEY_ATTR_NSH:
-     case __OVS_KEY_ATTR_MAX:
-     default:
-         OVS_NOT_REACHED();
-@@ -432,6 +433,7 @@ odp_execute_masked_set_action(struct dp_packet *packet,
-     case OVS_KEY_ATTR_ETHERTYPE:
-     case OVS_KEY_ATTR_IN_PORT:
-     case OVS_KEY_ATTR_VLAN:
-+    case OVS_KEY_ATTR_NSH:
-     case OVS_KEY_ATTR_ICMP:
-     case OVS_KEY_ATTR_ICMPV6:
-     case OVS_KEY_ATTR_TCP_FLAGS:
-@@ -497,6 +499,8 @@ requires_datapath_assistance(const struct nlattr *a)
- 
-     case OVS_ACTION_ATTR_SET:
-     case OVS_ACTION_ATTR_SET_MASKED:
-+    case OVS_ACTION_ATTR_PUSH_NSH:
-+    case OVS_ACTION_ATTR_POP_NSH:
-     case OVS_ACTION_ATTR_PUSH_VLAN:
-     case OVS_ACTION_ATTR_POP_VLAN:
-     case OVS_ACTION_ATTR_SAMPLE:
-@@ -586,6 +590,21 @@ odp_execute_actions(void *dp, struct dp_packet_batch *batch, bool steal,
-             }
-             break;
- 
-+        case OVS_ACTION_ATTR_PUSH_NSH: {
-+            const void *push_nsh_hdr = nl_attr_get(a);
-+
-+            for (i = 0; i < cnt; i++) {
-+                push_nsh(packets[i], push_nsh_hdr);
-+            }
-+            break;
-+        }
-+
-+        case OVS_ACTION_ATTR_POP_NSH:
-+            for (i = 0; i < cnt; i++) {
-+                pop_nsh(packets[i]);
-+            }
-+            break;
-+
-         case OVS_ACTION_ATTR_PUSH_MPLS: {
-             const struct ovs_action_push_mpls *mpls = nl_attr_get(a);
- 
-diff --git a/lib/odp-util.c b/lib/odp-util.c
-index b9e8aa7..97b4e94 100644
---- a/lib/odp-util.c
-+++ b/lib/odp-util.c
-@@ -70,7 +70,8 @@ static void format_odp_key_attr(const struct nlattr *a,
-                                 const struct nlattr *ma,
-                                 const struct hmap *portno_names, struct ds *ds,
-                                 bool verbose);
--
-+static void format_eth(struct ds *ds, const char *name, const struct eth_addr key,
-+                       const struct eth_addr *mask, bool verbose);
- struct geneve_scan {
-     struct geneve_opt d[63];
-     int len;
-@@ -113,6 +114,8 @@ odp_action_len(uint16_t type)
-     case OVS_ACTION_ATTR_USERSPACE: return ATTR_LEN_VARIABLE;
-     case OVS_ACTION_ATTR_PUSH_VLAN: return sizeof(struct ovs_action_push_vlan);
-     case OVS_ACTION_ATTR_POP_VLAN: return 0;
-+    case OVS_ACTION_ATTR_PUSH_NSH: return sizeof(struct ovs_action_push_nsh);
-+    case OVS_ACTION_ATTR_POP_NSH: return 0;
-     case OVS_ACTION_ATTR_PUSH_MPLS: return sizeof(struct ovs_action_push_mpls);
-     case OVS_ACTION_ATTR_POP_MPLS: return sizeof(ovs_be16);
-     case OVS_ACTION_ATTR_RECIRC: return sizeof(uint32_t);
-@@ -148,6 +151,7 @@ ovs_key_attr_to_string(enum ovs_key_attr attr, char *namebuf, size_t bufsize)
-     case OVS_KEY_ATTR_CT_LABELS: return "ct_label";
-     case OVS_KEY_ATTR_TUNNEL: return "tunnel";
-     case OVS_KEY_ATTR_IN_PORT: return "in_port";
-+    case OVS_KEY_ATTR_NSH: return "nsh";
-     case OVS_KEY_ATTR_ETHERNET: return "eth";
-     case OVS_KEY_ATTR_VLAN: return "vlan";
-     case OVS_KEY_ATTR_ETHERTYPE: return "eth_type";
-@@ -376,6 +380,31 @@ format_vlan_tci(struct ds *ds, ovs_be16 tci, ovs_be16 mask, bool verbose)
- }
- 
- static void
-+format_nsh(struct ds *ds, const struct ovs_action_push_nsh * nsh)
-+{
-+    const struct eth_nsh_hdr *eth_nsh_header = (struct eth_nsh_hdr *)nsh->header;
-+    format_eth(ds, "encap_eth_src",
-+                    eth_nsh_header->encap_eth_header.encap_eth_src,
-+                    NULL, true);
-+    format_eth(ds, "encap_eth_dst",
-+                    eth_nsh_header->encap_eth_header.encap_eth_dst,
-+                    NULL, true);
-+    ds_put_format(ds, "encap_eth_type=0x%04"PRIx16",",
-+                  ntohs(eth_nsh_header->encap_eth_header.encap_eth_type));
-+    ds_put_format(ds, "nsh_mdtype=%"PRIu8",nsh_np=%"PRIu8",nsp=%"PRIu32
-+		  ",nsi=%"PRIu8",nshc1=%"PRIu32",nshc2=%"PRIu32
-+		  ",nshc3=%"PRIu32",nshc4=%"PRIu32")",
-+                  eth_nsh_header->nsh_hdr.base.mdtype,
-+                  eth_nsh_header->nsh_hdr.base.proto,
-+                  ntohl(eth_nsh_header->nsh_hdr.base.path_hdr) >> 8,
-+                  ntohl(eth_nsh_header->nsh_hdr.base.path_hdr) & 0xFF,
-+                  ntohl(eth_nsh_header->nsh_hdr.ctx.nshc1),
-+                  ntohl(eth_nsh_header->nsh_hdr.ctx.nshc2),
-+                  ntohl(eth_nsh_header->nsh_hdr.ctx.nshc3),
-+                  ntohl(eth_nsh_header->nsh_hdr.ctx.nshc4));
-+}
-+
-+static void
- format_mpls_lse(struct ds *ds, ovs_be32 mpls_lse)
- {
-     ds_put_format(ds, "label=%"PRIu32",tc=%d,ttl=%d,bos=%d",
-@@ -503,7 +532,7 @@ format_odp_tnl_push_header(struct ds *ds, struct ovs_action_push_tnl *data)
-                       gnh->oam ? "oam," : "",
-                       gnh->critical ? "crit," : "",
-                       ntohl(get_16aligned_be32(&gnh->vni)) >> 8);
-- 
-+
-         if (gnh->opt_len) {
-             ds_put_cstr(ds, ",options(");
-             format_geneve_opts(gnh->options, NULL, gnh->opt_len * 4,
-@@ -763,6 +792,7 @@ format_odp_action(struct ds *ds, const struct nlattr *a)
- {
-     int expected_len;
-     enum ovs_action_attr type = nl_attr_type(a);
-+    const struct ovs_action_push_nsh *nsh;
-     size_t size;
- 
-     expected_len = odp_action_len(nl_attr_type(a));
-@@ -841,6 +871,14 @@ format_odp_action(struct ds *ds, const struct nlattr *a)
-     case OVS_ACTION_ATTR_POP_VLAN:
-         ds_put_cstr(ds, "pop_vlan");
-         break;
-+    case OVS_ACTION_ATTR_PUSH_NSH:
-+        nsh = nl_attr_get(a);
-+        ds_put_cstr(ds, "push_nsh(");
-+        format_nsh(ds, nsh);
-+        break;
-+    case OVS_ACTION_ATTR_POP_NSH:
-+        ds_put_cstr(ds, "pop_nsh");
-+        break;
-     case OVS_ACTION_ATTR_PUSH_MPLS: {
-         const struct ovs_action_push_mpls *mpls = nl_attr_get(a);
-         ds_put_cstr(ds, "push_mpls(");
-@@ -1646,6 +1684,53 @@ parse_odp_action(const char *s, const struct simap *port_names,
-     }
- 
-     {
-+        struct ovs_action_push_nsh push;
-+        struct eth_nsh_hdr *eth_nsh_header = (struct eth_nsh_hdr *)push.header;
-+        ovs_be32 nsp, nshc1,nshc2,nshc3,nshc4;
-+        uint8_t nsi, nsh_mdtype, nsh_np;
-+        int n = -1;
-+
-+        if (ovs_scan_len(s, &n, "push_nsh(encap_eth_dst="ETH_ADDR_SCAN_FMT
-+                        ",encap_eth_src="ETH_ADDR_SCAN_FMT
-+                        ",encap_eth_type=0x%"SCNx16
-+                        ",nsh_mdtype=%"SCNi8",nsh_np=%"SCNi8",nsp=0x%"SCNx32
-+                        ",nsi=%"SCNi8",nshc1=0x%"SCNx32",nshc2=0x%"SCNx32
-+                        ",nshc3=0x%"SCNx32",nshc4=0x%"SCNx32"))",
-+                        ETH_ADDR_SCAN_ARGS(eth_nsh_header->encap_eth_header.encap_eth_dst),
-+                        ETH_ADDR_SCAN_ARGS(eth_nsh_header->encap_eth_header.encap_eth_src),
-+                        &eth_nsh_header->encap_eth_header.encap_eth_type,
-+                        &nsh_mdtype, &nsh_np,
-+                        &nsp, &nsi,
-+                        &nshc1, &nshc2,
-+                        &nshc3, &nshc4)) {
-+            eth_nsh_header->encap_eth_header.encap_eth_type = htons(eth_nsh_header->encap_eth_header.encap_eth_type);
-+            if (nsh_mdtype == NSH_M_TYPE1) {
-+                eth_nsh_header->encap_eth_header.encap_eth_type = htons(ETH_P_NSH);
-+                eth_nsh_header->nsh_hdr.base.mdtype = NSH_M_TYPE1;
-+                eth_nsh_header->nsh_hdr.base.version = 0x01;
-+                eth_nsh_header->nsh_hdr.base.length = 6;
-+                eth_nsh_header->nsh_hdr.base.proto = nsh_np;
-+                eth_nsh_header->nsh_hdr.base.path_hdr= nsp;
-+                eth_nsh_header->nsh_hdr.base.svc_idx = nsi;
-+                eth_nsh_header->nsh_hdr.ctx.nshc1=nshc1;
-+                eth_nsh_header->nsh_hdr.ctx.nshc2=nshc2;
-+                eth_nsh_header->nsh_hdr.ctx.nshc3=nshc3;
-+                eth_nsh_header->nsh_hdr.ctx.nshc4=nshc4;
-+                push.nsh_mdtype = NSH_M_TYPE1;
-+                nl_msg_put_unspec(actions, OVS_ACTION_ATTR_PUSH_NSH,
-+                              &push, sizeof push);
-+            }
-+
-+            return n;
-+        }
-+    }
-+
-+    if (!strncmp(s, "pop_nsh", 7)) {
-+        nl_msg_put_flag(actions, OVS_ACTION_ATTR_POP_NSH);
-+        return 7;
-+    }
-+
-+    {
-         double percentage;
-         int n = -1;
- 
-@@ -1787,6 +1872,7 @@ static const struct attr_len_tbl ovs_flow_key_attr_lens[OVS_KEY_ATTR_MAX + 1] =
-                                  .next = ovs_tun_key_attr_lens,
-                                  .next_max = OVS_TUNNEL_KEY_ATTR_MAX },
-     [OVS_KEY_ATTR_IN_PORT]   = { .len = 4  },
-+    [OVS_KEY_ATTR_NSH]       = { .len = sizeof(struct ovs_key_nsh)  },
-     [OVS_KEY_ATTR_ETHERNET]  = { .len = sizeof(struct ovs_key_ethernet) },
-     [OVS_KEY_ATTR_VLAN]      = { .len = 2 },
-     [OVS_KEY_ATTR_ETHERTYPE] = { .len = 2 },
-@@ -1924,7 +2010,7 @@ odp_tun_key_from_attr__(const struct nlattr *attr,
-             };
-             struct nlattr *ext[ARRAY_SIZE(vxlan_opts_policy)];
- 
--            if (!nl_parse_nested(a, vxlan_opts_policy, ext, ARRAY_SIZE(ext))) {
-+            if (!nl_parse_nested(a, vxlan_opts_policy, ext, ARRAY_SIZE(vxlan_opts_policy))) {
-                 return ODP_FIT_ERROR;
-             }
- 
-@@ -2173,6 +2259,23 @@ format_be64(struct ds *ds, const char *name, ovs_be64 key,
- }
- 
- static void
-+format_be32(struct ds *ds, const char *name, ovs_be32 key,
-+            const ovs_be32 *mask, bool verbose)
-+{
-+    bool mask_empty = mask && !*mask;
-+
-+    if (verbose || !mask_empty) {
-+        bool mask_full = !mask || *mask == OVS_BE32_MAX;
-+
-+        ds_put_format(ds, "%s=%"PRIx32, name, ntohl(key));
-+        if (!mask_full) { /* Partially masked. */
-+            ds_put_format(ds, "/%#"PRIx32, ntohl(*mask));
-+        }
-+        ds_put_char(ds, ',');
-+    }
-+}
-+
-+static void
- format_ipv4(struct ds *ds, const char *name, ovs_be32 key,
-             const ovs_be32 *mask, bool verbose)
- {
-@@ -2827,6 +2930,25 @@ format_odp_key_attr(const struct nlattr *a, const struct nlattr *ma,
-         }
-         break;
- 
-+    case OVS_KEY_ATTR_NSH: {
-+        const struct ovs_key_nsh *mask = ma ? nl_attr_get(ma) : NULL;
-+        const struct ovs_key_nsh *key = nl_attr_get(a);
-+
-+        format_eth(ds, "encap_eth_src", key->encap_eth_src, MASK(mask, encap_eth_src), verbose);
-+        format_eth(ds, "encap_eth_dst", key->encap_eth_dst, MASK(mask, encap_eth_dst), verbose);
-+        format_be16x(ds, "encap_eth_type", key->encap_eth_type, MASK(mask, encap_eth_type), verbose);
-+        format_u8u(ds, "nsi", key->nsi, MASK(mask, nsi), verbose);
-+        format_be32(ds, "nsp", key->nsp, MASK(mask, nsp), verbose);
-+        format_u8u(ds, "nsh_mdtype", key->nsh_mdtype, MASK(mask, nsh_mdtype), verbose);
-+        format_u8u(ds, "nsh_np", key->nsh_np, MASK(mask, nsh_np), verbose);
-+        format_be32(ds, "nshc1", key->nshc1, MASK(mask, nshc1), verbose);
-+        format_be32(ds, "nshc2", key->nshc2, MASK(mask, nshc2), verbose);
-+        format_be32(ds, "nshc3", key->nshc3, MASK(mask, nshc3), verbose);
-+        format_be32(ds, "nshc4", key->nshc4, MASK(mask, nshc4), verbose);
-+        ds_chomp(ds, ',');
-+        break;
-+    }
-+
-     case OVS_KEY_ATTR_ETHERNET: {
-         const struct ovs_key_ethernet *mask = ma ? nl_attr_get(ma) : NULL;
-         const struct ovs_key_ethernet *key = nl_attr_get(a);
-@@ -3219,6 +3341,27 @@ scan_eth(const char *s, struct eth_addr *key, struct eth_addr *mask)
- }
- 
- static int
-+scan_nsp(const char *s, uint32_t *key, uint32_t *mask)
-+{
-+    int n;
-+
-+    if (ovs_scan(s, "%"SCNi32"%n", key, &n)) {
-+        int len = n;
-+        *key = htonl(*key);
-+        if (mask) {
-+            if (ovs_scan(s + len, "/%"SCNi32"%n", mask, &n)) {
-+                len += n;
-+                *mask =htonl(*mask);
-+            } else {
-+                *mask = UINT32_MAX;
-+            }
-+        }
-+        return len;
-+    }
-+    return 0;
-+}
-+
-+static int
- scan_ipv4(const char *s, ovs_be32 *key, ovs_be32 *mask)
- {
-     int n;
-@@ -4158,6 +4301,20 @@ parse_odp_key_mask_attr(const char *s, const struct simap *port_names,
-         SCAN_FIELD_NESTED_FUNC("flags(", uint16_t, tun_flags, tun_flags_to_attr);
-     } SCAN_END_NESTED();
- 
-+    SCAN_BEGIN("nsh(", struct ovs_key_nsh) {
-+        SCAN_FIELD("encap_eth_dst=", eth, encap_eth_dst);
-+        SCAN_FIELD("encap_eth_src=", eth, encap_eth_src);
-+        SCAN_FIELD("encap_eth_type=", be16, encap_eth_type);
-+        SCAN_FIELD("nsh_mdtype=", u8, nsh_mdtype);
-+        SCAN_FIELD("nsh_np=", u8, nsh_np);
-+        SCAN_FIELD("nsp=", nsp, nsp);
-+        SCAN_FIELD("nsi=", u8, nsi);
-+        SCAN_FIELD("nshc1=", u32, nshc1);
-+        SCAN_FIELD("nshc2=", u32, nshc2);
-+        SCAN_FIELD("nshc3=", u32, nshc3);
-+        SCAN_FIELD("nshc4=", u32, nshc4);
-+    } SCAN_END(OVS_KEY_ATTR_NSH);
-+
-     SCAN_SINGLE_PORT("in_port(", uint32_t, OVS_KEY_ATTR_IN_PORT);
- 
-     SCAN_BEGIN("eth(", struct ovs_key_ethernet) {
-@@ -4360,11 +4517,30 @@ union ovs_key_tp {
- static void get_tp_key(const struct flow *, union ovs_key_tp *);
- static void put_tp_key(const union ovs_key_tp *, struct flow *);
- 
-+void
-+get_nsh_key(const struct flow *flow, struct ovs_key_nsh *nsh)
-+{
-+    nsh->nsi = flow->nsi;
-+    nsh->nsp = flow->nsp;
-+    nsh->nsh_mdtype = flow->nsh_mdtype;
-+    nsh->nsh_np = flow->nsh_np;
-+    nsh->nshc1 = flow->nshc1;
-+    nsh->nshc2 = flow->nshc2;
-+    nsh->nshc3 = flow->nshc3;
-+    nsh->nshc4 = flow->nshc4;
-+    nsh->pad2 = 0;
-+    nsh->encap_eth_src = flow->encap_eth_src;
-+    nsh->encap_eth_dst = flow->encap_eth_dst;
-+    nsh->encap_eth_type = flow->encap_eth_type;
-+    nsh->pad1 = 0;
-+}
-+
- static void
- odp_flow_key_from_flow__(const struct odp_flow_key_parms *parms,
-                          bool export_mask, struct ofpbuf *buf)
- {
-     struct ovs_key_ethernet *eth_key;
-+    struct ovs_key_nsh *nsh_key;
-     size_t encap;
-     const struct flow *flow = parms->flow;
-     const struct flow *data = export_mask ? parms->mask : parms->flow;
-@@ -4403,6 +4579,12 @@ odp_flow_key_from_flow__(const struct odp_flow_key_parms *parms,
-         nl_msg_put_odp_port(buf, OVS_KEY_ATTR_IN_PORT, data->in_port.odp_port);
-     }
- 
-+    if (flow->nsh_mdtype) {
-+        nsh_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_NSH,
-+                                           sizeof *nsh_key);
-+        get_nsh_key(data, nsh_key);
-+    }
-+
-     eth_key = nl_msg_put_unspec_uninit(buf, OVS_KEY_ATTR_ETHERNET,
-                                        sizeof *eth_key);
-     get_ethernet_key(data, eth_key);
-@@ -5256,6 +5438,15 @@ odp_flow_key_to_flow__(const struct nlattr *key, size_t key_len,
-         flow->in_port.odp_port = ODPP_NONE;
-     }
- 
-+    /* NSH header. */
-+    if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_NSH)) {
-+        const struct ovs_key_nsh *nsh_key;
-+
-+        nsh_key = nl_attr_get(attrs[OVS_KEY_ATTR_NSH]);
-+        put_nsh_key(nsh_key, flow);
-+        expected_attrs |= UINT64_C(1) << OVS_KEY_ATTR_NSH;
-+    }
-+
-     /* Ethernet header. */
-     if (present_attrs & (UINT64_C(1) << OVS_KEY_ATTR_ETHERNET)) {
-         const struct ovs_key_ethernet *eth_key;
-@@ -5557,6 +5748,29 @@ put_ethernet_key(const struct ovs_key_ethernet *eth, struct flow *flow)
-     flow->dl_dst = eth->eth_dst;
- }
- 
-+void
-+put_nsh_key(const struct ovs_key_nsh *nsh, struct flow *flow)
-+{
-+    flow->nsh_mdtype = nsh->nsh_mdtype;
-+    flow->nsh_np = nsh->nsh_np;
-+    flow->nsi = nsh->nsi;
-+    flow->nsp = nsh->nsp;
-+    flow->nshc1 = nsh->nshc1;
-+    flow->nshc2 = nsh->nshc2;
-+    flow->nshc3 = nsh->nshc3;
-+    flow->nshc4 = nsh->nshc4;
-+    flow->encap_eth_src = nsh->encap_eth_src;
-+    flow->encap_eth_dst = nsh->encap_eth_dst;
-+    flow->encap_eth_type = nsh->encap_eth_type;
-+}
-+
-+void
-+flow_zero_nsh(struct flow *flow)
-+{
-+     void *dst_p = &(flow->encap_eth_dst);
-+     memset(dst_p, 0, 40);
-+}
-+
- static void
- commit_set_ether_addr_action(const struct flow *flow, struct flow *base_flow,
-                              struct ofpbuf *odp_actions,
-@@ -5608,6 +5822,64 @@ commit_vlan_action(ovs_be16 vlan_tci, struct flow *base,
-     base->vlan_tci = vlan_tci;
- }
- 
-+static void
-+commit_nsh_pop_action(const struct ovs_key_nsh *flow_key,
-+                    const struct ovs_key_nsh *base_key,
-+                    struct ofpbuf *odp_actions, struct flow_wildcards *wc)
-+{
-+
-+    if (memcmp(flow_key, base_key, sizeof (struct ovs_key_nsh))) {
-+        memset(&wc->masks.nsh_mdtype, 0xff, sizeof wc->masks.nsh_mdtype);
-+
-+        if (base_key->nsh_mdtype) {
-+            nl_msg_put_flag(odp_actions, OVS_ACTION_ATTR_POP_NSH);
-+        }
-+    }
-+}
-+
-+static void
-+commit_nsh_push_action(const struct ovs_key_nsh *flow_key,
-+                    const struct ovs_key_nsh *base_key,
-+                    struct ofpbuf *odp_actions)
-+{
-+    if (memcmp(flow_key, base_key, sizeof (struct ovs_key_nsh))) {
-+        if (flow_key->nsh_mdtype) {
-+            struct ovs_action_push_nsh nsh;
-+            nsh.nsh_mdtype = flow_key->nsh_mdtype;
-+            struct eth_nsh_hdr *eth_nsh_header = (struct eth_nsh_hdr *)nsh.header;
-+            memset(eth_nsh_header, 0, sizeof *eth_nsh_header);
-+            eth_nsh_header->nsh_hdr.base.length = 6;
-+            eth_nsh_header->nsh_hdr.base.proto = flow_key->nsh_np;
-+            eth_nsh_header->nsh_hdr.base.mdtype = flow_key->nsh_mdtype;
-+            eth_nsh_header->nsh_hdr.base.proto = flow_key->nsh_np;
-+            eth_nsh_header->nsh_hdr.base.path_hdr = flow_key->nsp >> 8 | flow_key->nsi << 24;
-+            eth_nsh_header->nsh_hdr.ctx.nshc1 = flow_key->nshc1;
-+            eth_nsh_header->nsh_hdr.ctx.nshc2 = flow_key->nshc2;
-+            eth_nsh_header->nsh_hdr.ctx.nshc3 = flow_key->nshc3;
-+            eth_nsh_header->nsh_hdr.ctx.nshc4 = flow_key->nshc4;
-+
-+            eth_nsh_header->encap_eth_header.encap_eth_type = htons(ETH_P_NSH);
-+            eth_nsh_header->encap_eth_header.encap_eth_dst = flow_key->encap_eth_dst;
-+            eth_nsh_header->encap_eth_header.encap_eth_src = flow_key->encap_eth_src;
-+
-+            nl_msg_put_unspec(odp_actions, OVS_ACTION_ATTR_PUSH_NSH,
-+                              &nsh, sizeof nsh);
-+        }
-+    }
-+}
-+
-+static void
-+commit_nsh_action(const struct flow *flow, struct flow *base,
-+                   struct ofpbuf *odp_actions, struct flow_wildcards *wc)
-+{
-+    struct ovs_key_nsh flow_key, base_key;
-+    get_nsh_key(flow, &flow_key);
-+    get_nsh_key(base, &base_key);
-+    commit_nsh_pop_action(&flow_key, &base_key, odp_actions, wc);
-+    commit_nsh_push_action(&flow_key, &base_key, odp_actions);
-+}
-+
-+
- /* Wildcarding already done at action translation time. */
- static void
- commit_mpls_action(const struct flow *flow, struct flow *base,
-@@ -6039,6 +6311,7 @@ commit_odp_actions(const struct flow *flow, struct flow *base,
-     slow2 = commit_set_icmp_action(flow, base, odp_actions, wc);
-     commit_mpls_action(flow, base, odp_actions);
-     commit_vlan_action(flow->vlan_tci, base, odp_actions, wc);
-+    commit_nsh_action(flow, base, odp_actions, wc);
-     commit_set_priority_action(flow, base, odp_actions, wc, use_masked);
-     commit_set_pkt_mark_action(flow, base, odp_actions, wc, use_masked);
- 
-diff --git a/lib/odp-util.h b/lib/odp-util.h
-index a41bc76..c701482 100644
---- a/lib/odp-util.h
-+++ b/lib/odp-util.h
-@@ -66,7 +66,7 @@ enum slow_path_reason {
- /* Mask of all slow_path_reasons. */
- enum {
-     SLOW_PATH_REASON_MASK = 0
--#define SPR(ENUM, STRING, EXPLANATION) | 1 << ENUM##_INDEX 
-+#define SPR(ENUM, STRING, EXPLANATION) | 1 << ENUM##_INDEX
-     SLOW_PATH_REASONS
- #undef SPR
- };
-@@ -126,6 +126,7 @@ void odp_portno_names_destroy(struct hmap *portno_names);
-  *  OVS_KEY_ATTR_CT_ZONE                 2     2     4      8
-  *  OVS_KEY_ATTR_CT_MARK                 4    --     4      8
-  *  OVS_KEY_ATTR_CT_LABEL               16    --     4     20
-+ *  OVS_KEY_ATTR_NSH                    40    --     4     44
-  *  OVS_KEY_ATTR_ETHERNET               12    --     4     16
-  *  OVS_KEY_ATTR_ETHERTYPE               2     2     4      8  (outer VLAN ethertype)
-  *  OVS_KEY_ATTR_VLAN                    2     2     4      8
-@@ -150,6 +151,9 @@ struct odputil_keybuf {
-     uint32_t keybuf[DIV_ROUND_UP(ODPUTIL_FLOW_KEY_BYTES, 4)];
- };
- 
-+void put_nsh_key(const struct ovs_key_nsh *, struct flow *);
-+void get_nsh_key(const struct flow *flow, struct ovs_key_nsh *nsh);
-+void flow_zero_nsh(struct flow *);
- enum odp_key_fitness odp_tun_key_from_attr(const struct nlattr *, bool udpif,
-                                            struct flow_tnl *);
- 
-diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
-index 15dbdec..2935ca6 100644
---- a/lib/ofp-actions.c
-+++ b/lib/ofp-actions.c
-@@ -304,6 +304,12 @@ enum ofp_raw_action_type {
-     /* NX1.0+(39): struct nx_action_output_trunc. */
-     NXAST_RAW_OUTPUT_TRUNC,
- 
-+    /* NX1.0+(200): void. */
-+    NXAST_RAW_PUSH_NSH,
-+
-+    /* NX1.0+(201): void. */
-+    NXAST_RAW_POP_NSH,
-+
- /* ## ------------------ ## */
- /* ## Debugging actions. ## */
- /* ## ------------------ ## */
-@@ -394,6 +400,8 @@ ofpact_next_flattened(const struct ofpact *ofpact)
-     case OFPACT_SET_VLAN_PCP:
-     case OFPACT_STRIP_VLAN:
-     case OFPACT_PUSH_VLAN:
-+    case OFPACT_PUSH_NSH:
-+    case OFPACT_POP_NSH:
-     case OFPACT_SET_ETH_SRC:
-     case OFPACT_SET_ETH_DST:
-     case OFPACT_SET_IPV4_SRC:
-@@ -1673,7 +1681,67 @@ format_PUSH_VLAN(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
-     ds_put_format(s, "%spush_vlan:%s%#"PRIx16,
-                   colors.param, colors.end, ETH_TYPE_VLAN_8021Q);
- }
--
-+
-+/* Push NSH header actions. */
-+static enum ofperr
-+decode_NXAST_RAW_PUSH_NSH(struct ofpbuf * out)
-+{
-+    ofpact_put_PUSH_NSH(out)->ofpact.raw = NXAST_RAW_PUSH_NSH;
-+
-+    return 0;
-+}
-+
-+static void
-+encode_PUSH_NSH(const struct ofpact_null *null OVS_UNUSED,
-+                  enum ofp_version ofp_version OVS_UNUSED, struct ofpbuf *out)
-+{
-+    put_NXAST_PUSH_NSH(out);
-+}
-+
-+static char * OVS_WARN_UNUSED_RESULT
-+parse_PUSH_NSH(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
-+                 enum ofputil_protocol *usable_protocols OVS_UNUSED)
-+{
-+    ofpact_put_PUSH_NSH(ofpacts)->ofpact.raw = NXAST_RAW_PUSH_NSH;;
-+    return NULL;
-+}
-+
-+static void
-+format_PUSH_NSH(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
-+{
-+    ds_put_format(s, "push_nsh");
-+}
-+
-+/* Pop NSH header actions. */
-+static enum ofperr
-+decode_NXAST_RAW_POP_NSH(struct ofpbuf * out)
-+{
-+    ofpact_put_POP_NSH(out)->ofpact.raw = NXAST_RAW_POP_NSH;
-+
-+    return 0;
-+}
-+
-+static void
-+encode_POP_NSH(const struct ofpact_null *null OVS_UNUSED,
-+                  enum ofp_version ofp_version OVS_UNUSED, struct ofpbuf *out)
-+{
-+    put_NXAST_POP_NSH(out);
-+}
-+
-+static char * OVS_WARN_UNUSED_RESULT
-+parse_POP_NSH(char *arg OVS_UNUSED, struct ofpbuf *ofpacts,
-+                 enum ofputil_protocol *usable_protocols OVS_UNUSED)
-+{
-+    ofpact_put_POP_NSH(ofpacts)->ofpact.raw = NXAST_RAW_POP_NSH;
-+    return NULL;
-+}
-+
-+static void
-+format_POP_NSH(const struct ofpact_null *a OVS_UNUSED, struct ds *s)
-+{
-+    ds_put_format(s, "pop_nsh");
-+}
-+
- /* Action structure for OFPAT10_SET_DL_SRC/DST and OFPAT11_SET_DL_SRC/DST. */
- struct ofp_action_dl_addr {
-     ovs_be16 type;                  /* Type. */
-@@ -6181,6 +6249,8 @@ ofpact_is_set_or_move_action(const struct ofpact *a)
-     case OFPACT_POP_QUEUE:
-     case OFPACT_PUSH_MPLS:
-     case OFPACT_PUSH_VLAN:
-+    case OFPACT_PUSH_NSH:
-+    case OFPACT_POP_NSH:
-     case OFPACT_RESUBMIT:
-     case OFPACT_SAMPLE:
-     case OFPACT_STACK_POP:
-@@ -6209,6 +6279,8 @@ ofpact_is_allowed_in_actions_set(const struct ofpact *a)
-     case OFPACT_POP_MPLS:
-     case OFPACT_PUSH_MPLS:
-     case OFPACT_PUSH_VLAN:
-+    case OFPACT_PUSH_NSH:
-+    case OFPACT_POP_NSH:
-     case OFPACT_REG_MOVE:
-     case OFPACT_SET_FIELD:
-     case OFPACT_SET_ETH_DST:
-@@ -6436,6 +6508,8 @@ ovs_instruction_type_from_ofpact_type(enum ofpact_type type)
-     case OFPACT_SET_VLAN_PCP:
-     case OFPACT_STRIP_VLAN:
-     case OFPACT_PUSH_VLAN:
-+    case OFPACT_PUSH_NSH:
-+    case OFPACT_POP_NSH:
-     case OFPACT_SET_ETH_SRC:
-     case OFPACT_SET_ETH_DST:
-     case OFPACT_SET_IPV4_SRC:
-@@ -6909,6 +6983,8 @@ ofpact_check__(enum ofputil_protocol *usable_protocols, struct ofpact *a,
-         flow->vlan_tci |= htons(VLAN_CFI);
-         return 0;
- 
-+    case OFPACT_PUSH_NSH:
-+    case OFPACT_POP_NSH:
-     case OFPACT_SET_ETH_SRC:
-     case OFPACT_SET_ETH_DST:
-         return 0;
-@@ -7548,6 +7624,8 @@ ofpact_outputs_to_port(const struct ofpact *ofpact, ofp_port_t port)
-     case OFPACT_SET_VLAN_PCP:
-     case OFPACT_STRIP_VLAN:
-     case OFPACT_PUSH_VLAN:
-+    case OFPACT_PUSH_NSH:
-+    case OFPACT_POP_NSH:
-     case OFPACT_SET_ETH_SRC:
-     case OFPACT_SET_ETH_DST:
-     case OFPACT_SET_IPV4_SRC:
-diff --git a/lib/packets.c b/lib/packets.c
-index e4c29d5..59afd0c 100644
---- a/lib/packets.c
-+++ b/lib/packets.c
-@@ -245,6 +245,29 @@ set_ethertype(struct dp_packet *packet, ovs_be16 eth_type)
-     }
- }
- 
-+void
-+push_nsh(struct dp_packet *packet, const void *nsh)
-+{
-+    void *header;
-+    const struct ovs_action_push_nsh *push_nsh_hdr = (const struct ovs_action_push_nsh *)nsh;
-+    const uint8_t *pdata = push_nsh_hdr->header;
-+    /* Now only support MD type1 */
-+    if (push_nsh_hdr->nsh_mdtype != NSH_M_TYPE1)
-+        return;
-+    header = dp_packet_push_uninit(packet, ETH_NSH_TYPE1_HEADER_SIZE);
-+
-+    memcpy(header, pdata, ETH_NSH_TYPE1_HEADER_SIZE);
-+}
-+
-+void
-+pop_nsh(struct dp_packet *packet)
-+{
-+    if (ETH_NSH_TYPE1_HEADER_SIZE > dp_packet_size(packet)) {
-+        return;
-+    }
-+    dp_packet_reset_packet(packet, ETH_NSH_TYPE1_HEADER_SIZE);
-+}
-+
- static bool is_mpls(struct dp_packet *packet)
- {
-     return packet->l2_5_ofs != UINT16_MAX;
-diff --git a/lib/packets.h b/lib/packets.h
-index dcfcd04..9d97a8a 100644
---- a/lib/packets.h
-+++ b/lib/packets.h
-@@ -279,6 +279,9 @@ void compose_rarp(struct dp_packet *, const struct eth_addr);
- void eth_push_vlan(struct dp_packet *, ovs_be16 tpid, ovs_be16 tci);
- void eth_pop_vlan(struct dp_packet *);
- 
-+void push_nsh(struct dp_packet *packet, const void *nsh);
-+void pop_nsh(struct dp_packet *packet);
-+
- const char *eth_from_hex(const char *hex, struct dp_packet **packetp);
- void eth_format_masked(const struct eth_addr ea,
-                        const struct eth_addr *mask, struct ds *s);
-diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
-index c3234ee..faf5c76 100644
---- a/ofproto/ofproto-dpif-sflow.c
-+++ b/ofproto/ofproto-dpif-sflow.c
-@@ -970,6 +970,7 @@ sflow_read_set_action(const struct nlattr *attr,
-     case OVS_KEY_ATTR_IN_PORT:
-     case OVS_KEY_ATTR_ETHERNET:
-     case OVS_KEY_ATTR_VLAN:
-+    case OVS_KEY_ATTR_NSH:
-         break;
- 
-     case OVS_KEY_ATTR_MPLS: {
-diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c
-index bffbf35..f673ced 100644
---- a/ofproto/ofproto-dpif-upcall.c
-+++ b/ofproto/ofproto-dpif-upcall.c
-@@ -39,6 +39,7 @@
- #include "seq.h"
- #include "unixctl.h"
- #include "openvswitch/vlog.h"
-+#include "odp-util.h"
- 
- #define MAX_QUEUE_LENGTH 512
- #define UPCALL_MAX_BATCH 64
-@@ -746,6 +747,8 @@ recv_upcalls(struct handler *handler)
-         struct upcall *upcall = &upcalls[n_upcalls];
-         struct flow *flow = &flows[n_upcalls];
-         unsigned int mru;
-+        struct ovs_key_nsh reserve_nsh;
-+        bool nsh_mdtype_flag, encap_eth_type_flag;
-         int error;
- 
-         ofpbuf_use_stub(recv_buf, recv_stubs[n_upcalls],
-@@ -792,8 +795,16 @@ recv_upcalls(struct handler *handler)
-         upcall->actions = dupcall->actions;
- 
-         pkt_metadata_from_flow(&dupcall->packet.md, flow);
-+
-+        nsh_mdtype_flag = !!(flow->nsh_mdtype);
-+        if(nsh_mdtype_flag)
-+            get_nsh_key(flow, &reserve_nsh);
-+
-         flow_extract(&dupcall->packet, flow);
- 
-+        if(nsh_mdtype_flag)
-+            put_nsh_key(&reserve_nsh, flow);
-+
-         error = process_upcall(udpif, upcall,
-                                &upcall->odp_actions, &upcall->wc);
-         if (error) {
-diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
-index a17047d..c1166de 100644
---- a/ofproto/ofproto-dpif-xlate.c
-+++ b/ofproto/ofproto-dpif-xlate.c
-@@ -4451,6 +4451,8 @@ freeze_unroll_actions(const struct ofpact *a, const struct ofpact *end,
-         case OFPACT_SET_VLAN_PCP:
-         case OFPACT_STRIP_VLAN:
-         case OFPACT_PUSH_VLAN:
-+        case OFPACT_PUSH_NSH:
-+        case OFPACT_POP_NSH:
-         case OFPACT_SET_ETH_SRC:
-         case OFPACT_SET_ETH_DST:
-         case OFPACT_SET_IPV4_SRC:
-@@ -4834,6 +4836,17 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len,
-             }
-             break;
- 
-+        case OFPACT_PUSH_NSH:
-+            memset(&wc->masks.nsh_mdtype, 0xff, sizeof wc->masks.nsh_mdtype);
-+            flow->encap_eth_dst = flow->dl_dst;
-+            flow->encap_eth_src = flow->dl_src;
-+            break;
-+
-+        case OFPACT_POP_NSH:
-+            memset(&wc->masks.nsh_mdtype, 0xff, sizeof wc->masks.nsh_mdtype);
-+            flow_zero_nsh(flow);
-+            break;
-+
-         case OFPACT_STRIP_VLAN:
-             memset(&wc->masks.vlan_tci, 0xff, sizeof wc->masks.vlan_tci);
-             flow->vlan_tci = htons(0);
-diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h
-index f1e1209..0e30e6e 100644
---- a/ofproto/ofproto-dpif.h
-+++ b/ofproto/ofproto-dpif.h
-@@ -96,7 +96,6 @@ struct dpif_backer_support {
-     /* Each member represents support for related OVS_KEY_ATTR_* fields. */
-     struct odp_support odp;
- };
--
- bool ofproto_dpif_get_enable_ufid(const struct dpif_backer *backer);
- struct dpif_backer_support *ofproto_dpif_get_support(const struct ofproto_dpif *);
- 
-diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c
-index 9a69071..acaec82 100644
---- a/ofproto/tunnel.c
-+++ b/ofproto/tunnel.c
-@@ -701,6 +701,7 @@ tnl_port_build_header(const struct ofport_dpif *ofport,
-     tnl_port = tnl_find_ofport(ofport);
-     ovs_assert(tnl_port);
-     res = netdev_build_header(tnl_port->netdev, data, params);
-+    data->exts = 0;
-     fat_rwlock_unlock(&rwlock);
- 
-     return res;
-diff --git a/tests/ofproto.at b/tests/ofproto.at
-index 7b7f02b..431181a 100644
---- a/tests/ofproto.at
-+++ b/tests/ofproto.at
-@@ -2192,7 +2192,7 @@ head_table () {
-         actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue
-         supported on Set-Field: tun_id tun_src tun_dst tun_ipv6_src tun_ipv6_dst tun_flags tun_gbp_id tun_gbp_flags tun_gpe_np tun_gpe_flags tun_metadata0 dnl
- tun_metadata1 tun_metadata2 tun_metadata3 tun_metadata4 tun_metadata5 tun_metadata6 tun_metadata7 tun_metadata8 tun_metadata9 tun_metadata10 tun_metadata11 tun_metadata12 tun_metadata13 tun_metadata14 tun_metadata15 tun_metadata16 tun_metadata17 tun_metadata18 tun_metadata19 tun_metadata20 tun_metadata21 tun_metadata22 tun_metadata23 tun_metadata24 tun_metadata25 tun_metadata26 tun_metadata27 tun_metadata28 tun_metadata29 tun_metadata30 tun_metadata31 tun_metadata32 tun_metadata33 tun_metadata34 tun_metadata35 tun_metadata36 tun_metadata37 tun_metadata38 tun_metadata39 tun_metadata40 tun_metadata41 tun_metadata42 tun_metadata43 tun_metadata44 tun_metadata45 tun_metadata46 tun_metadata47 tun_metadata48 tun_metadata49 tun_metadata50 tun_metadata51 tun_metadata52 tun_metadata53 tun_metadata54 tun_metadata55 tun_metadata56 tun_metadata57 tun_metadata58 tun_metadata59 tun_metadata60 tun_metadata61 tun_metadata62 tun_metadata63 dnl
--metadata in_port in_port_oxm pkt_mark ct_mark ct_label reg0 reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 reg9 reg10 reg11 reg12 reg13 reg14 reg15 xreg0 xreg1 xreg2 xreg3 xreg4 xreg5 xreg6 xreg7 xxreg0 xxreg1 xxreg2 xxreg3 eth_src eth_dst vlan_tci vlan_vid vlan_pcp mpls_label mpls_tc mpls_ttl ip_src ip_dst ipv6_src ipv6_dst ipv6_label nw_tos ip_dscp nw_ecn nw_ttl arp_op arp_spa arp_tpa arp_sha arp_tha tcp_src tcp_dst udp_src udp_dst sctp_src sctp_dst icmp_type icmp_code icmpv6_type icmpv6_code nd_target nd_sll nd_tll
-+metadata in_port in_port_oxm pkt_mark ct_mark ct_label reg0 reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 reg9 reg10 reg11 reg12 reg13 reg14 reg15 xreg0 xreg1 xreg2 xreg3 xreg4 xreg5 xreg6 xreg7 xxreg0 xxreg1 xxreg2 xxreg3 eth_src eth_dst vlan_tci vlan_vid vlan_pcp mpls_label mpls_tc mpls_ttl ip_src ip_dst ipv6_src ipv6_dst ipv6_label nw_tos ip_dscp nw_ecn nw_ttl arp_op arp_spa arp_tpa arp_sha arp_tha tcp_src tcp_dst udp_src udp_dst sctp_src sctp_dst icmp_type icmp_code icmpv6_type icmpv6_code nd_target nd_sll nd_tll nsp nsi nshc1 nshc2 nshc3 nshc4 nsh_mdtype nsh_np encap_eth_src encap_eth_dst encap_eth_type
-     matching:
-       dp_hash: arbitrary mask
-       recirc_id: exact match or wildcard
-@@ -2348,6 +2348,16 @@ metadata in_port in_port_oxm pkt_mark ct_mark ct_label reg0 reg1 reg2 reg3 reg4
-       nd_target: arbitrary mask
-       nd_sll: arbitrary mask
-       nd_tll: arbitrary mask
-+      nsp: arbitrary mask
-+      nsi: arbitrary mask
-+      nshc1: arbitrary mask
-+      nshc2: arbitrary mask
-+      nshc3: arbitrary mask
-+      nshc4: arbitrary mask
-+      nsh_mdtype: arbitrary mask
-+      nsh_np: arbitrary mask
-+      encap_eth_src: arbitrary mask
-+      encap_eth_dst: arbitrary mask
- 
- ' $1
- }
-diff --git a/tests/tunnel.at b/tests/tunnel.at
-index 477517e..eb429d3 100644
---- a/tests/tunnel.at
-+++ b/tests/tunnel.at
-@@ -532,6 +532,322 @@ AT_CHECK([tail -1 stdout], [0],
- OVS_VSWITCHD_STOP
- AT_CLEANUP
- 
-+AT_SETUP([tunnel - VXLAN-GPE and NSH - Encapsulation - kernel space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=2 \
-+        options:exts=gpe])
-+
-+OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
-+ADD_OF_PORTS([br0], [90])
-+AT_DATA([flows.txt], [dnl
-+in_port=90 actions=resubmit:1,resubmit:2
-+in_port=1 actions=push_nsh,set_field:1->nsh_mdtype,set_field:0x3->nsh_np,set_field:0x112233->nsp,set_field:0x44->nsi,set_field:0x11223344->nshc1,set_field:0x55667788->nshc2,set_field:0x99aabbcc->nshc3,set_field:0xddeeff00->nshc4,output:1
-+in_port=2 actions=push_nsh,set_field:1->nsh_mdtype,set_field:0x3->nsh_np,set_field:0x112233->nsp,set_field:0x44->nsi,set_field:0x11223344->nshc1,set_field:0x55667788->nshc2,set_field:0x99aabbcc->nshc3,set_field:0xddeeff00->nshc4,set_field:4->tun_gpe_np,output:2
-+])
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
-+		br0 65534/100: (dummy)
-+		p1 1/1: (dummy)
-+		p2 2/4790: (vxlan: dst_port=4790, key=flow, remote_ip=1.1.1.1)
-+		p90 90/90: (dummy)
-+])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: push_nsh(nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=287454020,nshc2=1432778632,nshc3=2578103244,nshc4=3723427584),1,set(tunnel(tun_id=0x0,dst=1.1.1.1,ttl=64,vxlan(gpe(np=0x4,flags=0)),flags(df|key))),push_nsh(nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=287454020,nshc2=1432778632,nshc3=2578103244,nshc4=3723427584),4790
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([tunnel - VXLAN-GPE and NSH - Decapsulation - kernel space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=2 \
-+        options:exts=gpe])
-+OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=2,tun_gpe_np=4,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,actions=pop_nsh,output=1
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
-+		br0 65534/100: (dummy)
-+		p1 1/1: (dummy)
-+		p2 2/4790: (vxlan: dst_port=4790, key=flow, remote_ip=1.1.1.1)
-+])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=1.2.3.4,ttl=64,flags(),vxlan(gpe(np=4,flags=0x0c))),in_port(4790),nsh(nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: pop_nsh,1
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([Eth and NSH - Encapsulation - kernel space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2])
-+
-+OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
-+ADD_OF_PORTS([br0], [90])
-+AT_DATA([flows.txt], [dnl
-+in_port=90 actions=resubmit:1,resubmit:2
-+in_port=1 actions=push_nsh,set_field:1->nsh_mdtype,set_field:0x3->nsh_np,set_field:0x112233->nsp,set_field:0x44->nsi,set_field:0x11223344->nshc1,set_field:0x55667788->nshc2,set_field:0x99aabbcc->nshc3,push_eth,set_field:0x894f->encap_eth_type,set_field:00:11:22:33:44:55->encap_eth_dst,set_field:00:66:77:88:99:aa->encap_eth_src,output:1
-+in_port=2 actions=push_nsh,set_field:1->nsh_mdtype,set_field:0x3->nsh_np,set_field:0x112233->nsp,set_field:0x44->nsi,set_field:0x11223344->nshc1,set_field:0x55667788->nshc2,set_field:0x99aabbcc->nshc3,set_field:0xddeeff00->nshc4,output:2
-+])
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+[Datapath actions: push_nsh(nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=287454020,nshc2=1432778632,nshc3=2578103244,nshc4=0),push_eth(encap_eth_type=35151,encap_eth_src=00:66:77:88:99:aa,encap_eth_dst=00:11:22:33:44:55,),1,push_nsh(nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=287454020,nshc2=1432778632,nshc3=2578103244,nshc4=3723427584),push_eth(encap_eth_type=35151,encap_eth_src=00:66:77:88:99:aa,encap_eth_dst=00:11:22:33:44:55,),2
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([Eth and NSH - Decapsulation - kernel space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2])
-+OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=2,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,encap_eth_type=0x894f,encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa,actions=pop_nsh,pop_eth,output=1
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy ',in_port(2),encap_eth(encap_eth_type=0x894f,encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa),nsh(nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: pop_eth,pop_nsh,1
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([VXLANGPE+NSH to Eth+NSH - kernel space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=2 \
-+        options:exts=gpe])
-+OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=2,tun_gpe_np=4,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,actions=push_eth,set_field:0x894f->encap_eth_type,set_field:00:11:22:33:44:55->encap_eth_dst,set_field:00:66:77:88:99:aa->encap_eth_src,output:1
-+
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=1.2.3.4,ttl=64,flags(),vxlan(gpe(np=4,flags=0x0c))),in_port(4790),nsh(nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: push_eth(encap_eth_type=35151,encap_eth_src=00:66:77:88:99:aa,encap_eth_dst=00:11:22:33:44:55,),1
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([Eth+NSH to VXLANGPE+NSH - kernel space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=2 \
-+        options:exts=gpe])
-+OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=1,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,encap_eth_type=0x894f,encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa,actions=pop_eth,set_field:0x4->tun_gpe_np,output=2
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy ',in_port(1),encap_eth(encap_eth_type=0x894f,encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa),,nsh(nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: set(tunnel(tun_id=0x0,dst=1.1.1.1,ttl=64,vxlan(gpe(np=0x4,flags=0)),flags(df|key))),pop_eth,4790
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([tunnel - VXLAN-GPE and NSH - Encapsulation - user space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=2 \
-+        options:exts=gpe])
-+
-+ADD_OF_PORTS([br0], [90])
-+
-+AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 2.2.2.22/24], [0], [OK
-+])
-+AT_CHECK([
-+ovs-appctl ovs/route/add 1.1.1.1/24 br0
-+ovs-appctl tnl/arp/set br0 1.1.1.1 00:11:11:11:11:11
-+],[0],[stdout])
-+
-+AT_DATA([flows.txt], [dnl
-+in_port=90 actions=resubmit:1,resubmit:2
-+in_port=1 actions=push_nsh,set_field:1->nsh_mdtype,set_field:0x3->nsh_np,set_field:0x112233->nsp,set_field:0x44->nsi,set_field:0x11223344->nshc1,set_field:0x55667788->nshc2,set_field:0x99aabbcc->nshc3,set_field:0xddeeff00->nshc4,output:1
-+in_port=2 actions=push_nsh,set_field:1->nsh_mdtype,set_field:0x3->nsh_np,set_field:0x112233->nsp,set_field:0x44->nsi,set_field:0x11223344->nshc1,set_field:0x55667788->nshc2,set_field:0x99aabbcc->nshc3,set_field:0xddeeff00->nshc4,set_field:4->tun_gpe_np,output:2
-+])
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: push_nsh(encap_eth_src=00:00:00:00:00:00,encap_eth_dst=00:00:00:00:00:00,nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=287454020,nshc2=1432778632,nshc3=2578103244,nshc4=3723427584),1,push_nsh(encap_eth_src=00:00:00:00:00:00,encap_eth_dst=00:00:00:00:00:00,nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=287454020,nshc2=1432778632,nshc3=2578103244,nshc4=3723427584),tnl_push(tnl_port(4790),header(size=50,type=4,eth(dst=00:11:11:11:11:11,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=2.2.2.22,dst=1.1.1.1,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4790,csum=0x0),vxlan(flags=0xc000004,vni=0x0)),out_port(100))
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([tunnel - VXLAN-GPE and NSH - Decapsulation - user space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=2 \
-+        options:exts=gpe])
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=2,tun_gpe_np=4,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,actions=pop_nsh,output=1
-+priority=100,in_port=1,actions=local
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 1.1.1.2/24], [0], [OK
-+])
-+
-+AT_CHECK([ovs-appctl ovs/route/add 1.1.1.1/24 br0], [0], [OK
-+])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=aa:55:aa:55:00:00),eth_type(0x0800),ipv4(src=1.1.1.1,dst=1.1.1.2,proto=17,tos=0,ttl=64,frag=no),udp(src=51283,dst=4790)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: tnl_pop(4790)
-+])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=1.2.3.4,ttl=64,flags(),vxlan(gpe(np=4,flags=0x0c))),in_port(4790),nsh(nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: pop_nsh,1
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([Eth and NSH - Encapsulation - user space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2])
-+
-+ADD_OF_PORTS([br0], [90])
-+AT_DATA([flows.txt], [dnl
-+in_port=90 actions=resubmit:1,resubmit:2
-+in_port=1 actions=push_nsh,set_field:1->nsh_mdtype,set_field:0x3->nsh_np,set_field:0x112233->nsp,set_field:0x44->nsi,set_field:0x11223344->nshc1,set_field:0x55667788->nshc2,set_field:0x99aabbcc->nshc3,set_field:00:11:22:33:44:55->encap_eth_dst,set_field:00:66:77:88:99:aa->encap_eth_src,output:1
-+])
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+[Datapath actions: push_nsh(encap_eth_src=00:66:77:88:99:aa,encap_eth_dst=00:11:22:33:44:55,nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=287454020,nshc2=1432778632,nshc3=2578103244,nshc4=0),1
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([Eth and NSH - Decapsulation - user space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2])
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=2,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa,actions=pop_nsh,output=1
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
-+		br0 65534/100: (dummy)
-+		p1 1/1: (dummy)
-+		p2 2/2: (dummy)
-+])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy ',in_port(2),nsh(encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa,nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: pop_nsh,1
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([VXLANGPE+NSH to Eth+NSH - user space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+	-- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2 \
-+        -- add-port br0 p3 -- set Interface p3 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=3 \
-+        options:exts=gpe])
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=3,tun_gpe_np=4,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,actions=set_field:00:11:22:33:44:55->encap_eth_dst,set_field:00:66:77:88:99:aa->encap_eth_src,output:2
-+priority=100,in_port=1,actions=local
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 1.1.1.2/24], [0], [OK
-+])
-+
-+AT_CHECK([ovs-appctl ovs/route/add 1.1.1.1/24 br0], [0], [OK
-+])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=aa:55:aa:55:00:00),eth_type(0x0800),ipv4(src=1.1.1.1,dst=1.1.1.2,proto=17,tos=0,ttl=64,frag=no),udp(src=51283,dst=4790)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: tnl_pop(4790)
-+])
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=1.2.3.4,ttl=64,flags(),vxlan(gpe(np=4,flags=0x0c))),in_port(4790),nsh(nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: pop_nsh,push_nsh(encap_eth_src=00:66:77:88:99:aa,encap_eth_dst=00:11:22:33:44:55,nsh_mdtype=1,nsh_np=3,nsp=1122867,nsi=1140850688,nshc1=1144201745,nshc2=2289526357,nshc3=3434850969,nshc4=16772829),2
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
-+AT_SETUP([Eth+NSH to VXLANGPE+NSH - user space])
-+OVS_VSWITCHD_START([dnl
-+        add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
-+        -- add-port br0 p2 -- set Interface p2 type=vxlan options:key=flow \
-+        options:remote_ip=1.1.1.1 options:dst_port=4790 ofport_request=2 \
-+        options:exts=gpe])
-+
-+AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 1.1.1.2/24], [0], [OK
-+])
-+AT_CHECK([
-+ovs-appctl ovs/route/add 1.1.1.1/24 br0
-+ovs-appctl tnl/arp/set br0 1.1.1.1 00:11:11:11:11:11
-+],[0],[stdout])
-+
-+AT_DATA([flows.txt], [dnl
-+priority=200,in_port=1,nsh_mdtype=1,nsh_np=3,nsi=0x44,nsp=0x112233,encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa,actions=set_field:0x4->tun_gpe_np,output=2
-+])
-+
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+
-+
-+AT_CHECK([ovs-appctl ofproto/trace ovs-dummy ',in_port(1),nsh(encap_eth_dst=00:11:22:33:44:55,encap_eth_src=00:66:77:88:99:aa,nsh_mdtype=1,nsh_np=3,nsp=0x112233,nsi=0x44,nshc1=0x11223344,nshc2=0x55667788,nshc3=0x99aabbcc,nshc4=0xddeeff00),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout])
-+
-+AT_CHECK([tail -1 stdout], [0],
-+  [Datapath actions: tnl_push(tnl_port(4790),header(size=50,type=4,eth(dst=00:11:11:11:11:11,src=aa:55:aa:55:00:00,dl_type=0x0800),ipv4(src=1.1.1.2,dst=1.1.1.1,proto=17,tos=0,ttl=64,frag=0x40),udp(src=0,dst=4790,csum=0x0),vxlan(flags=0xc000004,vni=0x0)),out_port(100))
-+])
-+
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
-+
- AT_SETUP([tunnel - Geneve metadata])
- OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=geneve \
-                     options:remote_ip=1.1.1.1 ofport_request=1 \
--- 
-2.1.0
-
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0003-Fix-too-large-stack-frame-size.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0003-Fix-too-large-stack-frame-size.patch
deleted file mode 100644
index 7a0dc01..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0003-Fix-too-large-stack-frame-size.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 9bd18a89542f910ce12b09fe3e03f08a22b691dd Mon Sep 17 00:00:00 2001
-From: Yi Yang <yi.y.yang@intel.com>
-Date: Mon, 14 Nov 2016 13:12:51 +0800
-Subject: [PATCH 3/8] Fix too large stack frame size
-
-Signed-off-by: Yi Yang <yi.y.yang@intel.com>
----
- datapath/datapath.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 78 insertions(+), 14 deletions(-)
-
-diff --git a/datapath/datapath.c b/datapath/datapath.c
-index db8a18a..ae6555f 100644
---- a/datapath/datapath.c
-+++ b/datapath/datapath.c
-@@ -939,7 +939,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
- 	struct sw_flow_mask mask;
- 	struct sk_buff *reply;
- 	struct datapath *dp;
--	struct sw_flow_key key;
-+	struct sw_flow_key *key = NULL;
- 	struct sw_flow_actions *acts;
- 	struct sw_flow_match match;
- 	u32 ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]);
-@@ -957,6 +957,12 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
- 		goto error;
- 	}
- 
-+        error = -ENOMEM;
-+        key = kzalloc(sizeof(struct sw_flow_key), GFP_KERNEL);
-+        if (key == NULL) {
-+               goto error;
-+        }
-+
- 	/* Most of the time we need to allocate a new flow, do it before
- 	 * locking.
- 	 */
-@@ -967,17 +973,17 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
- 	}
- 
- 	/* Extract key. */
--	ovs_match_init(&match, &key, &mask);
-+	ovs_match_init(&match, key, &mask);
- 	error = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
- 				  a[OVS_FLOW_ATTR_MASK], log);
- 	if (error)
- 		goto err_kfree_flow;
- 
--	ovs_flow_mask_key(&new_flow->key, &key, true, &mask);
-+	ovs_flow_mask_key(&new_flow->key, key, true, &mask);
- 
- 	/* Extract flow identifier. */
- 	error = ovs_nla_get_identifier(&new_flow->id, a[OVS_FLOW_ATTR_UFID],
--				       &key, log);
-+				       key, log);
- 	if (error)
- 		goto err_kfree_flow;
- 
-@@ -1007,7 +1013,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
- 	if (ovs_identifier_is_ufid(&new_flow->id))
- 		flow = ovs_flow_tbl_lookup_ufid(&dp->table, &new_flow->id);
- 	if (!flow)
--		flow = ovs_flow_tbl_lookup(&dp->table, &key);
-+		flow = ovs_flow_tbl_lookup(&dp->table, key);
- 	if (likely(!flow)) {
- 		rcu_assign_pointer(new_flow->sf_acts, acts);
- 
-@@ -1077,6 +1083,10 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
- 
- 	if (reply)
- 		ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return 0;
- 
- err_unlock_ovs:
-@@ -1087,6 +1097,10 @@ err_kfree_acts:
- err_kfree_flow:
- 	ovs_flow_free(new_flow, false);
- error:
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return error;
- }
- 
-@@ -1117,7 +1131,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
- 	struct net *net = sock_net(skb->sk);
- 	struct nlattr **a = info->attrs;
- 	struct ovs_header *ovs_header = info->userhdr;
--	struct sw_flow_key key;
-+	struct sw_flow_key *key = NULL;
- 	struct sw_flow *flow;
- 	struct sw_flow_mask mask;
- 	struct sk_buff *reply = NULL;
-@@ -1130,9 +1144,15 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
- 	bool log = !a[OVS_FLOW_ATTR_PROBE];
- 	bool ufid_present;
- 
-+        error = -ENOMEM;
-+        key = kzalloc(sizeof(struct sw_flow_key), GFP_KERNEL);
-+        if (key == NULL) {
-+               goto error;
-+        }
-+
- 	ufid_present = ovs_nla_get_ufid(&sfid, a[OVS_FLOW_ATTR_UFID], log);
- 	if (a[OVS_FLOW_ATTR_KEY]) {
--		ovs_match_init(&match, &key, &mask);
-+		ovs_match_init(&match, key, &mask);
- 		error = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
- 					  a[OVS_FLOW_ATTR_MASK], log);
- 	} else if (!ufid_present) {
-@@ -1152,7 +1172,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
- 			goto error;
- 		}
- 
--		acts = get_flow_actions(net, a[OVS_FLOW_ATTR_ACTIONS], &key,
-+		acts = get_flow_actions(net, a[OVS_FLOW_ATTR_ACTIONS], key,
- 					&mask, log);
- 		if (IS_ERR(acts)) {
- 			error = PTR_ERR(acts);
-@@ -1220,6 +1240,10 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
- 	if (old_acts)
- 		ovs_nla_free_flow_actions_rcu(old_acts);
- 
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return 0;
- 
- err_unlock_ovs:
-@@ -1228,6 +1252,10 @@ err_unlock_ovs:
- err_kfree_acts:
- 	ovs_nla_free_flow_actions(acts);
- error:
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return error;
- }
- 
-@@ -1236,7 +1264,7 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
- 	struct nlattr **a = info->attrs;
- 	struct ovs_header *ovs_header = info->userhdr;
- 	struct net *net = sock_net(skb->sk);
--	struct sw_flow_key key;
-+	struct sw_flow_key *key = NULL;
- 	struct sk_buff *reply;
- 	struct sw_flow *flow;
- 	struct datapath *dp;
-@@ -1247,9 +1275,15 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
- 	bool log = !a[OVS_FLOW_ATTR_PROBE];
- 	bool ufid_present;
- 
-+        err = -ENOMEM;
-+        key = kzalloc(sizeof(struct sw_flow_key), GFP_KERNEL);
-+        if (key == NULL) {
-+               return err;
-+        }
-+
- 	ufid_present = ovs_nla_get_ufid(&ufid, a[OVS_FLOW_ATTR_UFID], log);
- 	if (a[OVS_FLOW_ATTR_KEY]) {
--		ovs_match_init(&match, &key, NULL);
-+		ovs_match_init(&match, key, NULL);
- 		err = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY], NULL,
- 					log);
- 	} else if (!ufid_present) {
-@@ -1257,9 +1291,13 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
- 			  "Flow get message rejected, Key attribute missing.");
- 		err = -EINVAL;
- 	}
--	if (err)
-+	if (err) {
-+                if (key != NULL) {
-+                        kfree(key);
-+                        key = NULL;
-+                }
- 		return err;
--
-+        }
- 	ovs_lock();
- 	dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
- 	if (!dp) {
-@@ -1284,9 +1322,17 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
- 	}
- 
- 	ovs_unlock();
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return genlmsg_reply(reply, info);
- unlock:
- 	ovs_unlock();
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return err;
- }
- 
-@@ -1295,7 +1341,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
- 	struct nlattr **a = info->attrs;
- 	struct ovs_header *ovs_header = info->userhdr;
- 	struct net *net = sock_net(skb->sk);
--	struct sw_flow_key key;
-+	struct sw_flow_key *key = NULL;
- 	struct sk_buff *reply;
- 	struct sw_flow *flow = NULL;
- 	struct datapath *dp;
-@@ -1306,12 +1352,22 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
- 	bool log = !a[OVS_FLOW_ATTR_PROBE];
- 	bool ufid_present;
- 
-+        err = -ENOMEM;
-+        key = kzalloc(sizeof(struct sw_flow_key), GFP_KERNEL);
-+        if (key == NULL) {
-+               return err;
-+        }
-+
- 	ufid_present = ovs_nla_get_ufid(&ufid, a[OVS_FLOW_ATTR_UFID], log);
- 	if (a[OVS_FLOW_ATTR_KEY]) {
--		ovs_match_init(&match, &key, NULL);
-+		ovs_match_init(&match, key, NULL);
- 		err = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
- 					NULL, log);
- 		if (unlikely(err))
-+                        if (key != NULL) {
-+                                kfree(key);
-+                                key = NULL;
-+                        }
- 			return err;
- 	}
- 
-@@ -1361,9 +1417,17 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
- 	}
- 
- 	ovs_flow_free(flow, true);
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return 0;
- unlock:
- 	ovs_unlock();
-+        if (key != NULL) {
-+                kfree(key);
-+                key = NULL;
-+        }
- 	return err;
- }
- 
--- 
-2.1.0
-
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0004-Fix-vxlangpe-issues-on-DPDK-netdev.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0004-Fix-vxlangpe-issues-on-DPDK-netdev.patch
deleted file mode 100644
index 3b89a42..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0004-Fix-vxlangpe-issues-on-DPDK-netdev.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 861f91c172c97b3ea787a1ad30617f31d77f1379 Mon Sep 17 00:00:00 2001
-From: Yi Yang <yi.y.yang@intel.com>
-Date: Wed, 30 Nov 2016 10:22:57 +0800
-Subject: [PATCH 4/8] Fix vxlangpe issues on DPDK netdev
-
- - Fix a potential deadlock issue
- - Use Ethernet header before NSH header in VxLAN-gpe
-   to ensure we have uniform behaviour in OVS DPDK and
-   OVS
- - Correct VxLAN-gpe check in netdev_vxlan_pop_header
-
-Signed-off-by: Yi Yang <yi.y.yang@intel.com>
----
- lib/dpif-netdev.c       |  5 +----
- lib/netdev-native-tnl.c |  9 +++++----
- lib/netdev-vport.c      | 10 ++++++++++
- lib/netdev-vport.h      |  2 ++
- ofproto/tunnel.c        |  1 -
- 5 files changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
-index c779c78..257a174 100644
---- a/lib/dpif-netdev.c
-+++ b/lib/dpif-netdev.c
-@@ -1217,11 +1217,8 @@ static void add_vxlan_gpe_exts(struct netdev *netdev, uint32_t exts)
- {
-     const char *type = netdev_get_type(netdev);
-     if (!strcmp(type, "vxlan")) {
--        struct netdev_tunnel_config *cfg;
--        cfg = netdev_get_tunnel_config(netdev);
--
-         if(exts & (1 << OVS_VXLAN_EXT_GPE))
--            cfg->exts |= (1 << OVS_VXLAN_EXT_GPE);
-+            netdev_set_tunnel_config_exts(netdev, exts);
-     }
- }
- 
-diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
-index 2fe2722..a677ec8 100644
---- a/lib/netdev-native-tnl.c
-+++ b/lib/netdev-native-tnl.c
-@@ -243,6 +243,7 @@ eth_build_header(struct ovs_action_push_tnl *data,
-     uint16_t eth_proto = params->is_ipv6 ? ETH_TYPE_IPV6 : ETH_TYPE_IP;
-     struct eth_header *eth;
- 
-+    data->exts = 0;
-     memset(data->header, 0, sizeof data->header);
- 
-     eth = (struct eth_header *)data->header;
-@@ -499,9 +500,9 @@ netdev_vxlan_pop_header(struct dp_packet *packet)
-     flag = get_16aligned_be32(&vxh->vx_flags);
-     vni = get_16aligned_be32(&vxh->vx_vni);
- 
--    if (flag & VXLAN_HF_GPE) {
--        flag &= ~VXLAN_GPE_USED_BITS;
--        if ((flag & ~VXLAN_GPE_USED_BITS) ||
-+    if (flag & htonl(VXLAN_HF_GPE)) {
-+        flag &= htonl(~VXLAN_GPE_USED_BITS);
-+        if ((flag != htonl(VXLAN_FLAGS)) ||
-             (vni & htonl(0xff))) {
- 
-             VLOG_WARN_RL(&err_rl, "invalid vxlan flags=%#x vni=%#x\n for vxlan-gpe",
-@@ -578,7 +579,7 @@ netdev_vxlan_build_header(const struct netdev *netdev,
-         put_16aligned_be32(&vxh->vx_vni, htonl(ntohll(params->flow->tunnel.tun_id) << 8));
- 
-         if (!params->flow->tunnel.gpe_np)
--            return -1;
-+            gpe->next_protocol = VXLAN_GPE_NP_ETHERNET;
-         else
-             gpe->next_protocol = params->flow->tunnel.gpe_np;
- 
-diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
-index 841a070..0aca632 100644
---- a/lib/netdev-vport.c
-+++ b/lib/netdev-vport.c
-@@ -85,6 +85,16 @@ get_netdev_tunnel_config(const struct netdev *netdev)
-     return &netdev_vport_cast(netdev)->tnl_cfg;
- }
- 
-+void netdev_set_tunnel_config_exts(struct netdev *netdev, uint32_t exts)
-+{
-+    struct netdev_vport *dev = netdev_vport_cast(netdev);
-+    dev->tnl_cfg.exts = exts;
-+    ovs_mutex_lock(&dev->mutex);
-+    tunnel_check_status_change__(dev);
-+    netdev_change_seq_changed(netdev);
-+    ovs_mutex_unlock(&dev->mutex);
-+}
-+
- bool
- netdev_vport_is_patch(const struct netdev *netdev)
- {
-diff --git a/lib/netdev-vport.h b/lib/netdev-vport.h
-index b19cbd2..e093dde 100644
---- a/lib/netdev-vport.h
-+++ b/lib/netdev-vport.h
-@@ -19,6 +19,7 @@
- 
- #include <stdbool.h>
- #include <stddef.h>
-+#include <inttypes.h>
- #include "compiler.h"
- 
- struct dpif_netlink_vport;
-@@ -42,6 +43,7 @@ void netdev_vport_inc_tx(const struct netdev *,
- 
- bool netdev_vport_is_vport_class(const struct netdev_class *);
- const char *netdev_vport_class_get_dpif_port(const struct netdev_class *);
-+void netdev_set_tunnel_config_exts(struct netdev *netdev, uint32_t exts);
- 
- #ifndef _WIN32
- enum { NETDEV_VPORT_NAME_BUFSIZE = 16 };
-diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c
-index acaec82..9a69071 100644
---- a/ofproto/tunnel.c
-+++ b/ofproto/tunnel.c
-@@ -701,7 +701,6 @@ tnl_port_build_header(const struct ofport_dpif *ofport,
-     tnl_port = tnl_find_ofport(ofport);
-     ovs_assert(tnl_port);
-     res = netdev_build_header(tnl_port->netdev, data, params);
--    data->exts = 0;
-     fat_rwlock_unlock(&rwlock);
- 
-     return res;
--- 
-2.1.0
-
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch
deleted file mode 100644
index 592abe6..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0005-Change-match-field-IDs-and-action-IDs-to-adapt-to-OD.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From b6fb68aaf672af71e60ecff9b6b03f1d5f42be0c Mon Sep 17 00:00:00 2001
-From: Yi Yang <yi.y.yang@intel.com>
-Date: Wed, 30 Nov 2016 12:22:19 +0800
-Subject: [PATCH 5/8] Change match field IDs and action IDs to adapt to ODL
-
-Signed-off-by: Yi Yang <yi.y.yang@intel.com>
----
- include/openvswitch/meta-flow.h | 42 ++++++++++++++++++++---------------------
- lib/ofp-actions.c               | 10 +++++-----
- 2 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h
-index fa4129c..190c3d6 100644
---- a/include/openvswitch/meta-flow.h
-+++ b/include/openvswitch/meta-flow.h
-@@ -502,7 +502,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_TUN_GPE_NP(200) since v2.4.
-+     * NXM: NXM_NX_TUN_GPE_NP(111) since v2.4.
-      * OXM: none.
-      */
-     MFF_TUN_GPE_NP,
-@@ -516,7 +516,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_TUN_GPE_FLAGS(201) since v2.4.
-+     * NXM: NXM_NX_TUN_GPE_FLAGS(112) since v2.4.
-      * OXM: none.
-      */
-     MFF_TUN_GPE_FLAGS,
-@@ -966,14 +966,14 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_XXREG0(111) since v2.6.              <0>
--     * NXM: NXM_NX_XXREG1(112) since v2.6.              <1>
--     * NXM: NXM_NX_XXREG2(113) since v2.6.              <2>
--     * NXM: NXM_NX_XXREG3(114) since v2.6.              <3>
--     * NXM: NXM_NX_XXREG4(115) since vX.Y.              <4>
--     * NXM: NXM_NX_XXREG5(116) since vX.Y.              <5>
--     * NXM: NXM_NX_XXREG6(117) since vX.Y.              <6>
--     * NXM: NXM_NX_XXREG7(118) since vX.Y.              <7>
-+     * NXM: NXM_NX_XXREG0(124) since v2.6.              <0>
-+     * NXM: NXM_NX_XXREG1(125) since v2.6.              <1>
-+     * NXM: NXM_NX_XXREG2(126) since v2.6.              <2>
-+     * NXM: NXM_NX_XXREG3(127) since v2.6.              <3>
-+     * NXM: NXM_NX_XXREG4(128) since vX.Y.              <4>
-+     * NXM: NXM_NX_XXREG5(129) since vX.Y.              <5>
-+     * NXM: NXM_NX_XXREG6(130) since vX.Y.              <6>
-+     * NXM: NXM_NX_XXREG7(131) since vX.Y.              <7>
-      * OXM: none.
-      */
-     MFF_XXREG0,
-@@ -1813,7 +1813,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_NSP(202) since v1.1.
-+     * NXM: NXM_NX_NSP(113) since v1.1.
-      * OXM: none.
-      * Prefix lookup member: nsp.
-      */
-@@ -1829,7 +1829,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: decimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_NSI(203) since v1.1.
-+     * NXM: NXM_NX_NSI(114) since v1.1.
-      * OXM: none.
-      * Prefix lookup member: nsi.
-      */
-@@ -1846,7 +1846,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_NSH_C1(204) since v1.1.
-+     * NXM: NXM_NX_NSH_C1(115) since v1.1.
-      * OXM: none.
-      * Prefix lookup member: nshc1.
-      */
-@@ -1863,7 +1863,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_NSH_C2(205) since v1.1.
-+     * NXM: NXM_NX_NSH_C2(116) since v1.1.
-      * OXM: none.
-      * Prefix lookup member: nshc2.
-      */
-@@ -1880,7 +1880,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_NSH_C3(206) since v1.1.
-+     * NXM: NXM_NX_NSH_C3(117) since v1.1.
-      * OXM: none.
-      * Prefix lookup member: nshc3.
-      */
-@@ -1897,7 +1897,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_NSH_C4(207) since v1.1.
-+     * NXM: NXM_NX_NSH_C4(118) since v1.1.
-      * OXM: none.
-      * Prefix lookup member: nshc4.
-      */
-@@ -1913,7 +1913,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: decimal.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_NSH_MDTYPE(208) since v1.1.
-+     * NXM: NXM_NX_NSH_MDTYPE(119) since v1.1.
-      * OXM: none.
-      */
-     MFF_NSH_MDTYPE,
-@@ -1928,7 +1928,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-       * Formatting: decimal.
-       * Prerequisites: none.
-       * Access: read/write.
--      * NXM: NXM_NX_NSH_NP(209) since v1.1.
-+      * NXM: NXM_NX_NSH_NP(120) since v1.1.
-       * OXM: none.
-       */
-      MFF_NSH_NP,
-@@ -1942,7 +1942,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: Ethernet.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_ENCAP_ETH_SRC(210) since v1.1.
-+     * NXM: NXM_NX_ENCAP_ETH_SRC(121) since v1.1.
-      * OXM: none.
-      */
-     MFF_ENCAP_ETH_SRC,
-@@ -1956,7 +1956,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: Ethernet.
-      * Prerequisites: none.
-      * Access: read/write.
--     * NXM: NXM_NX_ENCAP_ETH_DST(211) since v1.1.
-+     * NXM: NXM_NX_ENCAP_ETH_DST(122) since v1.1.
-      * OXM: none.
-      */
-     MFF_ENCAP_ETH_DST,
-@@ -1970,7 +1970,7 @@ enum OVS_PACKED_ENUM mf_field_id {
-      * Formatting: hexadecimal.
-      * Prerequisites: none.
-      * Access: read-only.
--     * NXM: NXM_NX_ENCAP_ETH_TYPE(212) since v1.1.
-+     * NXM: NXM_NX_ENCAP_ETH_TYPE(123) since v1.1.
-      * OXM: none.
-      */
-     MFF_ENCAP_ETH_TYPE,
-diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
-index 2935ca6..4939ef2 100644
---- a/lib/ofp-actions.c
-+++ b/lib/ofp-actions.c
-@@ -196,7 +196,7 @@ enum ofp_raw_action_type {
-     /* NX1.0(4), OF1.1+(21): uint32_t. */
-     OFPAT_RAW_SET_QUEUE,
- 
--    /* NX1.0(40), OF1.1+(22): uint32_t. */
-+    /* NX1.0(42), OF1.1+(22): uint32_t. */
-     OFPAT_RAW_GROUP,
- 
-     /* OF1.1+(23): uint8_t. */
-@@ -289,7 +289,7 @@ enum ofp_raw_action_type {
- 
-     /* NX1.0+(29): struct nx_action_sample. */
-     NXAST_RAW_SAMPLE,
--    /* NX1.0+(38): struct nx_action_sample2. */
-+    /* NX1.0+(40): struct nx_action_sample2. */
-     NXAST_RAW_SAMPLE2,
- 
-     /* NX1.0+(34): struct nx_action_conjunction. */
-@@ -301,13 +301,13 @@ enum ofp_raw_action_type {
-     /* NX1.0+(36): struct nx_action_nat, ... */
-     NXAST_RAW_NAT,
- 
--    /* NX1.0+(39): struct nx_action_output_trunc. */
-+    /* NX1.0+(41): struct nx_action_output_trunc. */
-     NXAST_RAW_OUTPUT_TRUNC,
- 
--    /* NX1.0+(200): void. */
-+    /* NX1.0+(38): void. */
-     NXAST_RAW_PUSH_NSH,
- 
--    /* NX1.0+(201): void. */
-+    /* NX1.0+(39): void. */
-     NXAST_RAW_POP_NSH,
- 
- /* ## ------------------ ## */
--- 
-2.1.0
-
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0006-To-be-compatible-with-vpp_nsh.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0006-To-be-compatible-with-vpp_nsh.patch
deleted file mode 100644
index 570cb2d..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0006-To-be-compatible-with-vpp_nsh.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 622fe1bb00d38a70110d838eecc9e10c0d62cf7c Mon Sep 17 00:00:00 2001
-From: Yi Yang <yi.y.yang@intel.com>
-Date: Wed, 30 Nov 2016 17:27:11 +0800
-Subject: [PATCH 6/8] To be compatible with vpp_nsh
-
-Signed-off-by: Yi Yang <yi.y.yang@intel.com>
----
- lib/netdev-native-tnl.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
-index a677ec8..2dd4954 100644
---- a/lib/netdev-native-tnl.c
-+++ b/lib/netdev-native-tnl.c
-@@ -578,9 +578,10 @@ netdev_vxlan_build_header(const struct netdev *netdev,
-         put_16aligned_be32(&vxh->vx_flags, htonl(VXLAN_FLAGS | VXLAN_HF_GPE));
-         put_16aligned_be32(&vxh->vx_vni, htonl(ntohll(params->flow->tunnel.tun_id) << 8));
- 
--        if (!params->flow->tunnel.gpe_np)
--            gpe->next_protocol = VXLAN_GPE_NP_ETHERNET;
--        else
-+        if (!params->flow->tunnel.gpe_np) {
-+            gpe->next_protocol = VXLAN_GPE_NP_NSH;
-+            data->exts |= 1 << VXLAN_GPE_POP_ETH;
-+        } else
-             gpe->next_protocol = params->flow->tunnel.gpe_np;
- 
-         if (params->flow->tunnel.gpe_flags & 0x01)
--- 
-2.1.0
-
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0007-Fix-struct-ovs_gso_cb-size-issue.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0007-Fix-struct-ovs_gso_cb-size-issue.patch
deleted file mode 100644
index 621e901..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0007-Fix-struct-ovs_gso_cb-size-issue.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From dfbdc2b4e12dd5e2aff617e1bc2757e9fc39d1f6 Mon Sep 17 00:00:00 2001
-From: Yi Yang <yi.y.yang@intel.com>
-Date: Thu, 1 Dec 2016 13:36:23 +0800
-Subject: [PATCH 7/8] Fix struct ovs_gso_cb size issue
-
-Signed-off-by: Yi Yang <yi.y.yang@intel.com>
----
- datapath/actions.c  | 6 +++---
- datapath/datapath.h | 2 --
- datapath/flow.c     | 2 --
- 3 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/datapath/actions.c b/datapath/actions.c
-index c979596..936a015 100644
---- a/datapath/actions.c
-+++ b/datapath/actions.c
-@@ -278,6 +278,7 @@ static int pop_nsh(struct sk_buff *skb, struct sw_flow_key *key)
- static int push_nsh(struct sk_buff *skb, struct sw_flow_key *key,
- 		     const struct ovs_action_push_nsh *nsh)
- {
-+        struct encap_eth_hdr *encap_eth_header = NULL;
- 
- 	if (nsh->nsh_mdtype == NSH_M_TYPE1) {
- 		if (skb_cow_head(skb, ETH_NSH_TYPE1_HEADER_SIZE) < 0) {
-@@ -285,10 +286,9 @@ static int push_nsh(struct sk_buff *skb, struct sw_flow_key *key,
-                 }
- 
- 		skb_push(skb, ETH_NSH_TYPE1_HEADER_SIZE);
--		OVS_CB(skb)->encap_eth_header = (struct encap_eth_hdr *)skb->data;
--		OVS_CB(skb)->nsh_header = (struct nsh_hdr *)(skb->data + ENCAP_ETH_LEN);
-+		encap_eth_header = (struct encap_eth_hdr *)skb->data;
- 		memcpy(skb->data, nsh->header, ETH_NSH_TYPE1_HEADER_SIZE);
--                OVS_CB(skb)->encap_eth_header->encap_eth_type = htons(ETH_P_NSH);
-+                encap_eth_header->encap_eth_type = htons(ETH_P_NSH);
- 	}
- 	else
- 		return -EINVAL;
-diff --git a/datapath/datapath.h b/datapath/datapath.h
-index a6b2a44..22bbaac 100644
---- a/datapath/datapath.h
-+++ b/datapath/datapath.h
-@@ -108,8 +108,6 @@ struct ovs_skb_cb {
- 	struct vport		*input_vport;
- 	u16			mru;
- 	u32			cutlen;
--	struct nsh_hdr          *nsh_header;
--	struct encap_eth_hdr    *encap_eth_header;
- };
- #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
- 
-diff --git a/datapath/flow.c b/datapath/flow.c
-index 8c4d583..c712517 100644
---- a/datapath/flow.c
-+++ b/datapath/flow.c
-@@ -327,9 +327,7 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
- static int parse_nsh(struct sk_buff *skb, struct sw_flow_key *key){
-         struct nsh_hdr *nsh_hdr = NULL;
- 
--        OVS_CB(skb)->encap_eth_header = (struct encap_eth_hdr *)skb->data;
- 	nsh_hdr = (struct nsh_hdr *)((const char *)skb->data + ENCAP_ETH_LEN);
--	OVS_CB(skb)->nsh_header = nsh_hdr;
- 	memcpy(&key->nsh.encap_eth_dst, skb->data, ENCAP_ETH_LEN);
- 	key->nsh.nsh_mdtype = nsh_hdr->base.mdtype;
- 	if (key->nsh.nsh_mdtype != NSH_M_TYPE1)
--- 
-2.1.0
-
diff --git a/ovs_build/ovs_nsh_patches/v2.6.1/0008-tunnel-set-udp-dst-port-in-tunnel-metadata.patch b/ovs_build/ovs_nsh_patches/v2.6.1/0008-tunnel-set-udp-dst-port-in-tunnel-metadata.patch
deleted file mode 100644
index 2fe0507..0000000
--- a/ovs_build/ovs_nsh_patches/v2.6.1/0008-tunnel-set-udp-dst-port-in-tunnel-metadata.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From add8faa9d4e0b93ea2828d8932ccbc9b740518ae Mon Sep 17 00:00:00 2001
-From: Pravin B Shelar <pshelar@ovn.org>
-Date: Mon, 5 Dec 2016 18:22:11 -0800
-Subject: [PATCH 8/8] tunnel: set udp dst-port in tunnel metadata
-
-VxLan device expect valid tp-dst in tunnel metadata.
-Following patch sets consistent tp-dst with respect to
-the egress tunnel port.
-
-Reported-by: Gerhard Stenzel <gstenzel@linux.vnet.ibm.com>
-Tested-by: Gerhard Stenzel <gstenzel@linux.vnet.ibm.com>
-Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
-Acked-by: Jarno Rajahalme <jarno@ovn.org>
----
- ofproto/tunnel.c      | 1 +
- tests/ofproto-dpif.at | 2 +-
- tests/tunnel.at       | 8 ++++----
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c
-index 9a69071..7277fa0 100644
---- a/ofproto/tunnel.c
-+++ b/ofproto/tunnel.c
-@@ -438,6 +438,7 @@ tnl_port_send(const struct ofport_dpif *ofport, struct flow *flow,
-     flow->pkt_mark |= tnl_port->match.pkt_mark;
-     wc->masks.pkt_mark |= tnl_port->match.pkt_mark;
- 
-+    flow->tunnel.tp_dst = cfg->dst_port;
-     if (!cfg->out_key_flow) {
-         flow->tunnel.tun_id = cfg->out_key;
-     }
-diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
-index a71282c..99db282 100644
---- a/tests/ofproto-dpif.at
-+++ b/tests/ofproto-dpif.at
-@@ -6340,7 +6340,7 @@ AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(src=50:54:00:00:00:
- dnl Make sure flow sample action in datapath is behind set tunnel
- dnl action at egress point of tunnel port.
- AT_CHECK([tail -1 stdout], [0], [dnl
--Datapath actions: set(tunnel(tun_id=0x5,src=2.2.2.2,dst=1.1.1.1,tos=0x1,ttl=64,flags(df|key))),sample(sample=100.0%,actions(userspace(pid=0,flow_sample(probability=65535,collector_set_id=1,obs_domain_id=0,obs_point_id=0,output_port=1),tunnel_out_port=1))),1,set(tunnel(tun_id=0x6,src=2.2.2.3,dst=1.1.1.2,tos=0x1,ttl=64,flags(df|key))),sample(sample=100.0%,actions(userspace(pid=0,flow_sample(probability=65535,collector_set_id=1,obs_domain_id=0,obs_point_id=0,output_port=7471),tunnel_out_port=7471))),7471
-+Datapath actions: set(tunnel(tun_id=0x5,src=2.2.2.2,dst=1.1.1.1,tos=0x1,ttl=64,flags(df|key))),sample(sample=100.0%,actions(userspace(pid=0,flow_sample(probability=65535,collector_set_id=1,obs_domain_id=0,obs_point_id=0,output_port=1),tunnel_out_port=1))),1,set(tunnel(tun_id=0x6,src=2.2.2.3,dst=1.1.1.2,tos=0x1,ttl=64,tp_dst=7471,flags(df|key))),sample(sample=100.0%,actions(userspace(pid=0,flow_sample(probability=65535,collector_set_id=1,obs_domain_id=0,obs_point_id=0,output_port=7471),tunnel_out_port=7471))),7471
- ])
- 
- dnl Remove the flow which contains sample action.
-diff --git a/tests/tunnel.at b/tests/tunnel.at
-index eb429d3..03119bd 100644
---- a/tests/tunnel.at
-+++ b/tests/tunnel.at
-@@ -866,7 +866,7 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
- dnl Option generation
- AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
- AT_CHECK([tail -1 stdout], [0],
--  [Datapath actions: set(tunnel(dst=1.1.1.1,ttl=64,geneve({class=0xffff,type=0,len=4,0xa}{class=0xffff,type=0x1,len=8,0x1234567890abcdef}),flags(df))),6081
-+  [Datapath actions: set(tunnel(dst=1.1.1.1,ttl=64,tp_dst=6081,geneve({class=0xffff,type=0,len=4,0xa}{class=0xffff,type=0x1,len=8,0x1234567890abcdef}),flags(df))),6081
- ])
- 
- dnl Option match
-@@ -955,7 +955,7 @@ Datapath actions: 2
- AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=1,len=0}),flags(df|key)),in_port(6081),skb_mark(0),eth_type(0x0800),ipv4(frag=no)'], [0], [stdout])
- AT_CHECK([tail -2 stdout], [0],
-   [Megaflow: pkt_mark=0,recirc_id=0,ip,tun_id=0,tun_src=1.1.1.1,tun_dst=1.1.1.2,tun_tos=0,tun_flags=+df-csum+key,tun_metadata1,tun_metadata2=NP,in_port=1,nw_ecn=0,nw_frag=no
--Datapath actions: set(tunnel(tun_id=0x0,dst=1.1.1.1,ttl=64,geneve({class=0xffff,type=0x1,len=0}),flags(df|key))),6081
-+Datapath actions: set(tunnel(tun_id=0x0,dst=1.1.1.1,ttl=64,tp_dst=6081,geneve({class=0xffff,type=0x1,len=0}),flags(df|key))),6081
- ])
- 
- OVS_VSWITCHD_STOP
-@@ -976,12 +976,12 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
- 
- AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0,src=1.1.1.1,dst=1.1.1.2,ttl=64),in_port(4789)'], [0], [stdout])
- AT_CHECK([tail -1 stdout], [0],
--  [Datapath actions: set(tunnel(tun_id=0x0,ipv6_dst=2001:cafe::1,ttl=64,flags(df|key))),4789
-+  [Datapath actions: set(tunnel(tun_id=0x0,ipv6_dst=2001:cafe::1,ttl=64,tp_dst=4789,flags(df|key))),4789
- ])
- 
- AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,ipv6_src=2001:cafe::1,ipv6_dst=2001:cafe::2,ttl=64),in_port(4789)'], [0], [stdout])
- AT_CHECK([tail -1 stdout], [0],
--  [Datapath actions: set(tunnel(tun_id=0x0,dst=1.1.1.1,ttl=64,flags(df|key))),4789
-+  [Datapath actions: set(tunnel(tun_id=0x0,dst=1.1.1.1,ttl=64,tp_dst=4789,flags(df|key))),4789
- ])
- 
- 
--- 
-2.1.0
-
diff --git a/pre_build_hook b/pre_build_hook
deleted file mode 100755
index a955678..0000000
--- a/pre_build_hook
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-BUILD_FOR=${BUILD_FOR:-ubuntu}
-BUILD_ARCH="$(dpkg --print-architecture)"
-DIR="$(dirname `readlink -f $0`)"
-
-function build_pkg {
-  case ${BUILD_ARCH} in
-    arm64)
-      sed -i -e "s|FROM ubuntu|FROM aarch64/ubuntu|g" ovs_build/Dockerfile
-      ;;
-  esac
-  case $1 in
-    ubuntu)
-      rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
-
-      cd ${DIR}/ovs_build
-      sudo docker build -t ovs_build .
-
-      DEB_DIR=${DIR}/deb-ovs-dpdk
-
-      rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
-      sudo docker run -v ${DEB_DIR}:/deb -t  ovs_build /ovs_build/build-ovs-nsh.sh
-      cp -r ${DEB_DIR}/*  ${DIR}/repositories/ubuntu/
-      rm -rf ${DEB_DIR}
-
-      ;;
-    *) echo "Not supported system"; exit 1;;
-  esac
-}
-
-for system in $BUILD_FOR
-do
-  build_pkg $system
-done
diff --git a/tasks.yaml b/tasks.yaml
deleted file mode 100644
index fe51488..0000000
--- a/tasks.yaml
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
deleted file mode 100644
index 8e2d9db..0000000
--- a/vagrant/Vagrantfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.box = "bento/ubuntu-16.04"
-
-  config.vm.define "fuel" do | h |
-    h.vm.host_name = "fuel"
-    h.vm.provision :shell, :inline => "/vagrant/build_fuel_plugin.sh", privileged: false
-    h.vm.synced_folder "..", "/fuel-plugin"
-    h.vm.provider :virtualbox do |v|
-      v.customize ["modifyvm", :id, "--memory", 4096]
-      v.customize ["modifyvm", :id, "--cpus", 4]
-      v.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"]
-    end
-  end
-end
diff --git a/vagrant/build_fuel_plugin.sh b/vagrant/build_fuel_plugin.sh
deleted file mode 100755
index ae45a50..0000000
--- a/vagrant/build_fuel_plugin.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-sudo apt-get update -y
-sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev
-sudo gem install fpm
-sudo pip install fuel-plugin-builder
-sudo apt-get install docker.io -y
-cp -r /fuel-plugin /home/vagrant
-cd /home/vagrant/fuel-plugin; fpb --debug --build .
-cp /home/vagrant/fuel-plugin/*.rpm /vagrant