Merge remote-tracking branch 'origin/fhi72-mplane' into integration_2025_w13 (!3216)

FHI72: Management plane support

At the moment, tested with Benetel 550 and 650 RUs FW v1.2.2
- support for multiple RUs
- RPCs implemented: <connect>, <subscribe>, <get>, <supervision-watchdog-reset>,
  <edit-config>, <validate>, <commit>, <disconnect>
- read PTP sync status from operational datastore xml
- get vendor name, and for xran store RU MAC, MTU and IQ bitwidth and PRACH
  offset, and transfer this info
- store interface name, low-level-tx/rx-endpoint names, tx/rx-carrier names,...,
  from operational datastore xml
- add reference gNB/DU config files with M-plane support
- update FHI readme

cmake_targets/build_oai

@@ -99,7 +99,7 @@ Options:
    USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
-   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g, oran_fhlib_5g
+   Selects the transport protocol type, options: None, Ethernet, benetel4g, benetel5g, oran_fhlib_5g, oran_fhlib_5g_mplane
 -P | --phy_simulators
    Makes the unitary tests Layer 1 simulators
 -s | --check
@@ -304,6 +304,10 @@ function main() {
                 TARGET_LIST="$TARGET_LIST $2"
                 CMAKE_CMD="$CMAKE_CMD -DOAI_FHI72=ON"
                 ;;
+              "oran_fhlib_5g_mplane")
+                TARGET_LIST="$TARGET_LIST $2"
+                CMAKE_CMD="$CMAKE_CMD -DOAI_FHI72=ON -DOAI_FHI72_MPLANE=ON"
+                ;;
               "None")
                 ;;
               *)
@@ -504,12 +508,6 @@ function main() {
 	echo_info "Built Doxygen based documentation. The documentation file is located here: $DIR/$BUILD_DIR/build/doc/html/index.html"
     fi
 
-    # TODO: once we got the CMakeLists.txt file done for the ORAN files, remove the following lines
-    if [[ $TARGET_LIST =~ "oran_fhlib_5g" ]]; then
-      rm -f liboai_transpro.so
-      ln -s liboran_fhlib_5g.so liboai_transpro.so
-    fi
-
     if [ "$UE" = 1 ] ; then
 
       echo_info "Compiling UE specific part"

cmake_targets/tools/MODULES/FindLibXml2.cmake

@@ -1,53 +0,0 @@
-# - Try to find the LibXml2 xml processing library
-# Once done this will define
-#
-#  LIBXML2_FOUND - System has LibXml2
-#  LIBXML2_INCLUDE_DIR - The LibXml2 include directory
-#  LIBXML2_LIBRARIES - The libraries needed to use LibXml2
-#  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
-#  LIBXML2_XMLLINT_EXECUTABLE - The XML checking tool xmllint coming with LibXml2
-
-#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
-# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distributed this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
-SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
-
-FIND_PATH(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
-   HINTS
-   ${PC_LIBXML_INCLUDEDIR}
-   ${PC_LIBXML_INCLUDE_DIRS}
-   PATH_SUFFIXES libxml2
-   )
-
-FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
-   HINTS
-   ${PC_LIBXML_LIBDIR}
-   ${PC_LIBXML_LIBRARY_DIRS}
-   )
-
-FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint)
-# for backwards compat. with KDE 4.0.x:
-SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}")
-
-# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE)
-

cmake_targets/tools/MODULES/Findxran.cmake

@@ -75,7 +75,6 @@ endif()
 
 find_path(xran_INCLUDE_DIR
   NAMES
-    xran_common.h
     xran_compression.h
     xran_cp_api.h
     xran_ecpri_owd_measurements.h
@@ -84,7 +83,7 @@ find_path(xran_INCLUDE_DIR
     xran_pkt_up.h
     xran_sync_api.h
   HINTS ${xran_LOCATION}
-  PATH_SUFFIXES api include
+  PATH_SUFFIXES api
   NO_DEFAULT_PATH
 )
 find_library(xran_LIBRARY
@@ -127,16 +126,19 @@ find_package_handle_standard_args(xran
   VERSION_VAR xran_VERSION
 )
 
+# in proper usage of cmake, include directory should only contain "api", but not header files under "src" directory;
+# however, we use xran_dev_get_ctx() and xran_dev_get_ctx_by_id() functions which are defined in xran_common.h;
+# since xran_common.h is under "src" directory, we have to include it in ${xran_INCLUDE_DIRS}
 if(xran_FOUND)
   set(xran_LIBRARIES ${xran_LIBRARY})
-  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR})
+  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR} ${xran_INCLUDE_DIR}/../src)
 endif()
 
 if(xran_FOUND AND NOT TARGET xran::xran)
   add_library(xran::xran UNKNOWN IMPORTED)
   set_target_properties(xran::xran PROPERTIES
     IMPORTED_LOCATION "${xran_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIR}"
+    INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIRS}"
   )
 endif()
 

cmake_targets/tools/build_helper

@@ -546,7 +546,10 @@ check_install_additional_tools (){
         libforms-bin \
         libforms-dev \
         libxft-dev \
-        xmlstarlet"
+        xmlstarlet \
+        libpcre3-dev \
+        libssh-dev \
+        libxml2-dev"
   elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]] ||  [[ "$OS_DISTRO" == "fedora" ]]; then
     PACKAGE_LIST="\
       doxygen \
@@ -556,7 +559,10 @@ check_install_additional_tools (){
       libXft-devel \
       xforms \
       xforms-devel \
-      xmlstarlet"
+      xmlstarlet \
+      pcre-devel \
+      libssh-devel \
+      libxml2-devel"
   fi
     $SUDO $INSTALLER install -y $PACKAGE_LIST $optional_packages
 }