Resolved merge conflicts

Signed-off-by: Rashmi <[email protected]>

Author: rsarwad

.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.

.devcontainer/bazel-base/Dockerfile

@@ -19,7 +19,6 @@ RUN echo "Install general purpose packages" && \
     apt-get install -y --no-install-recommends \
         apt-transport-https \
         apt-utils \
-        # dependencies of FreeDiameter
         bison \
         build-essential \
         ca-certificates \
@@ -29,39 +28,30 @@ RUN echo "Install general purpose packages" && \
         git \
         gnupg2 \
         g++ \
-        # dependency of mobilityd (tests)
-        iproute2 \
-        # dependency of python services (e.g. magmad)
-        iputils-ping \
+        iproute2 `# dependency of mobilityd (tests)` \
+        iputils-ping `# dependency of python services (e.g. magmad)` \
         flex \
         libconfig-dev \
-        # dependency of @sentry_native//:sentry
-        libcurl4-openssl-dev \
-        # dependencies of oai/mme
+        libcurl4-openssl-dev `# dependency of @sentry_native//:sentry` \
         libczmq-dev \
         libgcrypt-dev \
         libgmp3-dev \
         libidn11-dev \
         libsctp1 \
         libsqlite3-dev \
-        # dependency of sctpd
-        libsctp-dev \
+        libsctp-dev `# dependency of sctpd` \
         libssl-dev \
-        # dependency of pip systemd
-        libsystemd-dev \
+        libsystemd-dev `# dependency of pip systemd` \
         lld \
-        # dependency of python services (e.g. magmad)
-        net-tools \
-        # dependency of python services (e.g. pipelined)
-        netbase \
+        net-tools `# dependency of python services (e.g. magmad)` \
+        netbase `# dependency of python services (e.g. pipelined)` \
         python${PYTHON_VERSION} \
         python-is-python3 \
+        python3-distutils `# dependency of bazel pip_parse rule` \
         software-properties-common \
-        # dependency of python services (e.g. magmad)
-        systemd \
+        systemd `# dependency of python services (e.g. magmad)` \
         unzip \
-        # dependency of liagent
-        uuid-dev \
+        uuid-dev `# dependency of liagent` \
         vim \
         wget \
         zip
@@ -82,38 +72,14 @@ RUN apt-get install -y --no-install-recommends \
         libpcap-dev=1.9.1-3 \
         libmnl-dev=1.0.4-2
 
-## Install Fmt (Folly Dep)
-RUN git clone https://github.com/fmtlib/fmt.git && \
-    cd fmt && \
-    mkdir _build && \
-    cd _build && \
-    cmake -DBUILD_SHARED_LIBS=ON -DFMT_TEST=0 .. && \
-    make -j"$(nproc)" && \
-    make install && \
-    cd / && \
-    rm -rf fmt
-
-# Facebook Folly C++ lib
-# Note: "Because folly does not provide any ABI compatibility guarantees from
-#        commit to commit, we generally recommend building folly as a static library."
-# Here we checkout the hash for v2021.02.22.00 (arbitrary recent version)
-RUN git clone --depth 1 --branch v2021.02.15.00 https://github.com/facebook/folly && \
-    cd /folly && \
-    mkdir _build && \
-    cd _build && \
-    cmake -DBUILD_SHARED_LIBS=ON .. && \
-    make -j"$(nproc)" && \
-    make install && \
-    cd / && \
-    rm -rf folly
-
 # setup magma artifactories and install magma dependencies
 RUN wget -qO - https://artifactory.magmacore.org:443/artifactory/api/gpg/key/public | apt-key add - && \
     add-apt-repository 'deb https://artifactory.magmacore.org/artifactory/debian-test focal-ci main' && \
     add-apt-repository 'deb https://artifactory.magmacore.org/artifactory/debian-test focal-1.7.0 main' && \
     apt-get update -y && \
     apt-get install -y --no-install-recommends \
         bcc-tools \
+        libfolly-dev \
         liblfds710 \
         oai-asn1c \
         oai-gnutls \

.github/workflows/backport-pull-request.yml

@@ -33,6 +33,10 @@ jobs:
         )
       )
     steps:
