Commit a87c456d authored by YannGarcia's avatar YannGarcia
Browse files

Execute AtsNg112/LIS against Intersys

parent e081899f

ccsrc/Protocols/Sip/sip_codec_message_body.cc

+36 −3
Original line number Diff line number Diff line
@@ -820,15 +820,47 @@ int sip_codec_message_body::encode_xml(const LibSip__XMLTypes::XmlBody& p_messag 
  }

  OCTETSTRING data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data());



  if (p_message_body.ischosen(LibSip__XMLTypes::XmlBody::ALT_presence)) { // TODO TITAN work-around, replace tq0003 namespace???

  if (p_message_body.ischosen(LibSip__XMLTypes::XmlBody::ALT_presence)) { // NG112-2021 Workaround for TITAN/XSD issue

                                                                          // TODO TITAN work-around, replace tq0003 namespace???

    std::string s(static_cast<const unsigned char*>(data), data.lengthof() + static_cast<const unsigned char*>(data));

    size_t idx = 0;

    std::string f("tq0003:");

    /*size_t idx = 0;



    std::string f("tq0000:");

    std::string t("");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    f.assign(":tq0000");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    f.assign("tq0001:");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    f.assign(":tq0001");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    f.assign("tq0002:");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    f.assign(":tq0002");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    f.assign("tq0003:");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    f.assign(":tq0003");

    while ((idx = s.find(f)) != std::string::npos) {

      s.replace(idx, f.length(), t);
@@ -844,6 +876,7 @@ int sip_codec_message_body::encode_xml(const LibSip__XMLTypes::XmlBody& p_messag 
      s.replace(idx, f.length(), t);

      idx += t.length();

    } // End of 'while' statement

    */

    data = OCTETSTRING(s.length(), (const unsigned char*)s.c_str());

  }

  (*p_body)->body = ::strdup(static_cast<const char*>(oct2char(data)));

ccsrc/Protocols/Sip/sip_codec_request.cc

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ int sip_codec_request::encode_request_line(const LibSip__SIPTypesAndValues::Requ 
  }

  ::osip_message_set_uri(p_sip_message, uri);

  // FIXME: Add parameter to support udp/tcp/tls transport

  ::osip_uri_set_transport_tcp(uri); // NG112-2021

  //::osip_uri_set_transport_tcp(uri); // NG112-2021

  ::osip_uri_set_transport_tls(uri); // NG112-2021



  // SIP version

  p = (char*)osip_malloc(p_request_line.sipVersion().lengthof() + 1); // Will be freed by osip_message_free

etc/AtsNg112/AtsNg112_Beta80_ecrp.cfg_→etc/AtsNg112/AtsNg112_Beta80_ecrf.cfg_

+14 −14
Original line number Diff line number Diff line
@@ -11,31 +11,31 @@ LibCommon_Time.PX_TAC := 30.0 
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;



LibItsHttp_Pics.PICS_HEADER_HOST := "esrp1.beta80.plugtests.net"

LibItsHttp_Pics.PICS_HEADER_HOST := "ecrf1.beta80.plugtests.net"



LibItsHttp_Pics.PICS_HTTP_VERSION_MINOR := 0;

#LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/held+xml;charset=utf-8"

LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/lost+xml;charset=utf-8"



# LIS PICS

LibNg112_Pics.PICS_LIS_URI := "/"

LibNg112_Pics.PICS_LIS_URI := "/api/v1/LIS"

LibNg112_Pics.PICS_HTTP_POST_GET_KEEP_ALIVE := false



# ECRF PICS

LibNg112_Pics.PICS_ECRF_URI := "/"

LibNg112_Pics.PICS_ECRF_URI := "/api/lost"



LibNg112_Pixits.PX_V_POLICE_PATH := "esrp1.beta80.plugtests.net"



# PSAP01

#LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 43.623013240241434, 7.046184539794921 } # ALICE01

#LibNg112_Pixits.PX_E_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

#LibNg112_Pixits.PX_V_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

#LibNg112_Pixits.PX_E_POLICE_DISPLAY_NAME := "PSAP 1 Police"

#LibNg112_Pixits.PX_V_POLICE_DISPLAY_NAME := "PSAP 1 Police"

#LibNg112_Pixits.PX_E_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

#LibNg112_Pixits.PX_V_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 43.623013240241434, 7.046184539794921 } # ALICE01

LibNg112_Pixits.PX_E_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

LibNg112_Pixits.PX_V_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

LibNg112_Pixits.PX_E_POLICE_DISPLAY_NAME := "PSAP 1 Police"

LibNg112_Pixits.PX_V_POLICE_DISPLAY_NAME := "PSAP 1 Police"

LibNg112_Pixits.PX_E_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

LibNg112_Pixits.PX_V_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

# PSAP02

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 7.053029537200927, 7.053029537200927 } # ALICE02

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 43.62357242915213, 7.053029537200927 } # ALICE02

LibNg112_Pixits.PX_CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS := { 43.62139000963511, 7.055529356002808 } # CAROL02

LibNg112_Pixits.PX_E_POLICE_SOURCE_ID := "bcba560d-9132-4307-894e-f82db5c8478c"

LibNg112_Pixits.PX_V_POLICE_SOURCE_ID := "bcba560d-9132-4307-894e-f82db5c8478c"
@@ -62,7 +62,7 @@ LogEventTypes:= Yes 
# In this section you can specify parameters that are passed to Test Ports.



# LIS

system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=esrp1.beta80.plugtests.net,port=443,use_ssl=1)"

system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=ecrf1.beta80.plugtests.net,port=443,use_ssl=1)"



[DEFINE]

# In this section you can create macro definitions,
@@ -108,7 +108,7 @@ system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debu 
# "IUT returns HTTP error 404 if it does not support HTTP GET method"

