Merge branch 'ttf_t009' of forge.etsi.org:emtel/NG112 into ttf_t009 (47ecd468) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

scripts/update_user_name.sh

0 → 100755

+16 −0

Original line number	Diff line number	Diff line
		#!/bin/bash

		# Debug mode
		#set -e
		#set -vx

		# Usage: sudo ./update_user_name.bash
		# TODO Use git clone in temporary directory

		USER_NAME='s/etsi/vagrant/g'
		for i in `find /home/vagrant/dev/$1 -name ".cf"`
		do
		sed --in-place ${USER_NAME} $i
		done

		exit 0

+1 −0

+22 −7

Original line number	Diff line number	Diff line
		@@ -863,8 +863,9 @@ module AtsPSAP_TestCases {
		// Test adapter configuration

		// Preamble
		v_point := encvalue_unichar(valueof(m_point(PX_PRESENCE_USER_POS, PX_SRS_NAME)));
		v_location_info := encvalue_unichar(valueof(m_geopriv(m_location_info({ v_point }), m_LocPolicyType)));
		//v_point := encvalue_unichar(valueof(m_point(PX_PRESENCE_USER_POS, PX_SRS_NAME)));
		//v_location_info := encvalue_unichar(valueof(m_geopriv(m_location_info({ point := m_point(PX_PRESENCE_USER_POS, PX_SRS_NAME) }), m_LocPolicyType)));
		v_location_info := encvalue_unichar(valueof(m_geopriv({ point := m_point(PX_PRESENCE_USER_POS, PX_SRS_NAME) }, m_LocPolicyType)));
		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);
		@@ -884,10 +885,24 @@ module AtsPSAP_TestCases {
		m_XmlBody_Presence(
		m_presence(
		PX_PRESENCE_USER,
		{ m_tuple(
		"fclnzj22sbtoxpj",
		{ basic := omit, elem_list := { v_location_info } }
		)
		{ //tuple_list
		{
		"0ehvxv4kxwrzzbp",
		{
		omit,
		m_geopriv({ point := m_point(PX_PRESENCE_USER_POS, PX_SRS_NAME) }, m_LocPolicyType),
		{ }
		},
		{},
		omit,
		{},
		omit
		}

		// m_tuple(
		// "fclnzj22sbtoxpj",
		// { basic := omit, elem_list := { v_location_info } }
		// )
		}
		)
		)

+14 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,20 @@ module LibNg112_Functions {
		return
		} // End of function f_incCSeq

		function f_checkUserInfo(
		in charstring p_message,
		in float p_expiry := 10.0
		) {
		timer tc := p_expiry;

		action(p_message);
		tc.start;
		alt {
		[] tc.timeout {
		log("f_checkUserInfo: Timer expiry")
		}
		}
		} // End of function f_checkUserInfo

		group altsteps {

+22 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,10 @@ module LibNg112_Templates {
		extension "File:../xsd/pidf.xsd";
		}

		// LibItsHttp
		import from LibItsHttp_XmlMessageBodyTypes all;
		import from LibItsHttp_XmlTemplates all;

		// LibNg112
		import from LibNg112_TypesAndValues all;

		@@ -436,6 +440,24 @@ module LibNg112_Templates {

		group dequeue_register {

		template (value) LibItsHttp_XmlMessageBodyTypes.XmlBody m_body_xml_dequeue_registration_request(
		in template (value) DequeueRegistrationRequest p_dequeue_registration_request
		) := {
		dequeueRegistrationRequest := p_dequeue_registration_request
		} // End of template m_dequeue_registration_request

		template (present) LibItsHttp_XmlMessageBodyTypes.XmlBody mw_body_xml_dequeue_registration_request(
		template (present) DequeueRegistrationRequest p_dequeue_registration_request := ?
		) := {
		dequeueRegistrationRequest := p_dequeue_registration_request
		} // End of template mw_dequeue_registration_request

		template (present) LibItsHttp_XmlMessageBodyTypes.XmlBody mw_body_xml_dequeue_registration_response(
		template (present) DequeueRegistrationResponse p_dequeue_registration_response := ?
		) := {
		dequeueRegistrationResponse := p_dequeue_registration_response
		} // End of template m_dequeue_registration_response

		template (omit) DequeueRegistrationRequest m_dequeue_registration_request(
		in template (value) DequeueRegistrationQueueUri p_registrationQueueUri,
		in template (value) DequeueRegistrationDequeuer p_registrationDequeuer,

+1 −1

File changed.

Contains only whitespace changes.