Merge branch 'develop' into 'nrf'

# Conflicts:
#   src/amf-app/amf_n1.cpp
#   src/amf-app/amf_n11.cpp
#   src/amf-app/mysql_db.cpp
#   src/ngap/ngapMsgs/PduSessionResourceReleaseResponse.cpp

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -163,14 +163,14 @@ pipeline {
               gitlabCommitStatus(name: "Static Code Analysis") {
                 // Running on xenial to have 1.72 version of cppcheck
                 myShCmd('docker run --name ci-cn-cppcheck -d ubuntu:xenial /bin/bash -c "sleep infinity"', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-cppcheck /bin/bash -c "apt-get update && apt-get upgrade --yes" > archives/cppcheck_install.log', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-cppcheck /bin/bash -c "apt-get install --yes cppcheck bzip2" >> archives/cppcheck_install.log', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-cppcheck /bin/bash -c "apt-get update && apt-get upgrade --yes" > archives/cppcheck_install.log', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-cppcheck /bin/bash -c "apt-get install --yes cppcheck bzip2" >> archives/cppcheck_install.log', new_host_flag, new_host_user, new_host)
 
                 myShCmd('docker cp ./openair-amf.tar.bz2 ci-cn-cppcheck:/home', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-cppcheck /bin/bash -c "cd /home && tar -xjf openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-cppcheck /bin/bash -c "rm -f /home/openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-cppcheck /bin/bash -c "cd /home && tar -xjf openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-cppcheck /bin/bash -c "rm -f /home/openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
 
-                myShCmd('docker exec -it ci-cn-cppcheck /bin/bash -c "cd /home && cppcheck --enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list src 2> cppcheck.xml 1> cppcheck_build.log"', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-cppcheck /bin/bash -c "cd /home && cppcheck --enable=warning --force --xml --xml-version=2 --suppressions-list=ci-scripts/cppcheck_suppressions.list src 2> cppcheck.xml 1> cppcheck_build.log"', new_host_flag, new_host_user, new_host)
               }
             }
           }
@@ -198,19 +198,19 @@ pipeline {
             script {
               gitlabCommitStatus(name: "Code Formatting Checker") {
                 myShCmd('docker run --name ci-cn-clang-formatter -d ubuntu:bionic /bin/bash -c "sleep infinity"', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-clang-formatter /bin/bash -c "apt-get update && apt-get upgrade --yes" > archives/clang_format_install.log', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-clang-formatter /bin/bash -c "apt-get install --yes git tree bzip2" >> archives/clang_format_install.log', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-clang-formatter /bin/bash -c "apt-get update && apt-get upgrade --yes" > archives/clang_format_install.log', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-clang-formatter /bin/bash -c "apt-get install --yes git tree bzip2" >> archives/clang_format_install.log', new_host_flag, new_host_user, new_host)
 
                 myShCmd('docker cp ./openair-amf.tar.bz2 ci-cn-clang-formatter:/home', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-clang-formatter /bin/bash -c "cd /home && tar -xjf openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
-                myShCmd('docker exec -it ci-cn-clang-formatter /bin/bash -c "rm -f /home/openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-clang-formatter /bin/bash -c "cd /home && tar -xjf openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
+                myShCmd('docker exec ci-cn-clang-formatter /bin/bash -c "rm -f /home/openair-amf.tar.bz2"', new_host_flag, new_host_user, new_host)
 
                 // We install a dedicated version (installed on our CI server).
                 myShCmd('docker cp /opt/clang-format/9.0.0/bin/clang-format ci-cn-clang-formatter:/usr/local/bin', new_host_flag, new_host_user, new_host)
                 if ("MERGE".equals(env.gitlabActionType)) {
-                  myShCmd('docker exec -it ci-cn-clang-formatter /bin/bash -c "cd /home && ./ci-scripts/checkCodingFormattingRules.sh --src-branch ' + env.gitlabSourceBranch +' --target-branch ' + env.gitlabTargetBranch + '"', new_host_flag, new_host_user, new_host)
+                  myShCmd('docker exec ci-cn-clang-formatter /bin/bash -c "cd /home && ./ci-scripts/checkCodingFormattingRules.sh --src-branch ' + env.gitlabSourceBranch +' --target-branch ' + env.gitlabTargetBranch + '"', new_host_flag, new_host_user, new_host)
                 } else {
-                  myShCmd('docker exec -it ci-cn-clang-formatter /bin/bash -c "cd /home && ./ci-scripts/checkCodingFormattingRules.sh"', new_host_flag, new_host_user, new_host)
+                  myShCmd('docker exec ci-cn-clang-formatter /bin/bash -c "cd /home && ./ci-scripts/checkCodingFormattingRules.sh"', new_host_flag, new_host_user, new_host)
                 }
               }
             }
@@ -239,7 +239,7 @@ pipeline {
       steps {
         script {
           gitlabCommitStatus(name: "Test with DsTester") {
-            localStatus = build job: 'CI-OpenAir-CN5G-FED',
+            localStatus = build job: params.CN5G_FED_PipelineName,
               parameters: [
                 string(name: 'AMF_TAG', value: String.valueOf(amf_tag)),
                 string(name: 'AMF_BRANCH', value: String.valueOf(amf_branch))
@@ -258,7 +258,7 @@ pipeline {
       post {
         always {
           script {
-            copyArtifacts(projectName: 'CI-OpenAir-CN5G-FED',
+            copyArtifacts(projectName: params.CN5G_FED_PipelineName,
                           filter: '*_results_oai_cn5g.html',
                           selector: lastCompleted())
           }
@@ -323,16 +323,19 @@ pipeline {
         }
 
         // Sending email to commiter
-        emailext attachmentsPattern: '*results*.html',
-          body: '''Hi,
-
+        if (params.sendToCommitterEmail != null) {
+          if (params.sendToCommitterEmail) {
+            emailext attachmentsPattern: '*results*.html',
+              body: '''Hi,
 Here are attached HTML report files for $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!
 
 Regards,
 OAI CI Team''',
-          replyTo: 'no-reply@openairinterface.org',
-          subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!',
-          to: gitCommitAuthorEmailAddr
+              replyTo: 'no-reply@openairinterface.org',
+              subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!',
+              to: gitCommitAuthorEmailAddr
+          }
+        }
       }
     }
   }

src/amf-app/amf_n1.cpp

@@ -914,7 +914,7 @@ void amf_n1::registration_request_handle(
     } break;
 
     case MOBILITY_REGISTRATION_UPDATING: {
-      Logger::amf_n1().error("Network handling mobility registration ...");
+      Logger::amf_n1().debug("Network handling mobility registration ...");
       run_mobility_registration_update_procedure(nc);
     } break;
 

src/ngap/ngapIEs/PDUSessionResourceReleasedItemRelRes.cpp

@@ -80,7 +80,7 @@ bool PDUSessionResourceReleasedItemRelRes::
         Ngap_PDUSessionResourceReleasedItemRelRes_t*
             pduSessionResourceReleasedItemRelRes) {
   pDUSessionID = new PDUSessionID();
-
+  pDUSessionID->setPDUSessionID(pduSessionResourceReleasedItemRelRes->pDUSessionID);
   pDUSessionResourceReleaseResponseTransfer =
       pduSessionResourceReleasedItemRelRes
           ->pDUSessionResourceReleaseResponseTransfer;

src/ngap/ngapMsgs/PduSessionResourceReleaseResponse.cpp

@@ -293,6 +293,7 @@ bool PduSessionResourceReleaseResponseMsg::decodefrompdu(
             pduSessionResourceReleaseResponseIEs->protocolIEs.list.array[i]
                     ->value.present ==
                 Ngap_PDUSessionResourceReleaseResponseIEs__value_PR_AMF_UE_NGAP_ID) {
+
           amfUeNgapId = new AMF_UE_NGAP_ID();
           if (!amfUeNgapId->decodefromAMF_UE_NGAP_ID(
                   pduSessionResourceReleaseResponseIEs->protocolIEs.list