#AtsNg112_TestCases.TC_LIS_HTTP_GET_BV_02

# "IUT successfully responds with a service URI for a Point in the service boundary"

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_01

AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_01

# "IUT successfully responds with a service URI for a Circle in the service boundary"

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_02

# "IUT successfully responds with an error response for an unknown Service URN in the service boundary"
@@ -122,7 +122,7 @@ system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debu 
# "IUT successfully responds with a service URI for a Circle that intersects multiple service boundaries"

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_07

# "IUT successfully responds with a service URI for a Circle in the service boundary with multiple services"

AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_08

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_08

# "IUT successfully responds with configured service types for a ListServices request"

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_09

# "IUT successfully responds with configured service types for a ListServicesByLocation request"

etc/AtsNg112/AtsNg112_Beta80_lis.cfg_

+13 −12
Original line number Diff line number Diff line
@@ -18,22 +18,22 @@ LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/held+xml;charset=utf-8" 
#LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/lost+xml;charset=utf-8"



# LIS PICS

LibNg112_Pics.PICS_LIS_URI := "/"

LibNg112_Pics.PICS_LIS_URI := "/api/v1/LIS"

LibNg112_Pics.PICS_HTTP_POST_GET_KEEP_ALIVE := false



LibNg112_Pixits.PX_V_POLICE_PATH := "ecrf1.beta80.plugtests.net"

LibNg112_Pixits.PX_DEVICE_NUMBER_POINT_POS := { 43.6230132402414, 7.04618453979492 };



# PSAP01

#LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 43.623013240241434, 7.046184539794921 } # ALICE01

#LibNg112_Pixits.PX_E_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

#LibNg112_Pixits.PX_V_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

#LibNg112_Pixits.PX_E_POLICE_DISPLAY_NAME := "PSAP 1 Police"

#LibNg112_Pixits.PX_V_POLICE_DISPLAY_NAME := "PSAP 1 Police"

#LibNg112_Pixits.PX_E_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

#LibNg112_Pixits.PX_V_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 43.623013240241434, 7.046184539794921 } # ALICE01

LibNg112_Pixits.PX_E_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

LibNg112_Pixits.PX_V_POLICE_SOURCE_ID := "1d2af31b-4f75-4277-871a-dd3fad15b002";

LibNg112_Pixits.PX_E_POLICE_DISPLAY_NAME := "PSAP 1 Police"

LibNg112_Pixits.PX_V_POLICE_DISPLAY_NAME := "PSAP 1 Police"

LibNg112_Pixits.PX_E_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

LibNg112_Pixits.PX_V_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

# PSAP02

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 7.053029537200927, 7.053029537200927 } # ALICE02

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 43.62357242915213, 7.053029537200927 } # ALICE02

LibNg112_Pixits.PX_CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS := { 43.62139000963511, 7.055529356002808 } # CAROL02

LibNg112_Pixits.PX_E_POLICE_SOURCE_ID := "bcba560d-9132-4307-894e-f82db5c8478c"

LibNg112_Pixits.PX_V_POLICE_SOURCE_ID := "bcba560d-9132-4307-894e-f82db5c8478c"
@@ -62,7 +62,8 @@ LogEventTypes:= Yes 
# In this section you can specify parameters that are passed to Test Ports.



# LIS

system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=lis1.beta80.plugtests.net,port=443,use_ssl=1)"

#system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=lis1.beta80.plugtests.net,port=443,use_ssl=1)"

system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=lis1.beta80.plugtests.net)"



[DEFINE]

# In this section you can create macro definitions,
@@ -90,11 +91,11 @@ system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debu 
#AtsNg112_TestControl.control



# "IUT successfully responds with a Point when it receives a HTTP POST location request without location type"

AtsNg112_TestCases.TC_LIS_HTTP_POST_BV_01

#AtsNg112_TestCases.TC_LIS_HTTP_POST_BV_01

# "IUT successfully responds with a Circle when it receives a HTTP POST location request without location type"

#AtsNg112_TestCases.TC_LIS_HTTP_POST_BV_02

# "IUT successfully responds with a reference when it receives a HTTP POST location request with location type locationURI and exact attribute"

#AtsNg112_TestCases.TC_LIS_HTTP_POST_BV_03

AtsNg112_TestCases.TC_LIS_HTTP_POST_BV_03

# "IUT successfully responds with a reference and geodetic location when it receives a HTTP POST location request with location types locationURI and geodetic and exact attribute"

#AtsNg112_TestCases.TC_LIS_HTTP_POST_BV_04

# "IUT successfully responds with an error response when it receives a HTTP POST location request for an unknown device"

etc/AtsNg112/AtsNg112_Gridgears_lis.cfg_

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ LibNg112_Pixits.PX_DEVICE_NUMBER_POINT_POS := { 43.6230132402414, 7.046184539794 
#LibNg112_Pixits.PX_E_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

#LibNg112_Pixits.PX_V_POLICE_SIP_URI := "sip:police@psap1.plugtests.net"

# PSAP02

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 7.053029537200927, 7.053029537200927 } # ALICE02

LibNg112_Pixits.PX_POINT_IN_E_POLICE_SERVICE_BOUNDARY := { 43.62357242915213, 7.053029537200927 } # ALICE02

LibNg112_Pixits.PX_CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS := { 43.62139000963511, 7.055529356002808 } # CAROL02

LibNg112_Pixits.PX_E_POLICE_SOURCE_ID := "bcba560d-9132-4307-894e-f82db5c8478c"

LibNg112_Pixits.PX_V_POLICE_SOURCE_ID := "bcba560d-9132-4307-894e-f82db5c8478c"