Commit 1d927854 authored by Michael Proestler's avatar Michael Proestler
Browse files

Merge branch 'ttf_t009' of forge.etsi.org:emtel/NG112 into ttf_t009

parents 841222be 198b8d9a

README.md

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ $ make 
    - system.httpPort.params

    - Caller.SIPP.params

    - Ecrf.SIPP.params

    - CallTaker.SIPP.params

    - CallTalker.SIPP.params



- To run the test suitem, execute the following command:

ccsrc/Ports/LibSip/SipPort.cc

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ namespace LibSip__Interface { 
      incoming_message(LibSip__SIPTypesAndValues::INFO__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));

    } else if (p_ind.requestLine().method() == LibSip__SIPTypesAndValues::Method::OPTIONS__E) {

      incoming_message(LibSip__SIPTypesAndValues::OPTIONS__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));

    } else if (p_ind.requestLine().method() == LibSip__SIPTypesAndValues::Method::ACK__E) {

      incoming_message(LibSip__SIPTypesAndValues::ACK__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));

    } else {

      incoming_message(p_ind);

    }

etc/AtsPSAP/AtsNg112_Frequentis_psap.cfg_

+20 −18
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.



LibCommon_Time.PX_TAC := 30.0

LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;

#LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

#LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;



LibItsHttp_Pics.PICS_HEADER_HOST := "lis.gridgears.io" # Used for LIS

#LibItsHttp_Pics.PICS_HEADER_HOST := "ecrf.gridgears.io" # Used for ECRF
@@ -15,18 +15,20 @@ LibNg112_Pixits.PX_IMS_SUT_UE1_PUBLIC_USER := "alice-06" 
LibNg112_Pixits.PX_IMS_SUT_UE1_HOME_DOMAIN       := "plugtests.net"

LibNg112_Pixits.PX_IMS_TS_UE1_IPADDR             := "conftest.plugtests.net" # Local UE address used for From header

LibNg112_Pixits.PX_IMS_SUT_UE1_BEARER_IPADDR     := "conftest.plugtests.net" # Local UE address used for SDP connection attrubute



#AtsPSAP_Pics.PICS_PSAP_S_SIP_TCP1 := true       # Set to true when using SIP over TCP ==> change SIP ports configuration

#AtsPSAP_Pics.PICS_PSAP_S_SIP_UDP1 := false

#LibSip_PIXITS.PX_SIP_TRANSPORT := "TCP"     # Transport is TCP

LibNg112_Pics.PICS_PSAP_CALL_TAKER               := true      # Set to true when CallTalker interface is available

#LibNg112_Pixits.PX_IMS_TS_UE1_PORT               := 5052  # SIP over TCP port

LibNg112_Pixits.PX_IMS_SUT_EMERGENCY_SERVICE     := "sos"

LibNg112_Pixits.PX_IMS_SUT_EMERGENCY_HOME_DOMAIN := "psap1.frequentis.plugtests.net"

LibNg112_Pixits.PX_IMS_SUT_PCSCF1_IPADDR         := "psap1.frequentis.plugtests.net"



LibNg112_Pixits.PX_IMS_SUT_UE_IPADDR             := "psap1.frequentis.plugtests.net"



LibSip_PIXITS.PX_SIP_TRANSPORT := "TCP";

AtsPSAP_Pics.PICS_PSAP_S_SIP_REGISTRATION := false

AtsPSAP_Pics.PICS_PSAP_S_SIP_TCP1         := false       # Set to true when using SIP over TCP ==> change SIP ports configuration

                                                 # Update LibSip_PIXITS.PX_SIP_TRANSPORT according to true/false value

AtsPSAP_Pics.PICS_PSAP_S_SIP_UDP1         := true

AtsPSAP_Pics.PICS_PSAP_USE_TLS            := false



LibSip_PIXITS.PX_SIP_TRANSPORT            := "UDP"     # Transport is TCP or TCP



[LOGGING]

# In this section you can specify the name of the log file and the classes of events
@@ -47,11 +49,11 @@ LogEventTypes:= Yes 


# SIP

#  TCP

#Caller.SIPP.params := "SIP/TCP(debug=1,server=192.168.1.39,port=5060,use_ssl=0)"

#CallTaker.SIPP.params := "SIP/TCP(dst_ip=192.168.1.39,port=5060,use_ssl=0)"

#Caller.SIPP.params := "SIP/TCP(debug=1,server=127.0.0.1,port=5060,use_ssl=0)"

#CallTalker.SIPP.params := "SIP/TCP(dst_ip=127.0.0.1,port=5080,use_ssl=0)"

#  UDP

Caller.SIPP.params := "SIP/UDP(debug=1,dst_ip=127.0.0.1,dst_port=5060,src_port=5061,use_ssl=0)"

CallTaker.SIPP.params := "SIP/UDP(dst_ip=127.0.0.1,dst_port=5061,src_port=5060,use_ssl=0)"

CallTalker.SIPP.params := "SIP/UDP(debug=1,server_mode=1,src_port=5080,reuse_incoming_source_adddress=1,use_ssl=0)"



# ESRP

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.168.1.39,port=30044,use_ssl=0)"
@@ -79,7 +81,7 @@ system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.1 


[EXECUTE]

# In this section you can specify what parts of your test suite you want to execute.

#AtsPSAP_TestControl.control

AtsPSAP_TestControl.control



# IUT successfully handles SIP INVITE with service urn and ULAW via UDP

#AtsPSAP_TestCases.TC_PSAP_SIP_INVITE_BV_01
@@ -100,7 +102,7 @@ system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.1 




# Check that the IUT registers properly to an ESRP Dequeue"

AtsPSAP_TestCases.TC_PSAP_DEQUEUE_BV_01

#AtsPSAP_TestCases.TC_PSAP_DEQUEUE_BV_01



[GROUPS]

# In this section you can specify groups of hosts. These groups can be used inside the

etc/AtsPSAP/AtsNg112_Huawei_psap.cfg_

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ LogEventTypes:= Yes 
# SIP

#Caller.SIPP.params := "SIP/TCP(debug=1,server=172.24.99.196,port=5060)"

Caller.SIPP.params := "SIP/TCP(debug=1,server=psap1.huawei.plugtests.net,port=5061,use_ssl=1)"

CallTaker.SIPP.params := "SIP/UDP(dst_ip=172.24.1.241,dst_port=5060,src_port=5060)"

CallTalker.SIPP.params := "SIP/UDP(dst_ip=172.24.1.241,dst_port=5060,src_port=5060)"



[DEFINE]

# In this section you can create macro definitions,

mocks/AtsPSAP/TC_PSAP_SIP_INVITE_BV_01/PsapCallTalker.sh

0 → 100755
+2 −0
Original line number Diff line number Diff line 
echo "Simulate PSAP CallTalker side (UAC)"

sipp -t t1 -trace_msg -m 1 -sf PsapCallTalker.xml 127.0.0.1:5080
 
 No newline at end of file