Add patch for TITAN xsd2ttcn issues and LibItsHttp architecture not defined yet (1516bdce) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

docker/Dockerfile

+2 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,8 @@ RUN cd /home/etsi/dev \
		&& git checkout TTCN_3_Developments \
		&& cd /home/etsi/dev/STF549_Ng112/ttcn \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibSip/trunk ./LibSip \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibCommon/trunk/ttcn ./LibCommon/ttcn \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibCommon/trunk/ttcn ./LibCommon \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibIts/branches/STF525/ttcn/Http ./LibHttp \
		&& cd /home/etsi/dev/STF549_Ng112/scripts \
		&& chmod 775 .bash devenv.bash. \
		&& cd /home/etsi \

scripts/ng112.bash

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \;
		find .. -type f -name "*.log" -exec rm {} \;

		# Build XSD files if any and put them in objs directory
		#XSD_PATH=${PATH_DEV_EMCOM}/xsd
		#XSD_PATH=${PATH_DEV_EMCOM}/src/LibSip/xsd
		XSD_PATH=${PATH_DEV_EMCOM}/null # Do not use xsd2ttcn for now, need to fix issues first
		if [ -d ${XSD_PATH} ]
		then

scripts/update_emcom_project.bash

+27 −23

Original line number	Diff line number	Diff line
		@@ -13,11 +13,11 @@ OLDPWD=`pwd`
		RUN_PATH="${0%/*}"

		CHOWN_USER_GROUP=vagrant:vagrant
		SRC_EMCOM_PATH=${HOME}/dev/STF549_ng112
		SRC_EMCOM_PATH=${HOME}/dev/STF549_Ng112

		if [ "${PATH_DEV_EMCOM}" == "" ]
		then
		PATH_DEV_EMCOM=`pwd`/../etsi_emcom
		PATH_DEV_EMCOM=${HOME}/dev/etsi_emcom
		fi

		if [ -d ${PATH_DEV_EMCOM} ]
		@@ -141,6 +141,8 @@ do
		cp ${CC_SRC_PATH}/Ports/$i/*.cc ${TTCN_3_DST_PATH}/$i/src
		cp ${CC_SRC_PATH}/include/$i/*.hh ${TTCN_3_DST_PATH}/$i/include
		cp ${CC_SRC_PATH}/src/$i/*.cc ${TTCN_3_DST_PATH}/$i/src
		# Patch TITAN due to issues in xsd2ttcn
		cp ${SRC_EMCOM_PATH}/ttcn/patch_sip_titan/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
		fi
		if [ "$i" == "LibHttp" ]
		then
		@@ -150,6 +152,8 @@ do
		cp ${CC_SRC_PATH}/Ports/$i/*.cc ${TTCN_3_DST_PATH}/$i/src
		cp ${CC_SRC_PATH}/include/$i/*.hh ${TTCN_3_DST_PATH}/$i/include
		cp ${CC_SRC_PATH}/src/$i/*.cc ${TTCN_3_DST_PATH}/$i/src
		# Patch due to svn/gitlab moving
		cp ${SRC_EMCOM_PATH}/ttcn/patch_lib_http/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
		fi
		done

ttcn/LibEmcom/LibNg112/xsd/NoTargetNamespace.ttcn

0 → 100644

+183 −0

Original line number	Diff line number	Diff line
		/*******************************************************************************
		* Copyright (c) 2000-2016 Ericsson Telecom AB
		*
		* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D
		*
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the Eclipse Public License v1.0
		* which accompanies this distribution, and is available at
		* http://www.eclipse.org/legal/epl-v10.html
		*******************************************************************************/
		//
		// File: NoTargetNamespace.ttcn
		// Description:
		// References:
		// Rev:
		// Prodnr:
		// Updated: Fri Mar 4 09:23:30 2016
		// Contact: http://ttcn.ericsson.se
		//
		////////////////////////////////////////////////////////////////////////////////
		// Generated from file(s):
		// - Ims3gpp.xsd
		// /* xml version = "1.0" encoding = "UTF-8" */
		// /* targetnamespace = "NoTargetNamespace" */
		////////////////////////////////////////////////////////////////////////////////
		// Modification header(s):
		//-----------------------------------------------------------------------------
		// Modified by:
		// Modification date:
		// Description:
		// Modification contact:
		//------------------------------------------------------------------------------
		////////////////////////////////////////////////////////////////////////////////


		module NoTargetNamespace {


		import from XSD all;


		type record TIMS3GPP
		{
		XSD.Decimal version,
		record of XSD.String attr optional,
		union {
		TAlternativeService alternative_service,
		XSD.String service_info
		} choice,
		record of XSD.String elem_list
		}
		with {
		variant "name as uncapitalized";
		variant (version) "attribute";
		variant (attr) "anyAttributes";
		variant (choice) "untagged";
		variant (choice.alternative_service) "name as 'alternative-service'";
		variant (choice.service_info) "name as 'service-info'";
		variant (elem_list) "untagged";
		variant (elem_list[-]) "anyElement";
		};


		type record TAlternativeService
		{
		record of XSD.String attr optional,
		TType type_,
		XSD.String reason,
		record of XSD.String elem_list
		}
		with {
		variant "name as uncapitalized";
		variant (attr) "anyAttributes";
		variant (type_) "name as 'type'";
		variant (elem_list) "untagged";
		variant (elem_list[-]) "anyElement";
		};


		type record TType
		{
		record of XSD.String attr optional,
		record of XSD.String elem_list
		}
		with {
		variant "name as uncapitalized";
		variant (attr) "anyAttributes";
		variant (elem_list) "untagged";
		variant (elem_list[-]) "anyElement";
		};


		type record TAction
		{
		record of XSD.String attr optional,
		record of XSD.String elem_list
		}
		with {
		variant "name as uncapitalized";
		variant (attr) "anyAttributes";
		variant (elem_list) "untagged";
		variant (elem_list[-]) "anyElement";
		};


		/* root element */


		type TIMS3GPP Ims_3gpp
		with {
		variant "name as 'ims-3gpp'";
		variant "element";
		};


		/* emergency element for //ims-3gpp//alternative-service//type */


		type record Emergency
		{

		}
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		/* restoration element for //ims-3gpp//alternative-service//type */


		type record Restoration
		{

		}
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		/* action element for //ims-3gpp//alternative-service */


		type TAction Action
		with {
		variant "name as uncapitalized";
		variant "element";
		};


		/* emergency-registration element for //ims-3gpp//alternative-service//action */


		type record Emergency_registration
		{

		}
		with {
		variant "name as 'emergency-registration'";
		variant "element";
		};


		/* initial-registration element for //ims-3gpp//alternative-service//action */


		type record Initial_registration
		{

		}
		with {
		variant "name as 'initial-registration'";
		variant "element";
		};


		}
		with {
		encode "XML";
		variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
		variant "elementFormQualified";
		}

