Commit 4ad61eb5 authored by Yann Garcia's avatar Yann Garcia
Browse files

Editorial changes in functions naming

parent 93434400
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ LogEventTypes:= Yes
# In this section you can specify parameters that are passed to Test Ports.

# Open5GS AMF IP and port
#system.NGAP_AMF.params := "NGAP/SCTP(server=192.168.1.21,port=4444,debug=1)"
system.NGAP_AMF.params := "NGAP/SCTP(server_mode=1,local_port=38412,debug=1)"

# Open5GS pcap files
system.NGAP_AMF.params := "NGAP/SCTP_FILE/IP_OFFLINE/ETH(mac_src=8c554ac1eee0,mac_dst=8c554ac1eee1)/PCAP_FILE(file=../captures/open5gs.pcap)"
#system.NGAP_AMF.params := "NGAP/SCTP_FILE/IP_OFFLINE/ETH(mac_src=8c554ac1eee0,mac_dst=8c554ac1eee1)/PCAP_FILE(file=../captures/open5gs.pcap)"

[DEFINE]
# In this section you can create macro definitions,
+4 −4
Original line number Diff line number Diff line
@@ -219,9 +219,9 @@ module NGAP_Steps {
        function f_NGAP_amf_UE_SecurityMode() runs on aMFNGAPComponent {
            log(">>> f_NGAP_amf_UE_SecurityMode");
            if (PICS_OFFLINE_MODE) {
                f_await_securitymode_command_await_securitymode_complete();
                f_await_security_mode_command_await_security_mode_complete();
            } else { // Await security mode and send response
                f_await_securitymode_command_send_securitymode_complete();
                f_await_security_mode_command_send_security_mode_complete();
            }
            log("<<< f_NGAP_amf_UE_SecurityMode");
        } // End of function f_NGAP_amf_UE_SecurityMode
@@ -434,9 +434,9 @@ module NGAP_Steps {
        function f_NGAP_gnb_UE_SecurityMode() runs on gNBNGAPComponent {
            log(">>> f_NGAP_gnb_UE_SecurityMode");
            if (PICS_OFFLINE_MODE) {
                f_await_securitymode_command_await_securitymode_complete();
                f_await_security_mode_command_await_security_mode_complete();
            } else { // Await security mode and send response
                f_send_securitymode_command_await_securitymode_complete();
                f_send_security_mode_command_await_security_mode_complete();
            }
            log("<<< f_NGAP_gnb_UE_SecurityMode");
        } // End of function f_NGAP_gnb_UE_SecurityMode
+12 −12
Original line number Diff line number Diff line
@@ -4052,7 +4052,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  // f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  // f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  // f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  // f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete
                  // f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse

@@ -4106,7 +4106,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_UE_PDU_SessionEstablishmentRequest(); // f_send_session_establishment_request_await_session_establishment_response
@@ -4388,7 +4388,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();

                  f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                  log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
@@ -4458,7 +4458,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4499,7 +4499,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4546,7 +4546,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4598,7 +4598,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4641,7 +4641,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4686,7 +4686,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4740,7 +4740,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4791,7 +4791,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  f_NGAP_amf_RegistrationComplete(); // f_send_registration_complete

@@ -4894,7 +4894,7 @@ module NGAP_TCFunctions {
                  f_NGAP_amf_UE_Register(); // f_await_NGSetupRequest_send_NGSetupRespone();
                                            // f_send_registration_request();
                  f_NGAP_amf_UE_Authentication(); // f_await_authentication_request_send_authentication_response();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_securitymode_command_send_securitymode_complete();
                  f_NGAP_amf_UE_SecurityMode(); // f_await_security_mode_command_send_security_mode_complete();
                  f_NGAP_amf_UE_InitialContextSetup(); // f_await_initial_context_setup_request_send_initial_context_setup_resonse
                  if (not(f_NGAP_amf_UE_Has_Suspended_Context())) {
                      f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
+48 −9
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ module LibNGAP_Functions {
     * @desc Function to send NGSetupRequest message and await for NGSetupResponse message
     */
    function f_send_NGSetupRequest_await_NGSetupRespone() runs on NGNASComponent {
        // Send NGSetupRequest
        f_send_NGAP_PDU(
                        m_ngap_initMsg(
                                        m_n2_NGSetupRequest(
@@ -109,6 +110,8 @@ module LibNGAP_Functions {
                                                            },
                                                            PX_PAGING_DRX
        )));

        // Await NGSetupResponse
        f_recv_NGAP_PDU(
                        mw_ngap_succMsg(
                                        mw_n2_NGSetupResponse(
@@ -128,6 +131,7 @@ module LibNGAP_Functions {
     * @desc Function to send NGSetupRequest message and await for NGSetupResponse message
     */
    function f_await_NGSetupRequest_await_NGSetupRespone() runs on NGNASComponent {
        // Await NGSetupRequest
        f_recv_NGAP_PDU(
                        mw_ngap_initMsg(
                                        mw_n2_NGSetupRequest(
@@ -162,6 +166,8 @@ module LibNGAP_Functions {
                                                            },
                                                            PX_PAGING_DRX
        )));

        // Await NGSetupResponse
        f_recv_NGAP_PDU(
                        mw_ngap_succMsg(
                                        mw_n2_NGSetupResponse(
@@ -178,12 +184,12 @@ module LibNGAP_Functions {
    }

    /**
     * @desc Function to send NAS NGSetupResponse message
     * @desc Function to send NAS RegistrationRequest message
     */
    function f_send_registration_request() runs on NGNASComponent {
        log(">>> f_send_registration_request");

        // Send request for REGISTRATION_REQUEST
        // Send REGISTRATION_REQUEST
        var NG_NAS_UL_Message_Type v_nas_message := valueof(
                                                            m_NG_REGISTRATION_REQUEST(
                                                                                      cs_RegistrationType(tsc_NG_RegistrationInitial, '1'B),
@@ -208,12 +214,12 @@ module LibNGAP_Functions {
    }

    /**
     * @desc Function to await NAS NGSetupResponse message
     * @desc Function to await NAS RegistrationRequest message
     */
    function f_await_registration_request() runs on NGNASComponent {
        log(">>> f_await_registration_request");

        // Await request for REGISTRATION_REQUEST
        // REGISTRATION_REQUEST
        f_recv_NGAP_PDU(
                        mw_ngap_initMsg(
                                        mw_n2_initialUeMessage
@@ -231,6 +237,9 @@ module LibNGAP_Functions {
        }
    }

    /**
     * @desc Function to send NAS RegistrationComplete message
     */
    function f_send_registration_complete() runs on NGNASComponent {
        log(">>> f_send_registration_complete");

@@ -252,6 +261,9 @@ module LibNGAP_Functions {
                        )));
    }

    /**
     * @desc Function to await NAS RegistrationComplete message
     */
    function f_await_registration_complete() runs on NGNASComponent {
        log(">>> f_await_registration_complete");

@@ -269,6 +281,9 @@ module LibNGAP_Functions {
        }
    }

    /**
     * @desc Function to await NAS AuthenticationRequest message and send for AuthenticationResponse message
     */
    function f_await_authentication_request_send_authentication_response() runs on NGNASComponent {
        log(">>> f_await_authentication_request_send_authentication_response");

@@ -328,6 +343,9 @@ module LibNGAP_Functions {
        setverdict(pass);
    }

    /**
     * @desc Function to await NAS AuthenticationRequest message and await for AuthenticationResponse message
     */
    function f_await_authentication_request_await_authentication_response() runs on NGNASComponent {
        log(">>> f_await_authentication_request_await_authentication_response");

@@ -390,6 +408,9 @@ module LibNGAP_Functions {
        setverdict(pass);
    }

    /**
     * @desc Function to send NAS AuthenticationRequest message and await for AuthenticationResponse message
     */
    function f_send_authentication_request_await_authentication_response() runs on NGNASComponent {
        log(">>> f_send_authentication_request_await_authentication_response");

@@ -400,14 +421,20 @@ module LibNGAP_Functions {
        // TODO Await response for AUTHENTICATION_RESPONSE
    }

    function f_send_securitymode_command_await_securitymode_complete() runs on NGNASComponent {
    /**
     * @desc Function to send NAS SecurityModeCommand message and await for SecurityModeComplete message
     */
    function f_send_security_mode_command_await_security_mode_complete() runs on NGNASComponent {
        // TODO Send request for SECURITY_MODE_COMMAND

        // TODO Receive response for SECURITY_MODE_COMPLETE
    }

    function f_await_securitymode_command_send_securitymode_complete() runs on NGNASComponent {
        log(">>> f_await_securitymode_command_send_securitymode_complete");
    /**
     * @desc Function to await NAS SecurityModeCommand message and send for SecurityModeComplete message
     */
    function f_await_security_mode_command_send_security_mode_complete() runs on NGNASComponent {
        log(">>> f_await_security_mode_command_send_security_mode_complete");

        // Await request for SECURITY_MODE_COMMAND
        f_recv_NGAP_PDU(
@@ -463,8 +490,11 @@ module LibNGAP_Functions {
        setverdict(pass);
    }

    function f_await_securitymode_command_await_securitymode_complete() runs on NGNASComponent {
        log(">>> f_await_securitymode_command_await_securitymode_complete");
    /**
     * @desc Function to await NAS SecurityModeCommand message and await for SecurityModeComplete message
     */
    function f_await_security_mode_command_await_security_mode_complete() runs on NGNASComponent {
        log(">>> f_await_security_mode_command_await_security_mode_complete");

        // Await request for SECURITY_MODE_COMMAND
        f_recv_NGAP_PDU(
@@ -516,6 +546,9 @@ module LibNGAP_Functions {
        setverdict(pass);
    }

    /**
     * @desc Function to await NAS InitialContextSetupRequest message and await for InitialContextSetupResonse message
     */
    function f_await_initial_context_setup_request_await_initial_context_setup_resonse() runs on NGNASComponent {
        log(">>> f_await_initial_context_setup_request_await_initial_context_setup_resonse");

@@ -570,6 +603,9 @@ module LibNGAP_Functions {
        log("<<< f_await_initial_context_setup_request_await_initial_context_setup_resonse");
    }

    /**
     * @desc Function to await NAS InitialContextSetupRequest message and send for InitialContextSetupResonse message
     */
    function f_await_initial_context_setup_request_send_initial_context_setup_resonse() runs on NGNASComponent {
        log(">>> f_await_initial_context_setup_request_send_initial_context_setup_resonse");

@@ -625,6 +661,9 @@ module LibNGAP_Functions {
                        )));
    }

    /**
     * @desc Function to send NAS InitialContextSetupRequest message and await for InitialContextSetupResonse message
     */
    function f_send_initial_context_setup_request_await_initial_context_setup_resonse() runs on NGNASComponent {
        log(">>> f_send_initial_context_setup_request_await_initial_context_setup_resonse");