+      - run: |
+          echo '{
+            "prTitle": "{commitMessages} [backport to {targetBranch}]"
+          }' > .backportrc.json
       - name: Backport Action
         uses: sqren/backport-github-action@f54e19901f2a57f8b82360f2490d47ee82ec82c6 # [email protected]
         with:

.github/workflows/bazel.yml

@@ -63,11 +63,10 @@ jobs:
 
   bazel_build_and_test:
     needs: path_filter
-    # Only run workflow if this is a scheduled run on master branch,
-    # if the workflow has been triggered manually or if it is a pull_request
-    # that skip-duplicate-action wants to run again.
+    # Only run workflow if this is a push to the magma repository,
+    # if the workflow has been triggered manually or if it is a pull_request.
     if: |
-      (github.event_name == 'schedule' && github.ref == 'refs/heads/master') ||
+      (github.event_name == 'push' && github.repository_owner == 'magma') ||
       needs.path_filter.outputs.files_changed == 'true' ||
       github.event_name == 'workflow_dispatch'
     strategy:
@@ -163,7 +162,7 @@ jobs:
           echo "Available storage:"
           df -h
       - name: Notify failure to slack
-        if: failure() && (github.event_name == 'push' || github.event_name == 'schedule') && github.repository_owner == 'magma'
+        if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
@@ -219,11 +218,10 @@ jobs:
 
   bazel_package:
     needs: path_filter
-    # Only run workflow if this is a scheduled run on master branch,
-    # if the workflow has been triggered manually or if it is a pull_request
-    # that skip-duplicate-action wants to run again.
+    # Only run workflow if this is a push to the magma repository,
+    # if the workflow has been triggered manually or if it is a pull_request.
     if: |
-      (github.event_name == 'schedule' && github.ref == 'refs/heads/master') ||
+      (github.event_name == 'push' && github.repository_owner == 'magma') ||
       needs.path_filter.outputs.files_changed == 'true' ||
       github.event_name == 'workflow_dispatch'
     name: Bazel Package Job
@@ -266,7 +264,7 @@ jobs:
           echo "Available storage:"
           df -h
       - name: Notify failure to slack
-        if: failure() && (github.event_name == 'push' || github.event_name == 'schedule') && github.repository_owner == 'magma'
+        if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
@@ -288,7 +286,7 @@ jobs:
         run: |
           ./bazel/scripts/check_py_bazel.sh
       - name: Notify failure to slack
-        if: failure() && (github.event_name == 'push' || github.event_name == 'schedule') && github.repository_owner == 'magma'
+        if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}
@@ -310,7 +308,7 @@ jobs:
         run: |
           ./bazel/scripts/check_c_cpp_bazel.sh
       - name: Notify failure to slack
-        if: failure() && (github.event_name == 'push' || github.event_name == 'schedule') && github.repository_owner == 'magma'
+        if: failure() && github.event_name == 'push' && github.repository_owner == 'magma'
         uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 # [email protected]
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_BAZEL_CI }}

.github/workflows/build_all.yml

@@ -140,7 +140,7 @@ jobs:
         run: |
           pip3 install --upgrade pip
           pip3 install ansible fabric3 jsonpickle requests PyYAML
-          vagrant plugin install vagrant-vbguest vagrant-vbguest vagrant-mutate
+          vagrant plugin install vagrant-disksize vagrant-vbguest vagrant-mutate vagrant-reload
       - name: Open up network interfaces for VM
         run: |
           sudo mkdir -p /etc/vbox/

.github/workflows/cloud-workflow.yml

@@ -40,7 +40,14 @@ jobs:
         with:
           filters: |
             filesChanged:
-              - [".github/workflows/cloud-workflow.yml", "lte/protos/**", "cwf/cloud/**", "feg/cloud/**", "lte/cloud/**", "orc8r/**"]
+              - ".github/workflows/cloud-workflow.yml"
+              - "lte/protos/**"
+              - "cwf/cloud/**"
+              - "feg/cloud/**"
+              - "lte/cloud/**"
+              - "orc8r/**"
+              - "dp/cloud/**"
+              - "dp/protos/**"
       - name: Save should_not_skip output
         if: always()
         run: |

.github/workflows/cwf-integ-test.yml

@@ -95,7 +95,7 @@ jobs:
         run: |
           pip3 install --upgrade pip
           pip3 install ansible fabric3 jsonpickle requests PyYAML firebase_admin
