Merge branch 'develop' into cu_du_testing

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -257,10 +257,7 @@ pipeline {
                   myShCmd('cp /etc/pki/entitlement/*pem ./etc-pki-entitlement', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   myShCmd('sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   myShCmd('sudo cp /etc/rhsm/ca/*.pem ./rhsm-ca', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
-                  myShCmd('sudo podman build --no-cache --target oai-amf --tag oai-amf:' + amf_tag + ' --file docker/Dockerfile.amf.rhel8 --format docker . > archives/amf_podman_image_build.log 2>&1', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
-                  // Putting a place holder to try out on the flattening of image.
-                  // If not satisfactory, we can remove it.
-                  myShCmd('python3 ./ci-scripts/flatten_image.py --tag oai-amf:' + amf_tag, rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
+                  myShCmd('sudo podman build --no-cache --squash --target oai-amf --tag oai-amf:' + amf_tag + ' --file docker/Dockerfile.amf.rhel8 --format docker . > archives/amf_podman_image_build.log 2>&1', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   myShCmd('sudo podman image ls >> archives/amf_podman_image_build.log', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   if ("MERGE".equals(env.gitlabActionType)) {
                     myShCmd('sudo podman image tag oai-amf:' + amf_tag + ' oai-amf:' + rhel_amf_tag, rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)

src/amf-app/amf_n2.cpp

@@ -986,6 +986,7 @@ void amf_n2::handle_itti_message(
   Logger::amf_n2().debug("SUPI (%s)", supi.c_str());
 
   // Get SNSSAI info from PDU Session Context
+  item.s_nssai.sd                          = {};
   std::shared_ptr<pdu_session_context> psc = {};
   if (!amf_app_inst->find_pdu_session_context(
           supi, itti_msg.pdu_session_id, psc)) {

src/ngap/ngapMsgs/PduSessionResourceSetupRequest.cpp

@@ -21,6 +21,7 @@
 
 #include "PduSessionResourceSetupRequest.hpp"
 
+#include "3gpp_23.003.h"
 #include "conversions.hpp"
 #include "logger.hpp"
 
@@ -221,7 +222,12 @@ void PduSessionResourceSetupRequestMsg::setPduSessionResourceSetupRequestList(
     }
     S_NSSAI s_NSSAI = {};
     s_NSSAI.setSst(list[i].s_nssai.sst);
-    if (list[i].s_nssai.sd.size()) s_NSSAI.setSd(list[i].s_nssai.sd);
+
+    uint32_t sd_int_value = 0;
+    if (conv::sd_string_to_int(list[i].s_nssai.sd, sd_int_value)) {
+      if (sd_int_value != SD_NO_VALUE) s_NSSAI.setSd(list[i].s_nssai.sd);
+    }
+
     itemSUReq.set(
         pDUSessionID, m_nAS_PDU, s_NSSAI,
         list[i].pduSessionResourceSetupRequestTransfer);