Rebased and resolved merge conflicts

Signed-off-by: VinashakAnkitAman <ankit.aman@radisys.com>

.bazelrc

@@ -57,6 +57,7 @@ build --test_env=PATH=/bin:/usr/bin:/usr/local/bin:/usr/sbin
 # Use MAGMA_ROOT from the host system in tests.
 # Needed by python tests (e.g. freedomfi_one_tests in enodebd)
 build --test_env=MAGMA_ROOT
+build --test_env=S1AP_TESTER_ROOT
 
 # MME specific compile time defines
 # Compile mme libraries with unit test flag

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

@@ -69,7 +69,7 @@ jobs:
         uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
         with:
           path: ~/.vagrant.d/boxes
-          key: vagrant-boxes-cwf
+          key: vagrant-boxes-cwf-v20220722
       - name: Setup Python env
         uses: "gabrielfalcao/pyenv-action@5327db2939908b2ef8f62d284403d678c4b611d0" # pin@v8
         with:

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

@@ -114,7 +114,7 @@ jobs:
         uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
         with:
           path: ~/.vagrant.d/boxes/magmacore-VAGRANTSLASH-magma_trfserver
-          key: vagrant-box-magma-trfserver
+          key: vagrant-box-magma-trfserver-v20220722
       - name: Build test vms
         run: |
           cd ${{ env.AGW_ROOT }} && fab build_test_vms

.github/workflows/lte-integ-test-bazel.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
         with:
           path: ~/.vagrant.d/boxes/magmacore-VAGRANTSLASH-magma_trfserver
-          key: vagrant-box-magma-trfserver
+          key: vagrant-box-magma-trfserver-v20220722
       - name: setup pyenv
         uses: "gabrielfalcao/pyenv-action@5327db2939908b2ef8f62d284403d678c4b611d0" # pin@v8
         with:

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

@@ -37,7 +37,7 @@ jobs:
         uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # pin@v3
         with:
           path: ~/.vagrant.d/boxes/magmacore-VAGRANTSLASH-magma_trfserver
-          key: vagrant-box-magma-trfserver
+          key: vagrant-box-magma-trfserver-v20220722
       - name: setup pyenv
         uses: "gabrielfalcao/pyenv-action@5327db2939908b2ef8f62d284403d678c4b611d0" # pin@v8
         with:

.github/workflows/reviewdog-workflow.yml

@@ -127,6 +127,13 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
+      - name: setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: install dependencies
+        run: yarn install
+        working-directory: 'nms/'
       - name: eslint
         uses: reviewdog/action-eslint@v1
         with:
@@ -187,7 +194,7 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
       - name: Run mypy with reviewdog
-        uses: tsuyoshicho/action-mypy@631cb44fa199efd4ed132c5005d4f5b08d7ac1e6 # pin@v3.6.0
+        uses: tsuyoshicho/action-mypy@176f65a2ad781202baffaf870e5715d768d799a8 # pin@v3.9.2
         with:
           github_token: ${{ secrets.github_token }}
           filter_mode: added

WORKSPACE.bazel

@@ -128,6 +128,12 @@ new_local_repository(
     path = "/",
 )
 
+new_local_repository(
+    name = "s1ap_test_util",
+    build_file = "//bazel/external:s1ap_test_util.BUILD",
+    path = "/",
+)
+
 load("//bazel:python_dependencies.bzl", "configure_python_dependencies")
 
 configure_python_dependencies()

bazel/external/requirements.in

@@ -59,4 +59,7 @@ parameterized==0.8.1
 freezegun
 pytest
 pytest-cov
-coverage-lcov
+coverage-lcov
+
+# s1ap test requirements
+iperf3

bazel/external/s1ap_test_util.BUILD

@@ -0,0 +1,33 @@
+# Copyright 2022 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.
+
+load("@rules_python//python:defs.bzl", "py_library")
+
+package(default_visibility = ["//visibility:public"])
+
+# The s1ap framework is only present on the magma_test environment
+config_setting(
+    name = "expect_s1ap_framework",
+    values = {"define": "on_magma_test=1"},
+)
+
+py_library(
+    name = "s1ap_types",
+    srcs = select({
+        ":expect_s1ap_framework": ["home/vagrant/s1ap-tester/bin/s1ap_types.py"],
+        "//conditions:default": [],
+    }),
+    imports = select({
+        ":expect_s1ap_framework": ["home/vagrant/s1ap-tester/bin/"],
+        "//conditions:default": [],
+    }),
+    visibility = ["//visibility:public"],
+)

bazel/python_repositories.bzl

@@ -30,6 +30,8 @@ def python_repositories(name = ""):
         patches = [
             "//lte/gateway/deploy/roles/magma/files/patches:ryu_ipfix_args.patch",
             "//lte/gateway/deploy/roles/magma/files/patches:0001-Set-unknown-dpid-ofctl-log-to-debug.patch",
+            "//lte/gateway/deploy/roles/magma/files/patches:0002-QFI-value-set-in-Openflow-controller-using-RYU.patch",
+            "//lte/gateway/deploy/roles/magma/files/patches:0003-QFI-value-set-in-Openflow-controller-using-RYU.patch",
         ],
         patch_args = ["-p1"],
     )

bazel/python_test.bzl

@@ -34,7 +34,7 @@ from bazel.python_utils.coverage_decorator import coverage_decorator
 
 if __name__ == "__main__":
     with coverage_decorator():
-        args =  ["-ra", "-vv"]  + %s + sys.argv[1:] + %s
+        args =  ["-s", "-vv"]  + %s + sys.argv[1:] + %s
         sys.exit(pytest.main(args))"""
 
 PYTEST_DEPS = [