ttcn/LibEmcom/LibNg112/xsd/UsefulTtcn3Types.ttcn

0 → 100644

+95 −0

Original line number	Diff line number	Diff line
		/*******************************************************************************
		* Copyright (c) 2000-2016 Ericsson Telecom AB
		*
		* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D
		*
		* All rights reserved. This program and the accompanying materials
		* are made available under the terms of the Eclipse Public License v1.0
		* which accompanies this distribution, and is available at
		* http://www.eclipse.org/legal/epl-v10.html
		*******************************************************************************/
		//
		// File: UsefulTtcn3Types.ttcn
		// Description:
		// References:
		// Rev:
		// Prodnr:
		// Updated:
		// Contact: http://ttcn.ericsson.se
		//
		////////////////////////////////////////////////////////////////////////////////
		module UsefulTtcn3Types {


		type integer byte (-128 .. 127) with { variant "/* 8 bit */" };

		type integer unsignedbyte (0 .. 255) with { variant "/unsigned 8 bit/" };

		type integer short (-32768 .. 32767) with { variant "/16 bit/" };

		type integer unsignedshort (0 .. 65535) with { variant "/unsigned 16 bit/" };

		type integer long (-2147483648 .. 2147483647) with { variant "/32 bit/" };

		type integer unsignedlong (0 .. 4294967295) with { variant "/unsigned 32 bit/" };

		type integer longlong /* ( -9223372036854775808 .. 9223372036854775807 ) / with { variant "/64 bit*/" };

		type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) / with { variant "/unsigned 64 bit*/" };

		type float IEEE754float with { variant "/IEEE754 float/" };

		type float IEEE754double with { variant "/IEEE754 double/" };

		type float IEEE754extfloat with { variant "/IEEE754 extended float/" };

		type float IEEE754extdouble with { variant "/IEEE754 extended double/" };

		type universal charstring utf8string with { variant "/UTF-8/" };

		type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/UCS-2/" };

		type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/UTF-16/" };

		type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/8 bit/" };

		type record IDLfixed
		{
		unsignedshort digits,
		short scale,
		charstring value_
		}
		with {
		variant "/IDL:fixed FORMAL/01-12-01 v.2.6/";
		};

		/*
		type charstring char length (1);

		NOTE 1: The name of this useful type is the same as the TTCN-3 keyword used to denote universal
		charstring values in the quadraple form. In general it is disallowed to use TTCN-3 keywords as
		identifiers. The "char" useful type is a solitary exception and allowed only for backward compatibility
		with previous versions of the TTCN-3 standard. (except Titan doesn't)

		NOTE 2: The special string "8 bit" defined in clause 28.2.3 may be used with this type to specify a given encoding
		for its values. Also, other properties of the base type can be changed by using attribute mechanisms.
		*/

		type universal charstring uchar length (1);

		/*
		NOTE: Special strings defined in clause 28.2.3 except "8 bit" may be used with this type to specify a given
		encoding for its values. Also, other properties of the base type can be changed by using attribute
		mechanisms.
		*/

		type bitstring bit length (1);

		type hexstring hex length (1);

		type octetstring octet length (1);

		}
		with {
		encode "XML";
		}