11190 spgw ue context ht

.bazelrc

@@ -5,11 +5,18 @@ startup --host_jvm_args="-Xmx8g"
 build --announce_rc
 build --color=yes
 
-build:production --config=lsan --strip=never --copt=-O3
+build:production --config=lsan --copt=-O3
 
 # C/C++ CONFIGS
 build --cxxopt=-std=c++14
-build --compilation_mode=dbg
+# Create debug information only for magma binaries (not for external dependencies).
+# --compilation_mode=dbg would also create debug information of external dependencies 
+# and increase the size of artifacts drastically.
+# Needs --strip=never so that debug information is not removed by the linker.
+# See https://bazel.build/docs/user-manual#compilation-mode and
+# https://bazel.build/docs/user-manual#strip
+build --strip=never
+build --per_file_copt=^lte/gateway/c/.*$@-g
 
 # DEFAULT TEST CONFIGURATION
 # Please read the GH issue #13073 before adding "test" options.
@@ -57,6 +64,9 @@ build --test_env=PATH=/bin:/usr/bin:/usr/local/bin:/usr/sbin
 build --test_env=MAGMA_ROOT
 build --test_env=S1AP_TESTER_ROOT
 
+# Needed for go tests to generate the test result XML in the correct format  
+build --test_env=GO_TEST_WRAP_TESTV=1
+
 # MME specific compile time defines
 # Compile mme libraries with unit test flag
 test --per_file_copt=^lte/gateway/c/core/.*$@-DMME_UNIT_TEST  # See GH issue #13073

.devcontainer/Dockerfile

@@ -3,7 +3,6 @@
 ################################################################
 FROM ghcr.io/magma/magma/bazel-base:latest as devcontainer
 
-ARG HOME=/home/vscode
 # [Option] Install zsh
 ARG INSTALL_ZSH="true"
 # [Option] Upgrade OS packages to their latest versions
@@ -53,14 +52,15 @@ RUN echo "Install general purpose packages" && \
         gdb \
         lcov \
         libclang-11-dev \
-        lldb \
+        lldb-11 \
         llvm-11-dev \
         make \
         ninja-build \
         openjdk-8-jdk \
         perl \
         pkg-config \
         python3-pip \
+        python3-venv \
         redis-server \
         ruby \
         rubygems \
@@ -82,7 +82,11 @@ RUN GO_TARBALL="go${GOLANG_VERSION}.linux-amd64.tar.gz" \
  && curl https://artifactory.magmacore.org/artifactory/generic/${GO_TARBALL} --remote-name --location \
  && tar -xzf ${GO_TARBALL} \
  && rm ${GO_TARBALL}
-ENV PATH=${PATH}:/usr/local/go/bin:${HOME}/go/bin
+ENV PATH=${PATH}:/usr/local/go/bin
+
+# /home/vscode/go/bin doesn't exist initially, but for example orc8r/cloud/go/Makefile
+# populates that folder and expects those binaries to be in PATH
+ENV PATH=${PATH}:/home/vscode/go/bin
 
 RUN echo "Install 3rd party dependencies" && \
     apt-get update && \
@@ -117,18 +121,18 @@ RUN echo "Install 3rd party dependencies" && \
         grpc-dev
 
 ##### Useful for logfile modification e.g. pruning all /magma/... prefix from GCC warning logs
-RUN GOBIN="/usr/bin/" go install github.com/ezekg/xo@0f7f076932dd
+RUN GOBIN="/usr/bin/" go install github.com/ezekg/xo@0f7f076932dd && \
+    rm --recursive --interactive=never /root/.cache/go-build
 
 ##### GRPC and it's dependencies
 RUN git clone --recurse-submodules -b v1.35.0 https://github.com/grpc/grpc && \
-    cd grpc && \
-    mkdir -p cmake/build && \
-    cd cmake/build && \
+    mkdir -p grpc/cmake/build && \
+    cd grpc/cmake/build && \
     cmake -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON ../.. && \
     make -j"$(nproc)" && \
     make install && \
-    cd / && \
-    rm -rf grpc
+    cd ../../.. && \
+    rm --recursive --interactive=never grpc
 
 ##### libprotobuf-mutator is used for randomized proto unit tests / property tests
 RUN git clone -b v1.0 https://github.com/google/libprotobuf-mutator && \
