Commit 5355b198 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in device telephone URIs

parent 9c5d6105
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -20,10 +20,14 @@ LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/lost+xml;charset=utf-8"
#LibNg112_Pics.PICS_HTTP_GET_REQUEST := false
#LibNg112_Pics.PICS_HTTP_POST_REQUEST := false


LibNg112_Pixits.PX_IMS_TS_UE1_IPADDR         := "10.101.242.1" # Local UE address used for From header
LibNg112_Pixits.PX_IMS_SUT_UE1_BEARER_IPADDR := "10.101.242.1" # Local UE address used for SDP connection attrubute


#LibNg112_Pics.PICS_S_SIP_TCP1 := true       # Set to true when using SIP over TCP ==> change SIP ports configuration
#LibNg112_Pics.PICS_S_SIP_UDP1 := false
#LibSip_PIXITS.PX_SIP_TRANSPORT := "TCP"     # Transport is TCP
#LibNg112_Pixits.PX_IMS_TS_UE1_PORT := 5052  # SIP over TCP port

[LOGGING]
# In this section you can specify the name of the log file and the classes of events
@@ -46,6 +50,7 @@ LogEventTypes:= Yes
system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=lis.gridgears.io,use_ssl=1)"

# SIP
#Caller.SIPP.params := "SIP/TCP(server=172.24.1.115,port=5062,debug=1,use_ssl=0)"
Caller.SIPP.params := "SIP/UDP(dst_ip=172.24.1.115,dst_port=5060,src_port=5060)"
Ecrf.SIPP.params := "SIP/UDP(dst_ip=172.24.1,240,dst_port=5060,src_port=5060)"
CallTaker.SIPP.params := "SIP/UDP(dst_ip=172.24.1.241,dst_port=5060,src_port=5060)"
+239 −13
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ module AtsNg112_TestCases {
  
  // LibNg112
  import from LibNg112_TypesAndValues all;
  import from LibNg112_Templates all;
  import from LibNg112_Functions all;
  import from LibNg112_TestSystem all;
  import from LibNg112_Steps all;
@@ -2251,7 +2252,7 @@ module AtsNg112_TestCases {
        f_IMS_preamble_woRegistration(p_cSeq_s);
        LibIms_Steps.f_setHeadersINVITE(p_cSeq_s, f_initSipUrl(c_serviceProfile_EMERGENCY), f_initSipUrl(c_userProfile_UE1atSUThome));
        f_init_sdp_userprofile(vc_sdp_local, c_userProfile_UE1atSUThome, c_userProfile_Huawei);
        f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri,
        f_SendINVITE(m_INVITE_Request_IMS_Ng112(vc_requestUri,
                                                vc_callId,
                                                vc_cSeq,
                                                vc_from,
@@ -2306,6 +2307,231 @@ module AtsNg112_TestCases {
      
    } // End of group f_TC_PSAP_SIP_INVITE_BV_01 
    
     /**
     * @desc "IUT successfully handles SIP INVITE with service urn via TCP" 
     */
    testcase TC_PSAP_SIP_INVITE_BV_03(
                                      in CSeq p_cSeq_s
                                      ) runs on HttpImsComponent system TestAdapter {
        // Local variables
        var ImsComponent v_caller;
        var ImsComponent v_call_taker;
        
        // Test control
        if (not(PICS_PSAP_IUT) or (not PICS_S_SIP_TCP1) or (not PICS_E_SIP_URN3) or not(PICS_B_SDP_ULA1)) {
          log("*** " & testcasename() & ": PICS_PSAP_IUT and PICS_S_SIP_TCP1 and PICS_E_SIP_URN3 and PICS_B_SDP_ULA1 required for executing the TC ***");
          setverdict(inconc);
          stop;
        }
        
        // Test component configuration
        f_cf_02_up(v_caller, v_call_taker);
        
        // Test adapter configuration
        
        // Preamble
        
        // Test Body
        /*f_incCSeq(p_cSeq_s);*/ v_caller.start(f_TC_PSAP_SIP_INVITE_BV_03_caller(p_cSeq_s));
        /*f_incCSeq(p_cSeq_s);*/ v_call_taker.start(f_TC_PSAP_SIP_INVITE_BV_03_call_taker(p_cSeq_s));
        f_serverSyncNClientsAndStop(2, {c_prDone, c_tbDone, c_poDone});
        
        // Postamble
        f_cf_02_down(v_caller, v_call_taker);
      
    } // End of testcase TC_PSAP_SIP_INVITE_BV_03
    
    group f_TC_PSAP_SIP_INVITE_BV_03 {
      
      function f_TC_PSAP_SIP_INVITE_BV_03_caller(
                                                 in CSeq p_cSeq_s
                                                 ) runs on ImsComponent {
        // Local variables
        
        // Test control
        
        // Test component configuration
        f_init_userprofile(c_userProfile_UE1atSUThome);
        f_initSipUrl(c_userProfile_UE1atSUThome);
        f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF1);
        
        // Test adapter configuration
        
        // Preamble
        f_IMS_preamble_woRegistration(p_cSeq_s);
        LibIms_Steps.f_setHeadersINVITE(p_cSeq_s, f_initSipUrl(c_serviceProfile_EMERGENCY), f_initSipUrl(c_userProfile_UE1atSUThome));
        f_init_sdp_userprofile(vc_sdp_local, c_userProfile_UE1atSUThome, c_userProfile_Huawei);
        f_SendINVITE(m_INVITE_Request_IMS_Ng112(vc_requestUri,
                                                vc_callId,
                                                vc_cSeq,
                                                vc_from,
                                                vc_to,
                                                vc_via,
                                                vc_contact,
                                                m_Require_100rel,
                                                -, -,
                                                m_Supported_100rel,
                                                -,
                                                m_MBody_SDP(vc_sdp_local)
                                                ));
        f_awaitingResponseIgnore100Trying(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
        f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
        
        // test body
        f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
        
        // Postamble
        f_terminateCall_UE(vc_requestUri, valueof(vc_callId), vc_cSeq, vc_caller_From, vc_caller_To);
        f_clientSyncAndVerdictPostamble(c_poDone, e_success);
      } // End of function f_TC_PSAP_SIP_INVITE_BV_03_caller
      
      function f_TC_PSAP_SIP_INVITE_BV_03_call_taker(
                                                     in CSeq p_cSeq_s
                                                     ) runs on ImsComponent {
        // Local variables
        
        // Test control
        f_init_userprofile(c_userProfile_UE1atSUThome);
        f_initSipUrl(c_serviceProfile_EMERGENCY);
        f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF1);
        
        // Test component configuration
        
        // Test adapter configuration
        
        // Preamble
        f_IMS_preamble_woRegistration(p_cSeq_s)
        LibIms_Steps.f_setHeadersINVITE(p_cSeq_s, f_initSipUrl(c_serviceProfile_EMERGENCY), f_initSipUrl(c_userProfile_UE1atSUThome));
        f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
        
        // test body
        f_awaitingINVITE(mw_INVITE_Request_RequestURI(vc_requestUri));
        f_awaitingResponse(mw_Response_Base(c_statusLine100, vc_callId, vc_cSeq));
        f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
        
        // Postamble
        f_terminateCall_UE(vc_requestUri, valueof(vc_callId), vc_cSeq, vc_caller_From, vc_caller_To);
        f_clientSyncAndVerdictPostamble(c_poDone, e_success);
      } // End of function f_TC_PSAP_SIP_INVITE_BV_03_call_taker
      
    } // End of group f_TC_PSAP_SIP_INVITE_BV_03 
    
     /**
     * @desc "IUT successfully handles SIP INVITE with SDP and PIDF-LO content" 
     */
    testcase TC_PSAP_SIP_INVITE_BV_04(
                                      in CSeq p_cSeq_s
                                      ) runs on HttpImsComponent system TestAdapter {
        // Local variables
        var ImsComponent v_caller;
        var ImsComponent v_call_taker;
        
        // Test control
        if (not(PICS_PSAP_IUT) or (not PICS_S_SIP_TCP1) or (not PICS_E_SIP_URN1) or not(PICS_B_SDP_ULA1)) {
          log("*** " & testcasename() & ": PICS_PSAP_IUT and PICS_S_SIP_TCP1 and PICS_E_SIP_URN1 and PICS_B_SDP_ULA1 required for executing the TC ***");
          setverdict(inconc);
          stop;
        }
        
        // Test component configuration
        f_cf_02_up(v_caller, v_call_taker);
        
        // Test adapter configuration
        
        // Preamble
        
        // Test Body
        /*f_incCSeq(p_cSeq_s);*/ v_caller.start(f_TC_PSAP_SIP_INVITE_BV_04_caller(p_cSeq_s));
        /*f_incCSeq(p_cSeq_s);*/ v_call_taker.start(f_TC_PSAP_SIP_INVITE_BV_04_call_taker(p_cSeq_s));
        f_serverSyncNClientsAndStop(2, {c_prDone, c_tbDone, c_poDone});
        
        // Postamble
        f_cf_02_down(v_caller, v_call_taker);
      
    } // End of testcase TC_PSAP_SIP_INVITE_BV_04
    
    group f_TC_PSAP_SIP_INVITE_BV_04 {
      
      function f_TC_PSAP_SIP_INVITE_BV_04_caller(
                                                 in CSeq p_cSeq_s
                                                 ) runs on ImsComponent {
        // Local variables
        
        // Test control
        
        // Test component configuration
        f_init_userprofile(c_userProfile_UE1atSUThome);
        f_initSipUrl(c_userProfile_UE1atSUThome);
        f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF1);
        
        // Test adapter configuration
        
        // Preamble
        f_IMS_preamble_woRegistration(p_cSeq_s);
        LibIms_Steps.f_setHeadersINVITE(p_cSeq_s, f_initSipUrl(c_serviceProfile_EMERGENCY), f_initSipUrl(c_userProfile_UE1atSUThome));
        f_init_sdp_userprofile(vc_sdp_local, c_userProfile_UE1atSUThome, c_userProfile_Huawei);
        f_SendINVITE(m_INVITE_Request_Mime_IMS(vc_requestUri,
                                               vc_callId,
                                               vc_cSeq,
                                               vc_from,
                                               vc_to,
                                               vc_via,
                                               vc_contact,
                                               m_Require_100rel,
                                               -, -,
                                               m_Supported_100rel,
                                               -,
                                               m_MBody_MIMESdpXml(
                                                                  vc_sdp_local, 
                                                                  m_XmlBody_Presence(
                                                                                     m_presence(
                                                                                                "pres:3650n87934c@ls.example.com" // TODO Use a Pixit
                                                                                                )
                                                                                     )
                                                                  )
                                          ));
        f_awaitingResponseIgnore100Trying(mw_Response_Base(c_statusLine200, vc_callId, vc_cSeq));
        f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
        
        // test body
        f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
        
        // Postamble
        f_terminateCall_UE(vc_requestUri, valueof(vc_callId), vc_cSeq, vc_caller_From, vc_caller_To);
        f_clientSyncAndVerdictPostamble(c_poDone, e_success);
      } // End of function f_TC_PSAP_SIP_INVITE_BV_04_caller
      
      function f_TC_PSAP_SIP_INVITE_BV_04_call_taker(
                                                     in CSeq p_cSeq_s
                                                     ) runs on ImsComponent {
        // Local variables
        
        // Test control
        f_init_userprofile(c_userProfile_UE1atSUThome);
        f_initSipUrl(c_serviceProfile_EMERGENCY);
        f_init_interfaceprofile(c_interfaceProfile_IMS_SUT_PCSCF1);
        
        // Test component configuration
        
        // Test adapter configuration
        
        // Preamble
        f_IMS_preamble_woRegistration(p_cSeq_s)
        LibIms_Steps.f_setHeadersINVITE(p_cSeq_s, f_initSipUrl(c_serviceProfile_EMERGENCY), f_initSipUrl(c_userProfile_UE1atSUThome));
        f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
        
        // test body
        f_awaitingINVITE(mw_INVITE_Request_RequestURI(vc_requestUri));
        f_awaitingResponse(mw_Response_Base(c_statusLine100, vc_callId, vc_cSeq));
        f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
        
        // Postamble
        f_terminateCall_UE(vc_requestUri, valueof(vc_callId), vc_cSeq, vc_caller_From, vc_caller_To);
        f_clientSyncAndVerdictPostamble(c_poDone, e_success);
      } // End of function f_TC_PSAP_SIP_INVITE_BV_04_call_taker
      
    } // End of group f_TC_PSAP_SIP_INVITE_BV_04 
    
  } // End of group psap_role 
  
} // End of module AtsNg112_TestCases 
+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ module AtsNg112_TestControl {
      if (PICS_S_SIP_UDP1 and PICS_E_SIP_URN3) {
        if (PICS_B_SDP_ULA1) { execute(TC_PSAP_SIP_INVITE_BV_01(v_cSeq)); }
      }
      if (PICS_S_SIP_TCP1 and PICS_E_SIP_URN3) {
        if (PICS_B_SDP_ULA1) { execute(TC_PSAP_SIP_INVITE_BV_03(v_cSeq)); }
      }
    }
  } // End of 'control' statement
  
