Update cicn-plugin for vpp v17.04 (from v17.01)Vpp-plugin-v17.04

1. Changes for cicn-plugin to build under v17.04:
   - update build files to v17.04, including
     - no longer need/want plugin to include dpdk headers (though
       still link in dpdk plugin)
     - vpp include changes
       - relocation of vpe.api.h
       - relocation of pneum.h
   - for modprobe, replace igb_uio with uio_pci_generic
   - vnet/ip/udp.h => vnet/udp/udp.h
   - update cicn vpp plugin registration per vpp changes
     - use new VLIB_PLUGIN_REGISTER() macro
     - delete no-loger-supported vlib_plugin_register() function,
       moving contents of latter to cicn_init
     - remove sm->ethernet_main, which was not used and is no longer part of
       plugin boilerplate.
   - cicn_api_test_plugin.so (plugin for vpp_api_test)
     - update per 17.04 updated requirements:
	 vat_api_hookup => cicn_vat_api_hookup
   - buffering/cloning changes needed for building
     - CICN_FEATURE_VPP_VLIB_CLONING hard-coded enabled and removed,
     - CICN_FEATURE_DPDK_RTEMBUF_CLONING removed
   - Small indentation updates from vpp checkstyle.sh
2. Updates for new vlib_buffer_attach_clone() API now exported by vpp
   - remove code to manage rte_mbuf: cicn plugin now longer depends
     on dpdk being present.
   - remove use of indirect header for cloned cs entry: new scheme
     supports having hdr buffer point directly to shared buffer rather
     that requiring hdr buffer to poitn to indirect header that
     points to cs buffer
   - cicn_rte_mbuf_inlines.h replaced by much smaller cicn_infra_inlines.h
   - report new characteristic of whether cloning replication is enabled
   - "cicn show internal" (dbg cli),  "cicn_api_node_params_get"
     (vpp_api_test)
      - update output accordingly
      - cicn_show: other tweaks to output
3. In node.c, in code for dropping possibly multiple buffers
   - delete ifdef'd-out code block for dropping using the drop node
     [this codepath possibly had buffer problems.]
   - retain code that instead drops by freeing buffers directly.
     [this codepath has been robust with respect to buffer management]

Change-Id: I6e3d18153f52d8b94773332a39cc452873589baf
Signed-off-by: Jim Gibson <gibson+fdio@cisco.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/cicn-plugin/CMakeLists.txt b/cicn-plugin/CMakeLists.txt
index 90a55575..c9ac3c12 100755
--- a/cicn-plugin/CMakeLists.txt
+++ b/cicn-plugin/CMakeLists.txt
@@ -18,7 +18,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 # Dependencies
 
 find_package(Vpp REQUIRED)
-find_package(VppDpdk REQUIRED)
 
 set(CICN_PLUGIN_SOURCE_FILES
     cicn/cicn.c
@@ -41,7 +40,6 @@ set(CICN_PLUGIN_HEADER_FILES
     cicn/cicn_mgmt.h
     cicn/cicn_params.h
     cicn/cicn_pcs.h
-    cicn/cicn_rte_mbuf_inlines.h
     cicn/cicn_std.h
     cicn/cicn_api.h
     cicn/cicn_face.h
@@ -50,7 +48,6 @@ set(CICN_PLUGIN_HEADER_FILES
     cicn/cicn_infra.h
     cicn/cicn_msg_enum.h
     cicn/cicn_parser.h
-    cicn/cicn_rte_mbuf.h
     cicn/cicn_siphash.h
     cicn/cicn_types.h)
 
@@ -82,7 +79,6 @@ include_directories(SYSTEM)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(./)
 include_directories(cicn/test)
-include_directories(${VPP_DPDK_INCLUDE_DIRS})
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -march=native -O3")
 add_library(cicn_api_test_plugin SHARED
@@ -90,7 +86,7 @@ add_library(cicn_api_test_plugin SHARED
         ${CICN_API_TEST_HEADER_FILES}
         ${CMAKE_CURRENT_BINARY_DIR}/cicn/cicn.api.h)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDPDK=1 -DCICN_VPP_PLUGIN=1")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCICN_VPP_PLUGIN=1")
 add_library(cicn_plugin SHARED
         ${CICN_PLUGIN_SOURCE_FILES}
         ${CICN_PLUGIN_HEADER_FILES}
@@ -145,13 +141,13 @@ if (DEB_PACKAGE)
     SET(TYPE "DEBIAN")
     SET(GENERATOR "DEB")
     SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}")
-    SET(CPACK_${TYPE}_PACKAGE_DEPENDS "vpp (= 17.01), vpp-lib (= 17.01), vpp-dpdk-dkms (= 17.01)")
+    SET(CPACK_${TYPE}_PACKAGE_DEPENDS "vpp (>> 17.01), vpp-lib (>> 17.01)")
 elseif (RPM_PACKAGE)
     SET(TYPE "RPM")
     SET(GENERATOR "RPM")
     SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}")
     SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
-    SET(CPACK_${TYPE}_PACKAGE_REQUIRES "vpp = 17.01, vpp-dpdk-devel = 17.01")
+    SET(CPACK_${TYPE}_PACKAGE_REQUIRES "vpp > 17.01, vpp-lib > 17.01")
 else ()
     RETURN()
 endif ()