@@ -137,8 +141,8 @@ RUN git clone -b v1.0 https://github.com/google/libprotobuf-mutator && \
     cmake .. -GNinja -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug && \
     ninja && \
     ninja install && \
-    cd / && \
-    rm -rf libprotobuf-mutator
+    cd ../.. && \
+    rm --recursive --interactive=never libprotobuf-mutator
 
 ##### Prometheus CPP
 RUN git clone https://github.com/jupp0r/prometheus-cpp.git && \
@@ -150,7 +154,8 @@ RUN git clone https://github.com/jupp0r/prometheus-cpp.git && \
     cmake .. && \
     make -j"$(nproc)" && \
     make install && \
-    rm -rf /prometheus-cpp
+    cd ../.. && \
+    rm --recursive --interactive=never prometheus-cpp
 
 # install magma dependencies
 RUN apt-get install -y --no-install-recommends \
@@ -169,8 +174,8 @@ RUN git clone https://git.osmocom.org/libgtpnl && \
     make -j"$(nproc)" && \
     make install && \
     ldconfig && \
-    cd / && \
-    rm -rf libgtpnl
+    cd .. && \
+    rm --recursive --interactive=never libgtpnl
 
 ##### Build and install libgtest and gmock
 RUN cd /usr/src/googletest && \
@@ -193,84 +198,14 @@ RUN git clone https://github.com/include-what-you-use/include-what-you-use && \
     cmake -G "Unix Makefiles" -DCMAKE_PREFIX_PATH=/usr/lib/llvm-11 ../include-what-you-use/ && \
     make && \
     make install && \
-    cd / && \
-    rm -rf include-what-you-use && \
-    rm -rf build_liwyu
+    cd .. && \
+    rm --recursive --interactive=never include-what-you-use build_iwyu
 
 ##### Go language server support for vscode
-RUN GOBIN="/usr/bin/" go install -v golang.org/x/tools/[email protected]
+RUN GOBIN="/usr/bin/" go install -v golang.org/x/tools/[email protected] && \
+     rm --recursive --interactive=never /root/.cache/go-build
 
 #### Update shared library configuration
 RUN ldconfig -v
 