+9 −1
Original line number Diff line number Diff line
@@ -158,11 +158,19 @@ module LibNg112_Pics {
   */
  modulepar boolean PICS_L_FIS_ERR2 := true;
  
  /**
   * @desc Does IUT configured for UDP?
   */
  modulepar boolean PICS_S_SIP_UDP1 := true;
  
  /**
   * @desc Does IUT configured for TCP?
   */
  modulepar boolean PICS_S_SIP_TCP1 := false;
  
  modulepar boolean PICS_E_SIP_URN1 := true;
  
  modulepar boolean PICS_S_SIP_UDP1 := true;
  modulepar boolean PICS_E_SIP_URN2 := true;
  
  modulepar boolean PICS_E_SIP_URN3 := true;
  
+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ module LibNg112_Pixits {
  /**
   * @desc Device telephone URIs
   */
  modulepar DeviceURIs PX_DEVICE_NUMBER := { "<uri>+331234567890</uri>", "<uri>+331234567891</uri>", "<uri>+331234567892</uri>", "<uri>+33000000000</uri>" };
  modulepar DeviceURIs PX_DEVICE_NUMBER := { "<uri>tel:+331234567890</uri>", "<uri>tel:+331234567891</uri>", "<uri>tel:+331234567892</uri>", "<uri>tel:+33000000000</uri>" };
  
  /**
   * @desc Device telephone URI to get a response with a point
Loading