cu_cp,ngap: Add check for error indication to unittests

Author: FabianEckermann

tests/unittests/ngap/ngap_error_indication_test.cpp

@@ -32,16 +32,26 @@ class ngap_error_indication_test : public ngap_test
     // Inject Initial Context Setup Request
     run_inital_context_setup(ue_index);
   }
+
+  bool was_error_indication_sent() const
+  {
+    return msg_notifier.last_ngap_msg.pdu.init_msg().value.type() ==
+           asn1::ngap::ngap_elem_procs_o::init_msg_c::types_opts::error_ind;
+  }
 };
 
 // Note that this is currently a manual test without asserts, as we currently don't handle the error indication
 
 /// Test handling of error indication message for inexisting ue
-TEST_F(ngap_error_indication_test, when_error_indication_message_for_inexisting_ue_received_message_is_dropped)
+TEST_F(ngap_error_indication_test,
+       when_error_indication_message_for_inexisting_ue_received_message_is_dropped_and_error_indication_is_sent)
 {
   // Inject error indication message
   ngap_message error_indication_msg = generate_error_indication_message(uint_to_amf_ue_id(10), uint_to_ran_ue_id(0));
   ngap->handle_message(error_indication_msg);
+
+  // Check that Error Indication has been sent to AMF
+  ASSERT_TRUE(was_error_indication_sent());
 }
 
 /// Test handling of error indication message for existing ue

tests/unittests/ngap/ngap_nas_message_test.cpp

@@ -43,6 +43,12 @@ class ngap_nas_message_routine_test : public ngap_test
     return msg_notifier.last_ngap_msg.pdu.init_msg().value.type() ==
            asn1::ngap::ngap_elem_procs_o::init_msg_c::types_opts::ul_nas_transport;
   }
+
+  bool was_error_indication_sent() const
+  {
+    return msg_notifier.last_ngap_msg.pdu.init_msg().value.type() ==
+           asn1::ngap::ngap_elem_procs_o::init_msg_c::types_opts::error_ind;
+  }
 };
 
 /// Initial UE message tests
@@ -80,7 +86,7 @@ TEST_F(ngap_nas_message_routine_test, when_ue_present_dl_nas_transport_is_forwar
   ASSERT_TRUE(was_dl_nas_transport_forwarded());
 }
 
-TEST_F(ngap_nas_message_routine_test, when_no_ue_present_dl_nas_transport_is_dropped)
+TEST_F(ngap_nas_message_routine_test, when_no_ue_present_dl_nas_transport_is_dropped_and_error_indication_is_sent)
 {
   // Inject DL NAS transport message from AMF
   ngap_message dl_nas_transport = generate_downlink_nas_transport_message(
@@ -93,6 +99,8 @@ TEST_F(ngap_nas_message_routine_test, when_no_ue_present_dl_nas_transport_is_dro
 
   // Check that no message has been sent to RRC
   ASSERT_TRUE(was_dl_nas_transport_dropped());
+  // Check that Error Indication has been sent to AMF
+  ASSERT_TRUE(was_error_indication_sent());
 }
 
 /// Test UL NAS transport handling

tests/unittests/ngap/ngap_paging_test.cpp

@@ -169,6 +169,12 @@ class ngap_paging_test : public ngap_test
   bool was_minimal_paging_forwarded() const { return was_minimal_conversion_successful(); }
 
   bool was_full_paging_forwarded() const { return was_full_conversion_successful(); }
+
+  bool was_error_indication_sent() const
+  {
+    return msg_notifier.last_ngap_msg.pdu.init_msg().value.type() ==
+           asn1::ngap::ngap_elem_procs_o::init_msg_c::types_opts::error_ind;
+  }
 };
 
 /// Test handling of valid paging message with optional fields
@@ -194,12 +200,12 @@ TEST_F(ngap_paging_test, when_valid_paging_message_with_optional_values_received
 }
 
 /// Test handling of invalid paging message
-TEST_F(ngap_paging_test, when_invalid_paging_message_received_message_is_forwarded)
+TEST_F(ngap_paging_test, when_invalid_paging_message_received_message_is_not_forwarded_and_error_indication_is_sent)
 {
   // Inject paging message
   ngap_message paging_msg = generate_invalid_paging_message();
   ngap->handle_message(paging_msg);
 
-  // check that paging message has been forwarded
-  ASSERT_FALSE(was_full_paging_forwarded());
+  // Check that Error Indication has been sent to AMF
+  ASSERT_TRUE(was_error_indication_sent());
 }

tests/unittests/ngap/ngap_pdu_session_resource_setup_procedure_test.cpp

@@ -79,6 +79,12 @@ class ngap_pdu_session_resource_setup_procedure_test : public ngap_test
 
     return test_1 && test_2 && test_3;
   }
+
+  bool was_error_indication_sent() const
+  {
+    return msg_notifier.last_ngap_msg.pdu.init_msg().value.type() ==
+           asn1::ngap::ngap_elem_procs_o::init_msg_c::types_opts::error_ind;
+  }
 };
 
 /// Test valid PDU Session Resource Setup Request
@@ -147,7 +153,6 @@ TEST_F(ngap_pdu_session_resource_setup_procedure_test, when_security_not_enabled
       ue.amf_ue_id.value(), ue.ran_ue_id.value(), pdu_session_id);
   ngap->handle_message(pdu_session_resource_setup_request);
 
-  // Check that PDU Session Resource Setup Request was dropped (last transmitted message is InitialContextSetupResponse)
-  ASSERT_EQ(msg_notifier.last_ngap_msg.pdu.successful_outcome().value.type(),
-            asn1::ngap::ngap_elem_procs_o::successful_outcome_c::types_opts::init_context_setup_resp);
+  // Check that Error Indication has been sent to AMF
+  ASSERT_TRUE(was_error_indication_sent());
 }

tests/unittests/ngap/ngap_test_messages.cpp

@@ -542,11 +542,8 @@ ngap_message srsran::srs_cu_cp::generate_invalid_paging_message()
   ngap_msg.pdu.init_msg().load_info_obj(ASN1_NGAP_ID_PAGING);
 
   // add ue paging id
-  auto& paging        = ngap_msg.pdu.init_msg().value.paging();
-  auto& five_g_s_tmsi = paging->ue_paging_id.set_five_g_s_tmsi();
-  five_g_s_tmsi.amf_set_id.from_number(0);
-  five_g_s_tmsi.amf_pointer.from_number(0);
-  five_g_s_tmsi.five_g_tmsi.from_number(0);
+  auto& paging = ngap_msg.pdu.init_msg().value.paging();
+  paging->ue_paging_id.set_choice_exts();
   return ngap_msg;
 }