Merge branch 'develop' of https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-smf into...

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-smf into ie_fix_usage_report_in_srr

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -410,6 +410,36 @@ pipeline {
             }
           }
         }
+        stage ('Testing the tutorials') {
+          steps {
+            script {
+              gitlabCommitStatus(name: "Test tutorials") {
+                localStatus = build job: 'OAI-CN5G-Tutorials-Check',
+                  parameters: [
+                    string(name: 'SMF_TAG', value: String.valueOf(smf_tag)),
+                    string(name: 'SMF_BRANCH', value: String.valueOf(smf_branch))
+                  ], propagate: false
+                localResult = localStatus.getResult()
+
+                if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
+                  echo "Tutorials Test Job is OK"
+                } else {
+                  echo "Tutorials Test Job is KO"
+                  sh "ci-scripts/fail.sh"
+                }
+              }
+            }
+          }
+          post {
+            always {
+              script {
+                copyArtifacts(projectName: 'OAI-CN5G-Tutorials-Check',
+                              filter: '*_results_oai_cn5g*.html',
+                              selector: lastCompleted())
+              }
+            }
+          }
+        }
       }
     }
     // For the moment it is Docker-Hub, but we might have a new one internally.

src/smf_app/smf_context.cpp

@@ -1596,15 +1596,21 @@ void smf_context::handle_pdu_session_create_sm_context_request(
 
     boost::split(split_result, amf_status_uri, boost::is_any_of("/"));
     if (split_result.size() >= 3) {
-      std::string addr = split_result[2];
-      // remove http port from the URI if existed
-      std::size_t found_port = addr.find(":");
-      if (found_port != std::string::npos) addr = addr.substr(0, found_port);
+      std::string full_addr = split_result[2];
+      // Check if the AMF addr is valid
+      std::size_t found_port = full_addr.find(":");
+
+      std::string addr = {};  // Addr without port
+      if (found_port != std::string::npos) {
+        addr = full_addr.substr(0, found_port);
+      } else {
+        addr = full_addr;
+      }
       struct in_addr amf_ipv4_addr;
       if (inet_aton(util::trim(addr).c_str(), &amf_ipv4_addr) == 0) {
         Logger::smf_api_server().warn("Bad IPv4 for AMF");
       } else {
-        amf_addr_str = addr;
+        amf_addr_str = full_addr;
         Logger::smf_api_server().debug("AMF IP Addr %s", amf_addr_str.c_str());
       }
     }

src/smf_app/smf_procedure.cpp

@@ -499,6 +499,9 @@ void session_create_sm_context_procedure::handle_itti_msg(
   Logger::smf_app().debug(
       "N1N2MessageTransfer will be sent to AMF with URL: %s", url.c_str());
 
+  // HTTP version
+  n11_triggered_pending->http_version = smf_cfg.http_version;
+
   // Fill the json part
   nlohmann::json json_data = {};
   // N1SM