Commit 3a839e5a authored by juvancic's avatar juvancic
Browse files

Merge branch 'devel' of https://forge.etsi.org/rep/int/5g-core/ngap into devel

parents aa0c687f 11ed8bd8

ccsrc/Ports/LibNGAP/NGAPPort.cc

+7 −13
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


#include "LibNGAP_Interface.hh"

#include "NGAP_PDU_Descriptions.hh"

//#include "sctp_layer_factory.hh"

//#include "tcp_layer_factory.hh"

#include "ngap_layer_factory.hh"

#include "layer.hh"

#include "params.hh"
@@ -60,18 +58,15 @@ namespace LibNGAP__Interface { 
      loggers::get_instance().log("NGAPPort::user_map: %s", it->second.c_str());

      // Setup parameters

      params::convert(_layer_params, it->second); // TODO This _layer_params seems to be useless

      /*// Create layer

      // Create layer

      _layer = layer_stack_builder::get_instance()->create_layer_stack(it->second.c_str());



      if (static_cast<sctp_layer*>(_layer) == nullptr) {

      if (static_cast<ngap_layer*>(_layer) == nullptr) {

        loggers::get_instance().error("NGAPPort::user_map: Invalid stack configurationi - NOT SCTP: %s", it->second.c_str());

      }

      else if (static_cast<tcp_layer*>(_layer) == nullptr) {

        loggers::get_instance().error("NGAPPort::user_map: Invalid stack configuration - NOT TCP: %s", it->second.c_str());

      }

      //static_cast<sctp_layer *>(_layer)->add_upper_port(this);

     */ 

      // // Create layer

      static_cast<ngap_layer*>(_layer)->add_upper_port(this);



      // Create layer

      _layer = layer_stack_builder::get_instance()->create_layer_stack(it->second.c_str());

      if (static_cast<ngap_layer*>(_layer) == NULL) {

        loggers::get_instance().error("NGAPPort::user_map: Invalid stack configuration: %s", it->second.c_str());
@@ -112,7 +107,6 @@ namespace LibNGAP__Interface { 
    float duration;

    loggers::get_instance().set_start_time(_time_key);

    params params;

    //static_cast<sctp_layer*>(_layer)->sendMsg(send_par, params);

    static_cast<ngap_layer*>(_layer)->sendMsg(send_par, params);

    loggers::get_instance().set_stop_time(_time_key, duration);

  }

etc/AtsNGAP/AtsNGAP_AMF.cfg_

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ NGAP_Pics.PICS_NGAP_AMF_IUT := true 
# In this section you can specify the name of the log file and the classes of events

# you want to log into the file or display on console (standard error).



LogFile := "../logs/AtsNGAP_N/%e.%h-%r.%s"

LogFile := "../logs/AtsNGAP/%e.%h-%r.%s"

FileMask := LOG_ALL | USER | DEBUG | MATCHING

ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE
@@ -20,7 +20,7 @@ LogEventTypes:= Yes 


[TESTPORT_PARAMETERS]

# In this section you can specify parameters that are passed to Test Ports.

system.N2_gNBaMF_P.params := "SCTP/ETH(mac_src=080027D2B658)/PCAP_FILE(file=test.pcap)"

system.N2_gNBaMF_P.params := "NGAP/ETH(mac_src=080027D2B658)/PCAP_FILE(file=test.pcap)"



[DEFINE]

# In this section you can create macro definitions,

etc/AtsNGAP/AtsNGAP_GNB.cgf_

+3 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ NGAP_Pics.PICS_NGAP_AMF_IUT := false 
# In this section you can specify the name of the log file and the classes of events

# you want to log into the file or display on console (standard error).



LogFile := "../logs/AtsNGAP_N/%e.%h-%r.%s"

LogFile := "../logs/AtsNGAP/%e.%h-%r.%s"

FileMask := LOG_ALL | USER | DEBUG | MATCHING

ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE
@@ -20,7 +20,7 @@ LogEventTypes:= Yes 


[TESTPORT_PARAMETERS]

# In this section you can specify parameters that are passed to Test Ports.

system.N2_gNBaMF_P.params := "SCTP/ETH(mac_src=080027D2B658)/PCAP_FILE(file=test.pcap)"

system.N2_gNBaMF_P.params := "NGAP/ETH(mac_src=080027D2B658)/PCAP_FILE(file=../captures/free5gc.pcap)"



[DEFINE]

# In this section you can create macro definitions,
@@ -47,11 +47,8 @@ system.N2_gNBaMF_P.params := "SCTP/ETH(mac_src=080027D2B658)/PCAP_FILE(file=test 
# In this section you can specify what parts of your test suite you want to execute.

#AtsImsIot_TestControl.control



# Test System testing

NGAP_TestCases.TC_NGAP_gNB_or_aMF_testcaseName_01



# Verify that the NG-RAN node successfully processes a  PDU SESSION RESOURCE SETUP REQUEST contains mandatory IEs and answers with PDU SESSION RESOURCE SETUP RESPONSE for successfully established PDU session.

#NGAP_TestCases.TC_NGAP_GNB_PDU_01

NGAP_TestCases.TC_NGAP_GNB_PDU_01

# Verify that the NG-RAN node reports the establishment of the corresponding PDU session as failed if a PDU SESSION RESOURCE SETUP REQUEST contains several PDU Session ID IEs set to the same value.

#NGAP_TestCases.TC_NGAP_GNB_PDU_02

# Verify that the NG-RAN node reports the establishment of the new PDU session as failed if a PDU SESSION RESOURCE SETUP REQUEST contains a PDU Session ID IE set to value that identifies an active PDU Session. NOTE: Run TP_NGAP_GNB_PDU_01 before this TP.

ttcn/AtsNGAP/NGAP_TCFunctions.ttcn

+31 −31
Original line number Diff line number Diff line
@@ -4935,7 +4935,7 @@ module NGAP_TCFunctions { 
                // Body

                action("the IUT entity indicate a Downlink RAN Status Transfer procedure");

                f_recv_NGAP_PDU(

                                m_ngap_initMsg(

                                mw_ngap_initMsg(

                                                mw_n2_DownlinkRANStatusTransfer(

                                                                                -,

                                                                                -,
@@ -4981,7 +4981,7 @@ module NGAP_TCFunctions { 
                // Body

                action("the IUT entity indicate the initiation \"of an UE handover success procedure\"");

                f_recv_NGAP_PDU(

                                m_ngap_initMsg(

                                mw_ngap_initMsg(

                                                mw_n2_HandoverSuccess

                                ));
@@ -5018,7 +5018,7 @@ module NGAP_TCFunctions { 
                // Body

                action("the IUT entity indicate a Downlink RAN Early Status Transfer procedure");

                f_recv_NGAP_PDU(

                                m_ngap_initMsg(

                                mw_ngap_initMsg(

                                                mw_n2_DownlinkRANEarlyStatusTransfer(

                                                                                     -,

                                                                                     -,

ttcn/AtsNGAP/module.mk

+12 −10
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ sources:= \ 
modules :=                                               \

  ../LibNGAP                                             \

  ../LibCommon                                           \

  ../../titan-test-system-framework/ccsrc/Protocols/Pcap \

  ../../titan-test-system-framework/ccsrc/Protocols/ETH  \

  ../../ccsrc/Ports/LibNGAP                              \

  ../../ccsrc/EncDec                                     \

  ../../titan-test-system-framework/ccsrc/Framework      \