Merge branch 'create_urr_fix' into 'develop'

Fix urr id in IE Create URR

See merge request oai/cn5g/oai-cn5g-smf!168

CHANGELOG.md

@@ -24,6 +24,7 @@
   * Fix issue when there's no valid reply from UPF for PDU session release
   * Fix Protocol identifier Selected Bearer Control Mode
   * Fix issue for Static UE IP Addr
+  * Fix URR ID in IE Create URR (post UPF graph implementation)
 * Docker image improvements
   * Fixed docker exit by catching SIGTERM
   * release mode does not use libasan anymore --> allocation of 20T virtual memory is no longer done

src/smf_app/smf_procedure.cpp

@@ -339,7 +339,6 @@ pfcp::create_urr smf_session_procedure::pfcp_create_urr(
     edge& edge, const qfi_t& qfi) {
   auto flow = edge.get_qos_flow(qfi);
 
-  pfcp::urr_id_t urr_id = {};
   sps->generate_urr_id(flow->urr_id);
   pfcp::create_urr create_urr                   = {};
   pfcp::measurement_method_t measurement_method = {};
@@ -370,7 +369,7 @@ pfcp::create_urr smf_session_procedure::pfcp_create_urr(
 
   time_threshold.time_threshold = 5;
 
-  create_urr.set(urr_id);
+  create_urr.set(flow->urr_id);
   create_urr.set(measurement_method);
   create_urr.set(measurement_Period);
   create_urr.set(reporting_triggers);