Resolved merge conflicts

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

Author: rsarwad

.github/workflows/build_all.yml

@@ -115,6 +115,7 @@ jobs:
     runs-on: macos-12
     outputs:
       artifacts: ${{ steps.publish_packages.outputs.artifacts }}
+      magma_package: ${{ steps.publish_packages.outputs.magma_package }}
     steps:
       - uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # pin@v2
         with:
@@ -179,6 +180,14 @@ jobs:
             if [[ "$HTTP_STATUS" != "2"* ]]; then
               PUBLISH_ERROR="true"
             fi
+            # extract magma debian package version
+            match="magma_[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-[a-z0-9]+_[a-z0-9]+.deb"
+            if [[ $i =~ $match ]]; then
+              magma_package=${i#magma_}
+              magma_package=${magma_package%_[a-z0-9]*.deb}
+              magma_package='magma='${magma_package}
+              echo "::set-output name=magma_package::${magma_package}"
+            fi
           done
           # set output
           if [[ "$PUBLISH_ERROR" != "true" ]]; then
@@ -991,3 +1000,15 @@ jobs:
           SLACK_ICON_EMOJI: ":heavy_check_mark:"
           SLACK_COLOR: "#00FF00"
           SLACK_FOOTER: ' '
+  trigger-debian-integ-test:
+    if: always() && github.event_name == 'push' && github.repository_owner == 'magma' && github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    needs: agw-build
+    steps:
+      - name: Trigger debian integ test workflow
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: magma/magma
+          event-type: build-all-artifact
+          client-payload: '{ "artifact": "${{ needs.agw-build.outputs.magma_package }}" }'

.github/workflows/docker-promote.yml

@@ -0,0 +1,53 @@
+# 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.
+
+name: docker promote
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch_tag:
+        description: 'Branch version number'
+        required: true
+      release_tag:
+        description: 'Release version number'
+        required: true
+
+jobs:
+  docker-promote:
+    runs-on: ubuntu-latest
+    env:
+      BRANCH_TAG: ${{ inputs.branch_tag }}
+      RELEASE_TAG: ${{ inputs.release_tag }}
+      MAGMA_ARTIFACTORY: artifactory.magmacore.org
+    steps:
+      - uses: tspascoal/get-user-teams-membership@533553aa88900a17c59177d65bcf8c5c97ff1a90 # [email protected]
+        name: Check if user has rights to promote
+        id: checkUserMember
+        with:
+          username: ${{ github.actor }}
+          team: 'approvers-ci'
+          GITHUB_TOKEN: ${{ secrets.github_token }}
+      - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'false' }}
+        run: |
+          echo "User is not a member of the team"
+          exit 1
+      - uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b # Pin v2.0.0
+        name: Login to Artifactory
+        with:
+          registry: docker.${{ env.MAGMA_ARTIFACTORY }}
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+      - run: |
+          wget https://github.com/magma/magma/raw/master/orc8r/tools/docker/promote.sh
+          chmod 755 promote.sh
+          # Promote Docker images
+          ./promote.sh

.github/workflows/helm-promote.yml

@@ -0,0 +1,49 @@
+# 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.
+
+name: helm promote
+
+on:
+  workflow_dispatch:
+    inputs:
+      magma_version:
+        description: 'Magma version number'
+        required: true
+
+jobs:
+  helm-promote:
+    runs-on: ubuntu-latest
+    env:
+      MAGMA_VERSION: ${{ inputs.magma_version }}
+      MAGMA_ARTIFACTORY: https://artifactory.magmacore.org:443/artifactory
+      HELM_CHART_MUSEUM_TOKEN: ${{ secrets.HELM_CHART_MUSEUM_TOKEN }}
+      HELM_CHART_MUSEUM_USERNAME: ${{ secrets.HELM_CHART_MUSEUM_USERNAME }}
+    steps:
+      - uses: tspascoal/get-user-teams-membership@533553aa88900a17c59177d65bcf8c5c97ff1a90 # [email protected]
+        name: Check if user has rights to promote
+        id: checkUserMember
+        with:
+          username: ${{ github.actor }}
+          team: 'approvers-ci'
+          GITHUB_TOKEN: ${{ secrets.github_token }}
+      - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'false' }}
+        run: |
+          echo "User is not a member of the team"
+          exit 1
+      - run: |
+          wget https://github.com/magma/magma/raw/master/orc8r/tools/helm/promote.sh
+          chmod 755 promote.sh
+          # Promote Helm charts
+          ./promote.sh orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh cwf-orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh feg-orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh lte-orc8r-${MAGMA_VERSION}.tgz
+          ./promote.sh domain-proxy-${MAGMA_VERSION}.tgz

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

@@ -13,13 +13,8 @@ name: LTE integ test magma-deb
 
 on:
   workflow_dispatch: null
-  workflow_run:
-    workflows:
-      - build-all
-    branches:
-      - master
-    types:
-      - completed
+  repository_dispatch:
+    types: [build-all-artifact]
 
 jobs:
   lte-integ-test-magma-deb:
@@ -59,6 +54,7 @@ jobs:
         env:
           MAGMA_DEV_CPUS: 3
           MAGMA_DEV_MEMORY_MB: 9216
+          MAGMA_PACKAGE: ${{ github.event.client_payload.artifact }}
         run: |
           cd lte/gateway
           fab integ_test_deb_installation

lte/gateway/Vagrantfile

@@ -235,6 +235,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       ansible.raw_arguments = ENV.fetch("ANSIBLE_ARGS", "").split(";") +
                               ["--timeout=30"]
       ansible.verbose = 'v'
