Update Supi for N7

src/smf_app/smf_context.cpp

@@ -1495,8 +1495,8 @@ void smf_context::handle_pdu_session_create_sm_context_request(
   bool use_pcf_policy      = false;
   sp.get()->policy_ptr->set_context(
       smf_supi_to_string_without_nulls(smreq->req.get_supi()),
-      smreq->req.get_dnn(), snssai, plmn, smreq->req.get_pdu_session_id(),
-      smreq->req.get_pdu_session_type());
+      smreq->req.get_supi_prefix(), smreq->req.get_dnn(), snssai, plmn,
+      smreq->req.get_pdu_session_id(), smreq->req.get_pdu_session_type());
 
   // TODO what is the exact meaning of SCID? Is this unique per registration
   // or unique per PDU session?

src/smf_app/smf_n7.hpp

@@ -72,8 +72,9 @@ struct policy_association {
   std::string pcf_location;
 
   void set_context(
-      const std::string& supi, const std::string& dnn, const snssai_t& snssai,
-      const plmn_t& plmn, const uint8_t pdu_session_id,
+      const std::string& supi, const std::string& supi_prefix,
+      const std::string& dnn, const snssai_t& snssai, const plmn_t& plmn,
+      const uint8_t pdu_session_id,
       const pdu_session_type_t& pdu_session_type) {
     oai::smf_server::model::Snssai snssai_model;
     snssai_model.setSst(snssai.sst);
@@ -90,8 +91,7 @@ struct policy_association {
     context = {};
 
     context.setPduSessionId(pdu_session_id);
-    // TODO only support imsi SUPI, not NAI
-    context.setSupi("imsi-" + supi);
+    context.setSupi(smf_get_supi_with_prefix(supi_prefix, supi));
     oai::smf_server::model::PduSessionType pdu_session_type_model;
     // hacky
     from_json(pdu_session_type.to_string(), pdu_session_type_model);