-
-##### Install Python requirements
-
-### create virtualenv
-ARG PYTHON_VENV=${HOME}/build/python
-ENV PYTHON_VENV_EXECUTABLE=${PYTHON_VENV}/bin/python${PYTHON_VERSION}
-# PYTHON_VENV must by in sync with "python.defaultInterpreterPath", "python.analysis.extraPaths" and magtivate path in "postCreateCommand" in .devcontainer/devcontainer.json
-
-RUN virtualenv --system-site-packages --python=/usr/bin/python${PYTHON_VERSION} ${PYTHON_VENV}
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --quiet --upgrade --no-cache-dir "setuptools==49.6.0"
-
-### install eggs (lte, orc8r)
-COPY /lte/gateway/python/ ${MAGMA_ROOT}/lte/gateway/python/
-WORKDIR ${MAGMA_ROOT}/lte/gateway/python/
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --quiet --upgrade --no-build-isolation --no-cache-dir --verbose --editable .[dev] && \
-    rm -rf lte.egg-info
-
-COPY /orc8r/gateway/python/ ${MAGMA_ROOT}/orc8r/gateway/python/
-WORKDIR ${MAGMA_ROOT}/orc8r/gateway/python/
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --quiet --upgrade --no-build-isolation --no-cache-dir --verbose --editable .[dev] && \
-    rm -rf orc8r.egg-info
-
-### install formatter autopep8
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --no-cache-dir autopep8
-
-#### protos
-ARG GEN_DIR=lib/python${PYTHON_VERSION}/gen
-
-COPY /protos/ ${MAGMA_ROOT}/protos/
-COPY /lte/protos/ ${MAGMA_ROOT}/lte/protos/
-COPY /orc8r/protos/ ${MAGMA_ROOT}/orc8r/protos/
-COPY /feg/protos/ ${MAGMA_ROOT}/feg/protos/
-COPY /dp/protos/ ${MAGMA_ROOT}/dp/protos/
-WORKDIR ${MAGMA_ROOT}
-RUN ${PYTHON_VENV_EXECUTABLE} -m pip install --no-cache-dir "mypy-protobuf==2.4" && \
-    mkdir ${PYTHON_VENV}/${GEN_DIR} && \
-    for PROTO_SRC in orc8r lte feg dp; \
-    do \
-    ${PYTHON_VENV_EXECUTABLE} protos/gen_protos.py ${PROTO_SRC}/protos ${MAGMA_ROOT},orc8r/protos/prometheus ${MAGMA_ROOT} ${PYTHON_VENV}/${GEN_DIR} && \
-    ${PYTHON_VENV_EXECUTABLE} protos/gen_prometheus_proto.py ${MAGMA_ROOT} ${PYTHON_VENV}/${GEN_DIR}; \
-    done && \
-    echo "${PYTHON_VENV}/${GEN_DIR}" > ${PYTHON_VENV}/lib/python${PYTHON_VERSION}/site-packages/magma_gen.pth
-
-### swagger
-ENV SWAGGER_CODEGEN_DIR=/var/tmp/codegen
-ENV SWAGGER_CODEGEN_JAR=${SWAGGER_CODEGEN_DIR}/swagger-codegen-cli.jar
-ARG CODEGEN_VERSION=2.2.3
-
-RUN mkdir -p ${SWAGGER_CODEGEN_DIR}; \
-    wget --no-verbose https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${CODEGEN_VERSION}/swagger-codegen-cli-${CODEGEN_VERSION}.jar -O ${SWAGGER_CODEGEN_JAR}
-
-# Copy swagger specs over to the build directory,
-# so that eventd can access them at runtime
-COPY lte/swagger/*.yml ${PYTHON_VENV}/${GEN_DIR}/lte/swagger/specs/
-COPY orc8r/swagger/*.yml ${PYTHON_VENV}/${GEN_DIR}/orc8r/swagger/specs/
-RUN for SWAGGER_SRC in lte orc8r; \
-    do \
-    # Generate the files
-    ls ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/specs/*.yml \
-    | xargs -t -I% /usr/bin/java -jar ${SWAGGER_CODEGEN_JAR} generate \
-    -i % \
-    -o ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger \
-    -l python \
-    -D models && \
-    # Flatten and clean up directory
-    mv ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/swagger_client/* ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/ && \
-    rmdir ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/swagger_client && \
-    rm -r ${PYTHON_VENV}/${GEN_DIR}/${SWAGGER_SRC}/swagger/test; \
-    done
-
 WORKDIR $MAGMA_ROOT

.devcontainer/devcontainer.json

@@ -82,10 +82,9 @@
 		"python.terminal.activateEnvironment": true,
 		"python.analysis.extraPaths": [
 			"${containerWorkspaceFolder}/orc8r/gateway/python/",
-			"${containerWorkspaceFolder}/lte/gateway/python/",
-			"/home/vscode/build/python/lib/python3.8/site-packages" // has to be in sync with $PYTHON_VENV and $PYTHON_VERSION from .devcontainer/Dockerfile
+			"${containerWorkspaceFolder}/lte/gateway/python/"
 		],
-		"python.defaultInterpreterPath": "/home/vscode/build/python/bin/python3.8", // has to be in sync with $PYTHON_VENV and $PYTHON_VERSION from .devcontainer/Dockerfile
+		"python.defaultInterpreterPath": "/home/vscode/python_ide_env/bin/python3",
 		"python.formatting.provider": "autopep8",
 		"python.formatting.autopep8Args": [
 			// This should be the same set of flags as ones specified in `lte/gateway/precommit.py`

.dockerignore

@@ -1,6 +1,5 @@
 *
 !.cache/test_certs
-!fb/config/
 
 !.devcontainer/
 !third_party/
@@ -29,12 +28,6 @@
 !lte/gateway/deploy
 !lte/gateway/docker/deploy
 
-!devmand/cloud/
-!devmand/gateway/
-!devmand/protos/
-
-!fb/src/dpi/
-
 !orc8r/cloud/configs/
 !orc8r/lib/
 !orc8r/cloud/go/