+      ansible.extra_vars = { MAGMA_PACKAGE: ENV.fetch('MAGMA_PACKAGE', 'magma') }
     end
 
     # Reload VM to apply correct network configuration

lte/gateway/c/core/oai/tasks/amf/amf_config.c

@@ -161,6 +161,16 @@ int amf_config_parse_opt_line(int argc, char* argv[], amf_config_t* config_pP) {
   return 0;
 }
 
+static bool parse_bool(const char* str) {
+  if (strcasecmp(str, "yes") == 0) return true;
+  if (strcasecmp(str, "true") == 0) return true;
+  if (strcasecmp(str, "no") == 0) return false;
+  if (strcasecmp(str, "false") == 0) return false;
+  if (strcasecmp(str, "") == 0) return false;
+
+  Fatal("Error in config file: got \"%s\" but expected bool\n", str);
+}
+
 /***************************************************************************
 **                                                                        **
 ** Name:    amf_config_parse_opt_line()                                   **
@@ -330,6 +340,13 @@ int amf_config_parse_file(amf_config_t* config_pP,
       }    // For the number of entries in the list for PLMN SUPPORT
     }      // PLMN_SUPPORT LIST is present
 
+    // enable VoNR support
+    if ((config_setting_lookup_string(
+            setting_amf, AMF_CONFIG_STRING_NAS_ENABLE_IMS_VoPS_3GPP,
+            &astring))) {
+      config_pP->nas_config.enable_IMS_VoPS_3GPP = parse_bool(astring);
+    }
+
     // guamfi SETTING
     setting =
         config_setting_get_member(setting_amf, AMF_CONFIG_STRING_GUAMFI_LIST);

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme.cpp

@@ -443,7 +443,6 @@ oai::UeDescription* s1ap_new_ue(oai::EnbDescription* enb_ref,
 //------------------------------------------------------------------------------
 void s1ap_remove_ue(oai::S1apState* state, oai::UeDescription* ue_ref) {
   oai::EnbDescription enb_ref;
-
   // NULL reference...
   if (ue_ref == nullptr) return;
 
@@ -457,7 +456,6 @@ void s1ap_remove_ue(oai::S1apState* state, oai::UeDescription* ue_ref) {
   DevAssert(enb_ref.nb_ue_associated() > 0);
   // Updating number of UE
   enb_ref.set_nb_ue_associated((enb_ref.nb_ue_associated() - 1));
-
   OAILOG_TRACE(LOG_S1AP,
                "Removing UE enb_ue_s1ap_id: " ENB_UE_S1AP_ID_FMT
                " mme_ue_s1ap_id:" MME_UE_S1AP_ID_FMT " in eNB id : %d\n",

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme.hpp

@@ -53,7 +53,7 @@ namespace lte {
 /** \Initialize an object of EnbDescription, which is passed as
  * argument
  **/
-void s1ap_new_enb(oai::EnbDescription*);
+void s1ap_new_enb(oai::EnbDescription* enb_ref);
 
 /** \brief Allocate and add to the right eNB list a new UE descriptor
  * \param sctp_assoc_id association ID over SCTP

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_handlers.cpp

@@ -3469,7 +3469,6 @@ status_code_e s1ap_mme_handle_path_switch_request(
   }
   /* Remove ue description from source eNB */
   s1ap_remove_ue(state, ue_ref_p);
-
   /* Mapping between mme_ue_s1ap_id, assoc_id and enb_ue_s1ap_id */
   proto_map_uint32_uint32_t mmeid2associd_map;
   mmeid2associd_map.map = state->mutable_mmeid2associd();
@@ -3481,7 +3480,6 @@ status_code_e s1ap_mme_handle_path_switch_request(
   ue_id_coll.insert(new_ue_ref_p->mme_ue_s1ap_id(),
                     new_ue_ref_p->comp_s1ap_id());
   s1ap_state_update_enb_map(state, assoc_id, &enb_association);
-
   OAILOG_DEBUG_UE(
       LOG_S1AP, imsi64,
       "Associated sctp_assoc_id %d, enb_ue_s1ap_id " ENB_UE_S1AP_ID_FMT
@@ -4466,7 +4464,7 @@ status_code_e s1ap_handle_paging_request(
     OAILOG_ERROR(LOG_S1AP, "paging_request is NULL\n");
     return RETURNerror;
   }
-  status_code_e rc = RETURNok;
+  status_code_e rc = RETURNerror;
   uint8_t num_of_tac = 0;
   uint16_t tai_list_count = paging_request->tai_list_count;
 
@@ -4593,7 +4591,7 @@ status_code_e s1ap_handle_paging_request(
   const paging_tai_list_t* p_tai_list = paging_request->paging_tai_list;
   for (auto itr = enb_map.map->begin(); itr != enb_map.map->end(); itr++) {
     enb_ref_p = itr->second;
-    if (!enb_ref_p.sctp_assoc_id()) {
+    if (enb_ref_p.sctp_assoc_id()) {
       if (enb_ref_p.s1_enb_state() == oai::S1AP_READY) {
         oai::SupportedTaList enb_ta_list = enb_ref_p.supported_ta_list();
         if ((is_tai_found = s1ap_paging_compare_ta_lists(

lte/gateway/c/core/oai/test/s1ap_task/test_s1ap_state_converter.cpp

@@ -110,7 +110,6 @@ TEST_F(S1APStateConverterTest, S1apStateConversionSuccess) {
             enbd_final.supported_ta_list().list_count());
   EXPECT_EQ(enbd.supported_ta_list().supported_tai_items(0).tac(),
             enbd_final.supported_ta_list().supported_tai_items(0).tac());
-
   free_s1ap_state(init_state);
   free_s1ap_state(final_state);
 }