Merge branch 'master' of git@forge.etsi.org:emergency-communications/NG112.git (c0c47971) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

ccsrc/Protocols/Lost/lost_codec.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ int lost_codec::encode (const LibItsHttp__XmlMessageBodyTypes::XmlBody& msg, OCT
		TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_DEFAULT);
		TTCN_Buffer encoding_buffer;

		CHARSTRING h("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n");
		encoding_buffer.put_s(h.lengthof(), (const unsigned char)static_cast<const char>(h));
		if (msg.ischosen(LibItsHttp__XmlMessageBodyTypes::XmlBody::ALT_findServiceRequest)) {
		const urn__ietf__params__xml__ns__lost1::FindService& find_service = msg.findServiceRequest();
		loggers::get_instance().log_msg("lost_codec::encode: Process FindService", (const Base_Type&)find_service);

+7 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,11 @@
		LibCommon_Time.PX_TAC := 30.0

		#LibItsHttp_Pics.PICS_HEADER_HOST := "location-information-service.azurewebsites.net"
		LibItsHttp_Pics.PICS_HEADER_HOST := "ptsv2.com"
		LibItsHttp_Pics.PICS_HEADER_HOST := "ecrf-service.azurewebsites.net"
		#LibItsHttp_Pics.PICS_HEADER_HOST := "ptsv2.com"

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

		#LibNg112_Pics.PICS_HTTP_GET_REQUEST := false

		@@ -32,7 +36,8 @@ LogEventTypes:= Yes
		[TESTPORT_PARAMETERS]
		# In this section you can specify parameters that are passed to Test Ports.
		#system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=location-information-service.azurewebsites.net,port=80,use_ssl=0)"
		system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=ptsv2.com,port=80,use_ssl=0)"
		system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=ecrf-service.azurewebsites.net,port=80,use_ssl=0)"
		#system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=ptsv2.com,port=80,use_ssl=0)"

		#system.SIPP.params := "SIP/UDP(dst_ip=192.168.1.250,dst_port=5060,src_ip=192.168.1.253,src_port=5060)/ETH(mac_src=080027d2b658,mac_dst=90fd61e61902,eth_type=0800)/PCAP(mac_src=080027d2b658,nic=eth1,filter=and udp port 12345)"

+5 −5

Original line number	Diff line number	Diff line
		@@ -1017,7 +1017,7 @@ module AtsNg112_TestCases {
		httpPort.send(
		m_http_request(
		m_http_request_post(
		PICS_ECRF_REQUEST_URIs[0],
		PICS_ECRF_URI,
		v_headers,
		m_http_message_body_xml(
		m_body_xml_find_service_request(
		@@ -1025,11 +1025,11 @@ module AtsNg112_TestCases {
		{
		m_location(
		PX_LOST_ID,
		{ m_extension_point( { m_notLost(encvalue_unichar(valueof(m_point(PX_LOST_NO_LOST, PX_SRS_NAME, "point1")))) } ) },
		{ m_extension_point(encvalue_unichar(valueof(m_point(PX_LOST_NO_LOST, PX_SRS_NAME, "point1")))) },
		"geodetic-2d" // TODO Use a Pixit
		)
		},
		{ m_notLost(encvalue_unichar(valueof(m_point(PX_LOST_NO_LOST, PX_SRS_NAME, "point1")))) },
		{ /m_notLost(encvalue_unichar(valueof(m_point(PX_LOST_NO_LOST, PX_SRS_NAME, "point1"))))/ },
		PX_LOST_SERVICE_URN_1,
		true,
		value_
		@@ -1101,7 +1101,7 @@ module AtsNg112_TestCases {
		// Test adapter configuration

		// Preamble
		f_init_default_headers_list(v_headers);
		/*f_init_default_headers_list(v_headers);
		httpPort.send(
		m_http_request(
		m_http_request_post(
		@@ -1147,7 +1147,7 @@ module AtsNg112_TestCases {
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
		}
		} // End of 'alt' statement

		*/
		// Postamble
		f_cf_01_http_down();
		} // End of testcase TC_ECRF_HTTP_POST_BV_02

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ module LibNg112_Pics {
		/**
		* @desc
		*/
		modulepar charstring PICS_ECRF_URI := "/service";
		modulepar charstring PICS_ECRF_URI := "/api/lost";

		/**
		* @desc HTTP POST Uris

+6 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,9 @@ import from XSD all;
		import from http_www_w3_org_XML_1998_namespace all;


		import from http_www_opengis_net_gml all;


		type record FindService
		{
		XSD.Boolean recursive_ optional,
		@@ -683,7 +686,7 @@ type union NotLost
		}
		with {
		variant "untagged";
		variant (elem) "anyElement from unqualified, 'http://www.opengis.net/gml'";
		variant (elem) "anyElement from 'http://www.opengis.net/gml'";
		};


		@@ -705,10 +708,12 @@ with {
		can be added. */
		type record ExtensionPoint
		{
		XSD.String elem,
		record of NotLost notLost_list
		}
		with {
		variant "untagged";
		variant (elem) "anyElement from 'http://www.opengis.net/gml'";
		variant (notLost_list) "untagged";
		};