Create a super build for LiAgent (magma#7517)

* Create a superbuild for Li-agent

Move files into a sub directory

Signed-off-by: Amar Padmanabhan <[email protected]>

* Cleanup submakefile for super build

- Include package dependencies from common
- Add dependency on MAGMA_LOGGING package
- Add dependency on mobilityd grpc, which in turns brings in subscriberdb
which brings in apn
- Remove all include directory directives.

Signed-off-by: Amar Padmanabhan <[email protected]>

* Update makefile and deploy script

Update makefile and deploy script

Signed-off-by: Amar Padmanabhan <[email protected]>

* Move test directory

Move test directory to new location under superbuild


Signed-off-by: Amar Padmanabhan <[email protected]>

* Update li_agent tests for new superbuild

Replace include_directory with target_include_directory
Update Makefile target

Testing done:
1/1 Test #1: test_pdu_generator ...............   Passed    0.02 sec

100% tests passed, 0 tests failed out of 1

Signed-off-by: Amar Padmanabhan <[email protected]>

Co-authored-by: Amar Padmanabhan <[email protected]>

Author: amarpad

lte/gateway/Makefile

@@ -184,7 +184,7 @@ build_sctpd: format_sctpd
 build_session_manager: format_session_manager build_common ## Build session manager
 	$(call run_cmake, $(C_BUILD)/session_manager, $(GATEWAY_C_DIR)/session_manager, )
 
-build_li_agent: format_li_agent build_common ## Build li agent
+build_li_agent: format_li_agent ## Build li agent
 	$(call run_cmake, $(C_BUILD)/li_agent, $(GATEWAY_C_DIR)/li_agent, )
 
 build_connection_tracker: format_connection_tracker
@@ -213,6 +213,10 @@ test_sctpd: ## Run all OAI-specific tests
 test_common: build_common ## Run all tests in magma_common
 	$(call run_ctest, $(C_BUILD)/magma_common, $(C_BUILD)/magma_common, $(MAGMA_ROOT)/orc8r/gateway/c/common, )
 
+test_li_agent:
+	$(call run_ctest, $(C_BUILD)/li_agent, $(C_BUILD)/li_agent/src, $(GATEWAY_C_DIR)/li_agent, )
+
+
 # Catch all for c service tests
 # This works with test_dpi and test_session_manager
 test_%: build_common

lte/gateway/c/li_agent/CMakeLists.txt

@@ -9,96 +9,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.0.2)
-
-PROJECT(LIAgent)
-
-include($ENV{MAGMA_ROOT}/orc8r/gateway/c/common/CMakeProtoMacros.txt)
-
-if (BUILD_TESTS)
-  message("Adding code coverage build and linker flags for BUILD_TESTS")
-  set (CMAKE_CXX_FLAGS_DEBUG
-      "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -fprofile-arcs -ftest-coverage")
-  set(CMAKE_LINKER_FLAGS_DEBUG
-      "${CMAKE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
-endif ()
-
-# Add AddressSanitizer (asan) support for debug builds of LiAgentD
-set (CMAKE_CXX_FLAGS_DEBUG
-    "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-set (CMAKE_LINKER_FLAGS_DEBUG
-    "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-# Add LeakSanitizer (lsan) support to the release build of LIAgentD so that
-# we can find memory leaks in production.
-set(CMAKE_C_FLAGS_RELWITHDEBINFO
-   "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fsanitize=leak -fno-omit-frame-pointer")
-set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-   "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -fsanitize=leak")
-
-set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-
-set(MAGMA_LIB_DIR $ENV{C_BUILD}/magma_common)
-add_definitions(-DLOG_WITH_GLOG)
-
-include_directories("${OUTPUT_DIR}")
-include_directories("${MAGMA_ROOT}/orc8r/gateway/c/common/logging")
-
-include_directories(${MAGMA_LIB_DIR}/service303)
-include_directories(${MAGMA_LIB_DIR}/service_registry)
-include_directories(${MAGMA_LIB_DIR}/async_grpc)
-include_directories(${MAGMA_LIB_DIR}/config)
-
-include($ENV{MAGMA_ROOT}/orc8r/gateway/c/common/CMakeProtoMacros.txt)
-# TODO: Temp workaround until packages are imported by these cmakefile
-# Will be removed in subsequent patch
-set(MAGMA_COMMON_INCL_DIR $ENV{C_BUILD}/common)
-include_directories(${MAGMA_COMMON_INCL_DIR})
-
-find_library(SERVICE303_LIB SERVICE303_LIB HINTS ${MAGMA_LIB_DIR}/service303)
-
-# compile the needed macros
-create_proto_dir("lte" LTE_CPP_OUT_DIR)
-
-list(APPEND PROTO_SRCS "")
-list(APPEND PROTO_HDRS "")
-
-message("Proto_srcs are ${PROTO_SRCS}")
-
-set(SMGR_LTE_CPP_PROTOS mconfig/mconfigs)
-generate_cpp_protos("${SMGR_LTE_CPP_PROTOS}" "${PROTO_SRCS}"
-  "${PROTO_HDRS}" ${LTE_PROTO_DIR} ${LTE_CPP_OUT_DIR})
-
-link_directories(
-  ${MAGMA_LIB_DIR}/async_grpc
-  ${MAGMA_LIB_DIR}/config
-  ${MAGMA_LIB_DIR}/service303
-  ${MAGMA_LIB_DIR}/service_registry)
-
-add_library(LI_AGENT
-    Utilities.h
-    Utilities.cpp
-    MobilitydClient.cpp
-    MobilitydClient.h
-    PDUGenerator.cpp
-    PDUGenerator.h
-    InterfaceMonitor.cpp
-    InterfaceMonitor.h
-    ProxyConnector.cpp
-    ProxyConnector.h
-    ${PROTO_SRCS}
-    ${PROTO_HDRS})
-
-target_link_libraries(LI_AGENT
-  SERVICE303_LIB SERVICE_REGISTRY MAGMA_CONFIG ASYNC_GRPC
-  glog gflags folly pthread ${GCOV_LIB} grpc++ grpc yaml-cpp protobuf cpp_redis
-  prometheus-cpp tacopie mnl tins pcap ssl crypto uuid
-  )
-
-add_executable(liagentd ${PROJECT_SOURCE_DIR}/main.cpp)
-
-target_link_libraries (liagentd LI_AGENT)
-
-if (BUILD_TESTS)
-  ENABLE_TESTING()
-  ADD_SUBDIRECTORY(test)
-endif (BUILD_TESTS)
+cmake_minimum_required(VERSION 3.7.2)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+get_cmake_property(vars CACHE_VARIABLES)
+foreach (var ${vars})
+  get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING)
+  # message("${var} = [${${var}}]  --  ${currentHelpString}")
+  if ("${currentHelpString}" MATCHES
+      "No help, variable specified on the command line." OR
+      "${currentHelpString}" STREQUAL "")
+    list(APPEND CL_ARGS "-D${var}=${${var}}")
+  endif ()
+endforeach ()
+
+
+project(MagmaLiAgent)
+
+include(ExternalProject)
+
+ExternalProject_Add(MagmaCommon
+    SOURCE_DIR "$ENV{MAGMA_ROOT}/orc8r/gateway/c/common"
+    BUILD_ALWAYS 1
+    BINARY_DIR "${CMAKE_BINARY_DIR}/common"
+    INSTALL_COMMAND "")
+
+ExternalProject_Add(LiAgent
+    SOURCE_DIR "${CMAKE_SOURCE_DIR}/src"
+    BUILD_ALWAYS 1
+    BINARY_DIR "${CMAKE_BINARY_DIR}/src"
+    INSTALL_COMMAND ""
+    DEPENDS MagmaCommon
+    CMAKE_ARGS ${CL_ARGS})

