Remove gridgears reference in Ng112 ATS code; Add support of namespace prefix in lost codec (af95a7f5) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

ccsrc/Protocols/Held/held_codec.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ int held_codec::encode (const LibItsHttp__XmlMessageBodyTypes::XmlBody& msg, OCT
		} // End of 'while' statement

		// NG112-2021: Apply draft-ietf-geopriv-held-identity-extensions-06: Use of Device Identity in HTTP-Enabled Location Delivery (HELD) draft-ietf-geopriv-held-identity-extensions-06
		// For Gridgears: TITAN issue: Not possible to remove prefix id:device & held:location...
		// FIXME: Add parameter to enable/disable draft-ietf-geopriv-held-identity-extensions-06 support
		f.assign("xmlns:id");
		t.assign("xmlns");

ccsrc/Protocols/Lost/lost_codec.cc

+5 −5

Original line number	Diff line number	Diff line
		@@ -94,27 +94,27 @@ int lost_codec::decode (const OCTETSTRING& p_data, LibItsHttp__XmlMessageBodyTyp
		TTCN_EncDec::clear_error();
		TTCN_Buffer decoding_buffer(p_data);

		if (it->second.find("<findServiceResponse") != std::string::npos) {
		if ((it->second.find("<findServiceResponse") != std::string::npos) \|\| (it->second.find("::findServiceResponse") != std::string::npos)) {
		loggers::get_instance().warning("lost_codec::decode: Process FindServiceResponse");
		urn__ietf__params__xml__ns__lost1::FindServiceResponse find_service_response;
		find_service_response.decode(urn__ietf__params__xml__ns__lost1::FindServiceResponse_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);
		msg.findServiceResponse() = find_service_response;
		} else if (it->second.find("<listServicesResponse") != std::string::npos) {
		} else if ((it->second.find("<listServicesResponse") != std::string::npos) \|\| (it->second.find("::listServicesResponse") != std::string::npos)) {
		loggers::get_instance().warning("lost_codec::decode: Process ListServicesResponse");
		urn__ietf__params__xml__ns__lost1::ListServicesResponse list_services_response;
		list_services_response.decode(urn__ietf__params__xml__ns__lost1::ListServicesResponse_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);
		msg.listServicesResponse() = list_services_response;
		} else if (it->second.find("<listServicesByLocationResponse") != std::string::npos) {
		} else if ((it->second.find("<listServicesByLocationResponse") != std::string::npos) \|\| (it->second.find("::listServicesByLocationResponse") != std::string::npos)) {
		loggers::get_instance().warning("lost_codec::decode: Process ListServicesByLocationResponse");
		urn__ietf__params__xml__ns__lost1::ListServicesByLocationResponse list_services_by_location_response;
		list_services_by_location_response.decode(urn__ietf__params__xml__ns__lost1::ListServicesByLocationResponse_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);
		msg.listServicesByLocationResponse() = list_services_by_location_response;
		} else if (it->second.find("<redirect") != std::string::npos) {
		} else if ((it->second.find("<redirect") != std::string::npos) \|\| (it->second.find("::redirect") != std::string::npos)) {
		loggers::get_instance().warning("lost_codec::decode: Process Redirect");
		urn__ietf__params__xml__ns__lost1::Redirect redirect;
		redirect.decode(urn__ietf__params__xml__ns__lost1::Redirect_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);
		msg.redirect() = redirect;
		} else if (it->second.find("<findService") != std::string::npos) {
		} else if ((it->second.find("<findService") != std::string::npos) \|\| (it->second.find("::findService") != std::string::npos)) {
		urn__ietf__params__xml__ns__lost1::FindService find_service;
		find_service.decode(urn__ietf__params__xml__ns__lost1::FindService_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);
		msg.findServiceRequest() = find_service;

etc/AtsPSAP/AtsNg112_Frequentis_psap.cfg_

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ LogEventTypes:= Yes
		# In this section you can specify parameters that are passed to Test Ports.

		# SIP
		Caller.SIPP.params := "SIP/TCP(debug=1,server=psap1.frequentis.plugtests.net,port=5060,use_ssl=1)"
		Caller.SIPP.params := "SIP/TCP(debug=1,server=192.168.1.39,port=5060,use_ssl=0)"
		CallTaker.SIPP.params := "SIP/UDP(dst_ip=172.24.1.241,dst_port=5060,src_port=5060)"

		# ESRP

ttcn/AtsBCF/AtsBCF_TestCases.ttcn

+10 −10

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ module AtsBCF_TestCases {
		m_Supported_100rel,
		-,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "http", components := { other := "//lis1.gridgears.plugtests.net" }, urlParameters := omit, headers := omit }, omit),
		m_geolocation({ scheme:= "http", components := { other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit),
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -299,7 +299,7 @@ module AtsBCF_TestCases {
		m_Supported_100rel,
		-,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "http", components := { other := "//lis1.gridgears.plugtests.net" }, urlParameters := omit, headers := omit }, omit),
		m_geolocation({ scheme:= "http", components := { other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit),
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -431,7 +431,7 @@ module AtsBCF_TestCases {
		m_Supported_100rel,
		-,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "http", components := { other := "//lis1.gridgears.plugtests.net" }, urlParameters := omit, headers := omit }, omit),
		m_geolocation({ scheme:= "http", components := { other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit),
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -553,7 +553,7 @@ module AtsBCF_TestCases {
		m_Supported_100rel,
		-,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "http", components := { other := "//lis1.gridgears.plugtests.net" }, urlParameters := omit, headers := omit }, omit),
		m_geolocation({ scheme:= "http", components := { other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit),
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -675,7 +675,7 @@ module AtsBCF_TestCases {
		m_Supported_100rel,
		-,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "http", components := { other := "//lis1.gridgears.plugtests.net" }, urlParameters := omit, headers := omit }, omit),
		m_geolocation({ scheme:= "http", components := { other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit),
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -795,7 +795,7 @@ module AtsBCF_TestCases {
		-,
		m_Supported_100rel,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "https", components := {other := "//lis1.gridgears.plugtests.net/locref?ref=660bc838-882e-4683-8241-af26bb5960d8" }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation({ scheme:= "https", components := {other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -903,7 +903,7 @@ module AtsBCF_TestCases {
		-,
		m_Supported_100rel,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "https", components := {other := "//lis1.gridgears.plugtests.net/locref?ref=660bc838-882e-4683-8241-af26bb5960d8" }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation({ scheme:= "https", components := {other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -1021,7 +1021,7 @@ module AtsBCF_TestCases {
		-,
		m_Supported_100rel,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "https", components := {other := "//lis1.gridgears.plugtests.net/locref?ref=660bc838-882e-4683-8241-af26bb5960d8" }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation({ scheme:= "https", components := {other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -1132,7 +1132,7 @@ module AtsBCF_TestCases {
		-,
		m_Supported_100rel,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "https", components := {other := "//lis1.gridgears.plugtests.net/locref?ref=660bc838-882e-4683-8241-af26bb5960d8" }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation({ scheme:= "https", components := {other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));
		@@ -1243,7 +1243,7 @@ module AtsBCF_TestCases {
		-,
		m_Supported_100rel,
		m_MBody_SDP(vc_sdp_local),
		m_geolocation({ scheme:= "https", components := {other := "//lis1.gridgears.plugtests.net/locref?ref=660bc838-882e-4683-8241-af26bb5960d8" }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation({ scheme:= "https", components := {other := PX_GEOLOCATION_ID }, urlParameters := omit, headers := omit }, omit), // TODO Add a LIS component to do a request for location by reference
		m_geolocation_routing,
		{ fieldName := USER_AGENT_E, userAgentBody := { "ETSI_Conf_testing" } }
		));

ttcn/AtsECRF/AtsECRF_Pixits.ttcn

+3 −3

Original line number	Diff line number	Diff line
		@@ -28,13 +28,13 @@ module AtsECRF_Pixits {
		modulepar XSD.AnyURI PX_E_UNKNOWN_SERVICE_URN := "urn:service:sos.unknown";

		// ECRF Configurations
		modulepar XSD.String PX_ECRF_SOURCE := "ecrf1.gridgears.plugtests.net";
		modulepar XSD.String PX_ECRF_SOURCE := "ecrf1.etsi.plugtests.net";

		// Usually the same as PX_ECRF_SOURCE
		modulepar XSD.String PX_ECRF_VIA := "ecrf1.gridgears.plugtests.net";
		modulepar XSD.String PX_ECRF_VIA := "ecrf1.etsi.plugtests.net";

		// Usually the same as PX_ECRF_SOURCE
		modulepar XSD.Token PX_ECRF_NAPTR := "ecrf1.gridgears.plugtests.net";
		modulepar XSD.Token PX_ECRF_NAPTR := "ecrf1.etsi.plugtests.net";

		modulepar StringSet PX_CONFIGURED_SERVICES := { "urn:service:sos", "urn:service:sos.ambulance", "urn:service:sos.fire", "urn:service:sos.police" };
		modulepar XSD.Token PX_REDIRECT_TARGET := "other.ecrf.plugtests.net";