diff options
author | Luca Muscariello <lumuscar@cisco.com> | 2022-03-30 22:29:28 +0200 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2022-03-31 19:51:47 +0200 |
commit | c46e5df56b67bb8ea7a068d39324c640084ead2b (patch) | |
tree | eddeb17785938e09bc42eec98ee09b8a28846de6 /cmake/Modules/Packager.cmake | |
parent | 18fa668f25d3cc5463417ce7df6637e31578e898 (diff) |
feat: boostrap hicn 22.02
The current patch provides several new features, improvements,
bug fixes and also complete rewrite of entire components.
- lib
The hicn packet parser has been improved with a new packet
format fully based on UDP. The TCP header is still temporarily
supported but the UDP header will replace completely the new hicn
packet format. Improvements have been made to make sure every
packet parsing operation is made via this library. The current
new header can be used as header between the payload and the
UDP header or as trailer in the UDP surplus area to be tested
when UDP options will start to be used.
- hicn-light
The portable packet forwarder has been completely rewritten from
scratch with the twofold objective to improve performance and
code size but also to drop dependencies such as libparc which is
now removed by the current implementation.
- hicn control
the control library is the agent that is used to program the
packet forwarders via their binary API. This component has
benefited from significant improvements in terms of interaction
model which is now event driven and more robust to failures.
- VPP plugin has been updated to support VPP 22.02
- transport
Major improvement have been made to the RTC protocol, to the
support of IO modules and to the security sub system. Signed
manifests are the default data authenticity and integrity framework.
Confidentiality can be enabled by sharing the encryption key to the
prod/cons layer. The library has been tested with group key based
applications such as broadcast/multicast and real-time on-line
meetings with trusted server keys or MLS.
- testing
Unit testing has been introduced using GoogleTest. One third of
the code base is covered by unit testing with priority on
critical features. Functional testing has also been introduce
using Docker, linux bridging and Robot Framework to define
test with Less Code techniques to facilitate the extension
of the coverage.
Co-authored-by: Mauro Sardara <msardara@cisco.com>
Co-authored-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Co-authored-by: Michele Papalini <micpapal@cisco.com>
Co-authored-by: Angelo Mantellini <manangel@cisco.com>
Co-authored-by: Jacques Samain <jsamain@cisco.com>
Co-authored-by: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Enrico Loparco <eloparco@cisco.com>
Co-authored-by: Giulio Grassi <gigrassi@cisco.com>
Change-Id: I75d0ef70f86d921e3ef503c99271216ff583c215
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'cmake/Modules/Packager.cmake')
-rw-r--r-- | cmake/Modules/Packager.cmake | 344 |
1 files changed, 0 insertions, 344 deletions
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake deleted file mode 100644 index 105952662..000000000 --- a/cmake/Modules/Packager.cmake +++ /dev/null @@ -1,344 +0,0 @@ -# Copyright (c) 2017-2019 Cisco and/or its affiliates. -# 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. - -############# -# RPM/DEB/TGZ Packaging utils -# - -set(CONTACT "hicn-dev@lists.fd.io" CACHE STRING "Contact") -set(PACKAGE_MAINTAINER "ICN Team" CACHE STRING "Maintainer") -set(PACKAGE_VENDOR "fd.io" CACHE STRING "Vendor") - -function(get_next_version VERSION NEXT_VERSION) - string(REGEX REPLACE "([0-9]+).([0-9]+)" "\\1;\\2" VER_NUMBERS ${VERSION}) - - # Increment version for getting next version value - list(GET VER_NUMBERS 0 major) - list(GET VER_NUMBERS 1 minor) - - math(EXPR minor "${minor} + 4") - - if (minor GREATER 12) - math(EXPR minor "${minor} % 12") - math(EXPR major "${major} + 1") - endif() - - if (minor LESS 10) - set(minor "0${minor}") - endif() - - set(${NEXT_VERSION} "${major}.${minor}" PARENT_SCOPE) -endfunction() - -macro(extract_version) - # Extract version from git - execute_process( - COMMAND git describe --long --match v* - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - OUTPUT_VARIABLE VER - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - if (NOT VER) - set(VER "v1.2-0-gcafe") - endif() - message(STATUS "Git describe output: ${VER}") - - string(REGEX REPLACE "v([0-9]+).([0-9]+)-?(.*)?-([0-9]+)-(g[0-9a-f]+)" "\\1;\\2;\\3;\\4;\\5;" VER ${VER}) - list(GET VER 0 VERSION_MAJOR) - list(GET VER 1 VERSION_MINOR) - list(GET VER 2 RELEASE_CANDIDATE) - list(GET VER 3 VERSION_REVISION) - list(GET VER 4 COMMIT_NAME) -endmacro(extract_version) - -function(make_packages) - if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - # parse /etc/os-release - file(READ "/etc/os-release" os_version) - string(REPLACE "\n" ";" os_version ${os_version}) - foreach(_ver ${os_version}) - string(REPLACE "=" ";" _ver ${_ver}) - list(GET _ver 0 _name) - list(GET _ver 1 _value) - set(OS_${_name} ${_value}) - endforeach() - - extract_version() - - message(STATUS "Version major: ${VERSION_MAJOR}") - message(STATUS "Version minor: ${VERSION_MINOR}") - message(STATUS "Release: ${RELEASE_CANDIDATE}") - message(STATUS "Revision: ${VERSION_REVISION}") - message(STATUS "Commit hash: ${COMMIT_NAME}") - - set(tag "${VERSION_MAJOR}.${VERSION_MINOR}") - string(REPLACE "-" "~" tag ${tag}) - set(commit_num ${VERSION_REVISION}) - set(commit_name ${COMMIT_NAME}) - - if (NOT DEFINED ENV{BUILD_NUMBER}) - set(bld "b1") - else() - set(bld "b$ENV{BUILD_NUMBER}") - endif() - message(STATUS "Build number is: ${bld}") - - #define DEB and RPM version numbers - if(NOT RELEASE_CANDIDATE) - if (commit_num) - set(deb_ver "${tag}.${commit_num}-release") - set(rpm_ver "${tag}.${commit_num}") - else() - set(deb_ver "${tag}-release") - set(rpm_ver "${tag}") - endif() - set(rpm_release "release") - else() - # TODO To be changed for next release with - # set(deb_ver "${tag}${RELEASE_CANDIDATE}~${commit_num}") - # set(rpm_ver "${tag}") - # set(rpm_release "${RELEASE_CANDIDATE}~${commit_num}") - set(deb_ver "${tag}-${commit_num}") - set(rpm_ver "${tag}-${commit_num}") - set(rpm_release "1") - endif() - - message(STATUS "Version: ${deb_ver}") - - get_next_version(${tag} next_version) - message(STATUS "Next version: ${next_version}") - - get_cmake_property(components COMPONENTS) - list(REMOVE_ITEM components "Unspecified") - set(CPACK_COMPONENTS_ALL ${components}) - - list(LENGTH components N_COMPONENTS) - - if (NOT N_COMPONENTS) - return() - endif() - - if(OS_ID MATCHES "debian" OR OS_ID_LIKE MATCHES "debian") - set(CPACK_GENERATOR "DEB") - set(type "DEBIAN") - - execute_process( - COMMAND dpkg --print-architecture - OUTPUT_VARIABLE arch - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - set(CPACK_${type}_PACKAGE_VERSION "${deb_ver}") - foreach(lc ${components}) - if (${lc} MATCHES ".*Unspecified.*") - continue() - endif() - - string(TOUPPER ${lc} uc) - set(CPACK_${type}_${uc}_FILE_NAME "${lc}_${deb_ver}_${arch}.deb") - - set(DEB_DEPS) - if (NOT ${${lc}_DEB_DEPENDENCIES} STREQUAL "") - string(REPLACE "stable_version" ${tag} DEB_DEPS ${${lc}_DEB_DEPENDENCIES}) - string(REPLACE "next_version" ${next_version} DEB_DEPS ${DEB_DEPS}) - endif() - - set(CPACK_${type}_${uc}_PACKAGE_DEPENDS "${DEB_DEPS}") - set(CPACK_${type}_${uc}_PACKAGE_NAME "${lc}") - set(CPACK_COMPONENT_${uc}_DESCRIPTION "${${lc}_DESCRIPTION}") - - if (${lc}_DEB_PACKAGE_CONTROL_EXTRA) - set(CPACK_DEBIAN_${uc}_PACKAGE_CONTROL_EXTRA "${${lc}_DEB_PACKAGE_CONTROL_EXTRA}") - endif() - endforeach() - elseif(OS_ID_LIKE MATCHES "rhel") - set(CPACK_GENERATOR "RPM") - set(type "RPM") - - execute_process( - COMMAND uname -m - OUTPUT_VARIABLE arch - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - set(CPACK_${type}_PACKAGE_VERSION "${rpm_ver}") - set(CPACK_${type}_PACKAGE_RELEASE "${rpm_release}") - foreach(lc ${components}) - if (${lc} MATCHES ".*Unspecified.*") - continue() - endif() - - string(TOUPPER ${lc} uc) - set(CPACK_${type}_${uc}_DESCRIPTION "${${lc}_DESCRIPTION}") - - set(RPM_DEPS) - if (NOT ${${lc}_RPM_DEPENDENCIES} STREQUAL "") - string(REPLACE "stable_version" ${tag} RPM_DEPS ${${lc}_RPM_DEPENDENCIES}) - string(REPLACE "next_version" ${next_version} RPM_DEPS ${RPM_DEPS}) - endif() - - set(CPACK_${type}_${uc}_PACKAGE_REQUIRES "${RPM_DEPS}") - - if(${lc} MATCHES ".*-dev") - set(package_name ${lc}el) - else() - set(package_name ${lc}) - endif() - - set(CPACK_RPM_${uc}_PACKAGE_NAME "${package_name}") - set(CPACK_${type}_${uc}_FILE_NAME "${package_name}-${rpm_ver}-${rpm_release}.${arch}.rpm") - - if (NOT ${${lc}_RPM_POST_INSTALL_SCRIPT_FILE} STREQUAL "") - set(CPACK_RPM_${uc}_POST_INSTALL_SCRIPT_FILE "${${lc}_RPM_POST_INSTALL_SCRIPT_FILE}") - endif() - - if (NOT ${${lc}_RPM_POST_UNINSTALL_SCRIPT_FILE} STREQUAL "") - set(CPACK_RPM_${uc}_POST_UNINSTALL_SCRIPT_FILE "${${lc}_RPM_POST_UNINSTALL_SCRIPT_FILE}") - endif() - - if (NOT ${${lc}_RPM_PRE_UNINSTALL_SCRIPT_FILE} STREQUAL "") - set(CPACK_RPM_${uc}_PRE_UNINSTALL_SCRIPT_FILE "${${lc}_RPM_PRE_UNINSTALL_SCRIPT_FILE}") - endif() - endforeach() - endif() - - if(CPACK_GENERATOR) - set(CPACK_PACKAGE_NAME ${ARG_NAME}) - set(CPACK_STRIP_FILES OFF) - set(CPACK_PACKAGE_VENDOR "${PACKAGE_VENDOR}") - set(CPACK_COMPONENTS_IGNORE_GROUPS 1) - set(CPACK_${CPACK_GENERATOR}_COMPONENT_INSTALL ON) - set(CPACK_${type}_PACKAGE_MAINTAINER "HICN Team") - set(CPACK_PACKAGE_CONTACT ${CONTACT}) - include(CPack) - endif() - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_SKIP_BUILD_RPATH FALSE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set(CMAKE_INSTALL_RPATH /opt/hicn) - - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - set(CPACK_SET_DESTDIR true) - - set(CMAKE_INSTALL_RPATH "\${CPACK_INSTALL_PREFIX}") - set(CMAKE_SKIP_INSTALL_RPATH FALSE) - set(HICN_DEPENDECIES_INSTALLER "${LIBTRANSPORT_LIBRARIES_LIST};${FACEMGR_LIBRARY_LIST};${APPS_LIBRARY_LIST}") - separate_arguments(HICN_DEPENDECIES_INSTALLER) - foreach (HICN_DEPENDECY ${HICN_DEPENDECIES_INSTALLER}) - get_filename_component(DEPENDENCY_NAME "${HICN_DEPENDECY}" NAME) - get_filename_component(DEPENDENCY "${HICN_DEPENDECY}" REALPATH) - get_filename_component(DEPENDENCY_PATH "${DEPENDENCY}" DIRECTORY) - install(FILES ${DEPENDENCY} DESTINATION lib COMPONENT dependencies) - endforeach() - set(CPACK_PACKAGE_NAME "hicn") - extract_version() - set(CPACK_PACKAGE_VENDOR "${PACKAGE_VENDOR}") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "hICN") - set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") - set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") - set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") - set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_REVISION}") - set(CPACK_PACKAGE_INSTALL_DIRECTORY "hICN Components") - - set(CPACK_COMPONENTS_ALL dependencies ${HICN_UTILS} ${HICN_LIGHT} ${HICN_APPS} ${FACEMGR} lib${LIBTRANSPORT} ${LIBTRANSPORT}-dev lib${LIBHICN} ${LIBHICN}-dev ${HICN_UTILS}-dev ${HICN_LIGHT}-dev ${HICN_APPS}-dev ${FACEMGR}-dev) - set(CPACK_COMPONENT_DEPENDENCIES_DISPLAY_NAME "Dependencies") - if (NOT "${HICN_UTILS}" STREQUAL "") - string(TOUPPER ${HICN_UTILS} HICN_UTILS_UPPERCASE) - string(TOUPPER ${HICN_UTILS}-dev HICN_UTILS_DEV_UPPERCASE) - set(CPACK_COMPONENT_${HICN_UTILS_UPPERCASE}_DISPLAY_NAME "hICN utils") - set(CPACK_COMPONENT_${HICN_UTILS_DEV_UPPERCASE}_DISPLAY_NAME "hicn utils headers") - set(CPACK_COMPONENT_${HICN_UTILS_UPPERCASE}_GROUP "Executables") - set(CPACK_COMPONENT_${HICN_UTILS_DEV_UPPERCASE}_GROUP "Headers") - set(CPACK_COMPONENT_${HICN_UTILS_UPPERCASE}_INSTALL_TYPES Full) - set(CPACK_COMPONENT_${HICN_UTILS_DEV_UPPERCASE}_INSTALL_TYPES Full) - endif () - - if (NOT "${HICN_LIGHT}" STREQUAL "") - string(TOUPPER ${HICN_LIGHT} HICN_LIGHT_UPPERCASE) - string(TOUPPER ${HICN_LIGHT}-dev HICN_LIGHT_DEV_UPPERCASE) - set(CPACK_COMPONENT_${HICN_LIGHT_UPPERCASE}_DISPLAY_NAME "hICN light apps") - set(CPACK_COMPONENT_${HICN_LIGHT_DEV_UPPERCASE}_DISPLAY_NAME "hicn-light headers") - set(CPACK_COMPONENT_${HICN_LIGHT_UPPERCASE}_GROUP "Executables") - set(CPACK_COMPONENT_${HICN_LIGHT_DEV_UPPERCASE}_GROUP "Headers") - set(CPACK_COMPONENT_${HICN_LIGHT_UPPERCASE}_INSTALL_TYPES Full) - set(CPACK_COMPONENT_${HICN_LIGHT_DEV_UPPERCASE}_INSTALL_TYPES Full) - endif () - - if (NOT "${HICN_APPS}" STREQUAL "") - string(TOUPPER ${HICN_APPS} HICN_APPS_UPPERCASE) - string(TOUPPER ${HICN_APPS}-dev HICN_APPS_DEV_UPPERCASE) - set(CPACK_COMPONENT_${HICN_APPS_UPPERCASE}_DISPLAY_NAME "hICN apps") - set(CPACK_COMPONENT_${HICN_APPS_DEV_UPPERCASE}_DISPLAY_NAME "hicn-apps headers") - set(CPACK_COMPONENT_${HICN_APPS_UPPERCASE}_GROUP "Executables") - set(CPACK_COMPONENT_${HICN_APPS_DEV_UPPERCASE}_GROUP "Headers") - set(CPACK_COMPONENT_${HICN_APPS_UPPERCASE}_INSTALL_TYPES Full) - set(CPACK_COMPONENT_${HICN_APPS_DEV_UPPERCASE}_INSTALL_TYPES Full) - endif () - - if (NOT "${FACEMGR}" STREQUAL "") - string(TOUPPER ${FACEMGR} FACEMGR_UPPERCASE) - string(TOUPPER ${FACEMGR}-dev FACEMGR_DEV_UPPERCASE) - set(CPACK_COMPONENT_${FACEMGR_UPPERCASE}_DISPLAY_NAME "facemgr") - set(CPACK_COMPONENT_${FACEMGR_DEV_UPPERCASE}_DISPLAY_NAME "facemgr headers") - set(CPACK_COMPONENT_${FACEMGR_UPPERCASE}_GROUP "Executables") - set(CPACK_COMPONENT_${FACEMGR_DEV_UPPERCASE}_GROUP "Headers") - set(CPACK_COMPONENT_${FACEMGR_UPPERCASE}_INSTALL_TYPES Full) - set(CPACK_COMPONENT_${FACEMGR_DEV_UPPERCASE}_INSTALL_TYPES Full) - endif () - - if (NOT "${LIBTRANSPORT}" STREQUAL "") - string(TOUPPER lib${LIBTRANSPORT} LIBTRANSPORT_UPPERCASE) - string(TOUPPER ${LIBTRANSPORT}-dev LIBTRANSPORT_DEV_UPPERCASE) - set(CPACK_COMPONENT_${LIBTRANSPORT_UPPERCASE}_DISPLAY_NAME "libtransport libs") - set(CPACK_COMPONENT_${LIBTRANSPORT_DEV_UPPERCASE}_DISPLAY_NAME "libtransport headers") - set(CPACK_COMPONENT_${LIBTRANSPORT_UPPERCASE}_GROUP "Libraries") - set(CPACK_COMPONENT_${LIBTRANSPORT_DEV_UPPERCASE}_GROUP "Headers") - set(CPACK_COMPONENT_${LIBTRANSPORT_UPPERCASE}_INSTALL_TYPES Full) - set(CPACK_COMPONENT_${LIBTRANSPORT_DEV_UPPERCASE}_INSTALL_TYPES Full) - endif () - - if (NOT "${LIBHICN}" STREQUAL "") - string(TOUPPER lib${LIBHICN} LIBHICN_UPPERCASE) - string(TOUPPER ${LIBHICN}-dev LIBHICN_DEV_UPPERCASE) - set(CPACK_COMPONENT_${LIBHICN_UPPERCASE}_DISPLAY_NAME "hicn libs") - set(CPACK_COMPONENT_${LIBHICN_DEV_UPPERCASE}_DISPLAY_NAME "hicn headers") - set(CPACK_COMPONENT_${LIBHICN_UPPERCASE}_GROUP "Libraries") - set(CPACK_COMPONENT_${LIBHICN_DEV_UPPERCASE}_GROUP "Headers") - set(CPACK_COMPONENT_${LIBHICN_UPPERCASE}_INSTALL_TYPES Full) - set(CPACK_COMPONENT_${LIBHICN_DEV_UPPERCASE}_INSTALL_TYPES Full) - endif () - - set (CPACK_RESOURCE_FILE_LICENSE - "${PROJECT_SOURCE_DIR}/cmake/Modules/License.txt") - set(CPACK_COMPONENT_DEPENDENCIES_DESCRIPTION - "All dependency libreries") - set(CPACK_COMPONENT_DEPENDENCIES_GROUP "Dependencies") - set(CPACK_COMPONENT_GROUP_DEVELOPMENT_EXPANDED ON) - set(CPACK_COMPONENT_GROUP_DEPENDENCIES_DESCRIPTION - "All dependency libreries") - set(CPACK_ALL_INSTALL_TYPES Full Developer) - set(CPACK_INSTALL_TYPE_FULL_DISPLAY_NAME "Everything") - if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_INSTALL_RPATH /opt/hicn) - - set(CPACK_INSTALL_PREFIX "/opt/hicn") - set(CPACK_GENERATOR productbuild) - set( CPACK_PRE_BUILD_SCRIPTS "${PROJECT_SOURCE_DIR}/cmake/Modules/PostInstall.cmake") - else() - set(CPACK_INSTALL_PREFIX "c:/Program Files/hicn") - endif() - include(CPack) - endif() -endfunction() |