lte/gateway/c/li_agent/src/CMakeLists.txt

@@ -0,0 +1,89 @@
+# Copyright 2020 The Magma Authors.
+
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+# 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.
+
+cmake_minimum_required(VERSION 3.7.2)
+
+PROJECT(LIAgent)
+
+find_package(SERVICE303_LIB REQUIRED)
+find_package(SERVICE_REGISTRY REQUIRED)
+find_package(MAGMA_CONFIG REQUIRED)
+find_package(ASYNC_GRPC REQUIRED)
+find_package(MAGMA_LOGGING REQUIRED)
+
+include($ENV{MAGMA_ROOT}/orc8r/gateway/c/common/CMakeProtoMacros.txt)
+
+if (BUILD_TESTS)
+  message("Adding code coverage build and linker flags for BUILD_TESTS")
+  set(CMAKE_CXX_FLAGS_DEBUG
+      "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -fprofile-arcs -ftest-coverage")
+  set(CMAKE_LINKER_FLAGS_DEBUG
+      "${CMAKE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+endif ()
+
+# Add AddressSanitizer (asan) support for debug builds of LiAgentD
+set(CMAKE_CXX_FLAGS_DEBUG
+    "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+set(CMAKE_LINKER_FLAGS_DEBUG
+    "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+# Add LeakSanitizer (lsan) support to the release build of LIAgentD so that
+# we can find memory leaks in production.
+set(CMAKE_C_FLAGS_RELWITHDEBINFO
+    "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fsanitize=leak -fno-omit-frame-pointer")
+set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+    "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -fsanitize=leak")
+
+add_definitions(-DLOG_WITH_GLOG)
+
+# compile the needed macros
+create_proto_dir("lte" LTE_CPP_OUT_DIR)
+list(APPEND PROTO_SRCS "")
+list(APPEND PROTO_HDRS "")
+message("Proto_srcs are ${PROTO_SRCS}")
+set(LI_AGENT_LTE_CPP_PROTOS mconfig/mconfigs mobilityd
+    mobilityd subscriberdb apn)
+set(RPC_LTE_GRPC_PROTOS mobilityd)
+generate_cpp_protos("${LI_AGENT_LTE_CPP_PROTOS}" "${PROTO_SRCS}"
+    "${PROTO_HDRS}" ${LTE_PROTO_DIR} ${LTE_CPP_OUT_DIR})
+generate_grpc_protos("${RPC_LTE_GRPC_PROTOS}" "${PROTO_SRCS}" "${PROTO_HDRS}"
+    ${LTE_PROTO_DIR} ${LTE_CPP_OUT_DIR})
+
+add_library(LI_AGENT
+    Utilities.h
+    Utilities.cpp
+    MobilitydClient.cpp
+    MobilitydClient.h
+    PDUGenerator.cpp
+    PDUGenerator.h
+    InterfaceMonitor.cpp
+    InterfaceMonitor.h
+    ProxyConnector.cpp
+    ProxyConnector.h
+    ${PROTO_SRCS}
+    ${PROTO_HDRS})
+
+target_link_libraries(LI_AGENT
+    SERVICE303_LIB SERVICE_REGISTRY MAGMA_CONFIG ASYNC_GRPC MAGMA_LOGGING
+    glog gflags folly pthread ${GCOV_LIB} grpc++ grpc yaml-cpp protobuf cpp_redis
+    prometheus-cpp tacopie mnl tins pcap ssl crypto uuid
+    )
+
+target_include_directories(LI_AGENT PUBLIC
+    $<TARGET_FILE_DIR:LI_AGENT>)
+
+add_executable(liagentd main.cpp)
+
+target_link_libraries(liagentd LI_AGENT)
+
+if (BUILD_TESTS)
+  ENABLE_TESTING()
+  ADD_SUBDIRECTORY(test)
+endif (BUILD_TESTS)

lte/gateway/c/li_agent/InterfaceMonitor.cpp renamed to lte/gateway/c/li_agent/src/InterfaceMonitor.cpp

@@ -13,9 +13,6 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-
-include_directories("${PROJECT_SOURCE_DIR}")
 include_directories("/usr/src/googletest/googlemock/include/")
 
 add_library(LIAGENTD_TEST_LIB
@@ -24,7 +21,10 @@ add_library(LIAGENTD_TEST_LIB
     )
 
 link_directories(/usr/src/googletest/googlemock/lib/)
-target_link_libraries(LIAGENTD_TEST_LIB LI_AGENT gmock_main gtest gtest_main gmock rt)
+target_link_libraries(LIAGENTD_TEST_LIB LI_AGENT gmock_main gtest gtest_main
+    gmock rt)
+target_include_directories(LIAGENTD_TEST_LIB PUBLIC
+    ${PROJECT_SOURCE_DIR})
 
 foreach (li_agent_test pdu_generator)
   add_executable(${li_agent_test}_test test_${li_agent_test}.cpp)

lte/gateway/c/li_agent/InterfaceMonitor.h renamed to lte/gateway/c/li_agent/src/InterfaceMonitor.h

@@ -142,7 +142,7 @@
   when: full_provision
 
 - name: Create symlink for li agent binary
-  file: src='{{ c_build }}/li_agent/liagentd' path=/usr/local/bin/liagentd state=link force=yes follow=no
+  file: src='{{ c_build }}/li_agent/src/liagentd' path=/usr/local/bin/liagentd state=link force=yes follow=no
   when: full_provision
 
 - name: Create symlink for corefile collection script

lte/gateway/c/li_agent/MobilitydClient.cpp renamed to lte/gateway/c/li_agent/src/MobilitydClient.cpp

@@ -266,7 +266,7 @@ fi
 cd "${MAGMA_ROOT}/lte/gateway"
 OAI_BUILD="${C_BUILD}/core/oai"
 SESSIOND_BUILD="${C_BUILD}/session_manager"
-CONNECTIOND_BUILD="${C_BUILD}/connection_tracker"
+CONNECTIOND_BUILD="${C_BUILD}/connection_tracker/src"
 SCTPD_BUILD="${C_BUILD}/sctpd/src"
 
 make build_oai BUILD_TYPE="${BUILD_TYPE}"