-          vagrant plugin install vagrant-vbguest
+          vagrant plugin install vagrant-vbguest vagrant-reload vagrant-disksize
       - uses: actions/download-artifact@f023be2c48cc18debc3bacd34cb396e0295e2869 # pin@v2
         with:
           name: docker-images

.github/workflows/dp-workflow.yml

@@ -31,7 +31,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       cc: ${{ steps.filter.outputs.cc }}
-      am: ${{ steps.filter.outputs.am }}
       rc: ${{ steps.filter.outputs.rc }}
       db: ${{ steps.filter.outputs.db }}
       helm: ${{ steps.filter.outputs.helm }}
@@ -52,14 +51,6 @@ jobs:
               - 'dp/protos/**'
               - 'dp/cloud/go/protos/**'
               - 'dp/cloud/go/active_mode_controller/protos'
-            am:
-              - '.github/workflows/dp-workflow.yml'
-              - 'dp/cloud/go/active_mode_controller/**'
-              - 'dp/cloud/docker/go/active_mode_controller/**'
-              - 'dp/cloud/python/magma/db_service/**'
-              - 'dp/protos/**'
-              - 'dp/cloud/go/protos/**'
-              - 'dp/cloud/go/active_mode_controller/protos'
             rc:
               - '.github/workflows/dp-workflow.yml'
               - 'dp/cloud/python/magma/radio_controller/**'
@@ -139,47 +130,6 @@ jobs:
         with:
           flags: unittests,configuration-controller
           name: codecov-configuration-controller
-          fail_ci_if_error: false
-          verbose: true
-
-  active_mode_controller_unit_tests:
-    needs: path_filter
-    if: ${{ needs.path_filter.outputs.am == 'true' }}
-    name: "Active mode controller unit tests"
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: dp/cloud/go/active_mode_controller
-    env:
-      GO_VERSION: 1.18.3
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # pin@v2
-
-      - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 # pin@v3
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Run Go linter
-        uses: golangci/golangci-lint-action@5c56cd6c9dc07901af25baab6f2b0d9f3b7c3018 # pin@v2
-        with:
-          version: v1.46.2
-          working-directory: dp/cloud/go/active_mode_controller
-          skip-go-installation: true
-
-      - name: Run Go tests
-        run: |
-          go test ./... -v -race -coverprofile=coverage.txt -covermode=atomic
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # pin@v2
-        with:
-          flags: unittests,active-mode-controller
-          name: codecov-active-mode-controller
-          fail_ci_if_error: false
           verbose: true
 
   radio_controller_unit_tests:
@@ -258,7 +208,6 @@ jobs:
         with:
           flags: unittests,radio-controller
           name: codecov-radio-controller
-          fail_ci_if_error: false
           verbose: true
 
   db_migration_check:
@@ -354,7 +303,6 @@ jobs:
         with:
           flags: unittests,db-service
           name: codecov-db-service
-          fail_ci_if_error: false
           verbose: true
 
   integration_tests_orc8r:

.github/workflows/federated-integ-test.yml

@@ -95,11 +95,11 @@ jobs:
         run: |
           pip3 install --upgrade pip
           pip3 install ansible fabric3 jsonpickle requests PyYAML firebase_admin
-          vagrant plugin install vagrant-vbguest vagrant-scp
+          vagrant plugin install vagrant-vbguest vagrant-disksize vagrant-scp vagrant-reload
       - name: Vagrant Host prerequisites for federated integ test
         run: |
           cd ${{ env.AGW_ROOT }} && fab open_orc8r_port_in_vagrant
-          cd ${{ env.MAGMA_ROOT }} && mkdir -p .cache/test_certs/ && mkdir -p .cache/feg/ && touch snowflake
+          cd ${{ env.MAGMA_ROOT }} && mkdir -p .cache/test_certs/ && mkdir -p .cache/feg/
           cd ${{ env.MAGMA_ROOT }}/.cache/feg/ && touch snowflake
       - name: Open up network interfaces for VM
         run: |

.github/workflows/golang-build-test.yml

@@ -219,7 +219,6 @@ jobs:
         uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # pin@v2
         with:
           flags: src_go
-          fail_ci_if_error: true
           verbose: true
       - name: Extract commit title
         id: commit