xsd types removed (705221c8) · Commits · TTCN-3 Libraries / LibSip

ttcn/LibSip_Templates.ttcn

+1 −209

Original line number	Original line	Diff line number	Diff line
	@@ -22,37 +22,6 @@ module LibSip_Templates
	import from LibSip_PIXITS all;		import from LibSip_PIXITS all;
	import from LibSip_XMLTypes all;		import from LibSip_XMLTypes all;

	//LibXMLTypes
	import from ietf_params_xml_ns_resource_lists language "XSD" all
	with {
	extension "File:../xsd/ResourceList.xsd"
	}

	import from org_etsi_uri__ngn_params_xml_simservs_xcap language "XSD" all
	with {
	extension "File:../xsd/SupplementaryServices.xsd"
	}

	import from org_etsi_uri__ngn_params_xml_simservs_mcid language "XSD" all
	with {
	extension "File:../xsd/MCID.xsd"
	}

	import from Ims3gpp language "XSD" all
	with {
	extension "File:../xsd/Ims3gpp.xsd"
	}

	import from ietf_params_xml_ns_conference_info language "XSD" all
	with {
	extension "File:../xsd/CONF.xsd"
	}

	import from org_etsi_uri__ngn_params_xml_simservs_pstn language "XSD" all
	with {
	extension "File:../xsd/PSTN.xsd"
	}

	group ModuleParameters {		group ModuleParameters {

	modulepar boolean MB_LENGTH_FROM_ENCVAL:=false; //* to get length of message body from ecoded value		modulepar boolean MB_LENGTH_FROM_ENCVAL:=false; //* to get length of message body from ecoded value
	@@ -2721,49 +2690,6 @@ group MessageBodies {
	}		}
	}		}
	}		}

	template MessageBody mw_MBody_MIME_Ims3gpp(
	template charstring p_disposition,
	template TIMS3GPP p_ims3gpp
	):= {
	mimeMessageBody := {boundary:=?,
	mimeEncapsulatedList:= {
	*,
	{
	content_type:= c_ims3gppAplication,
	content_disposition:= p_disposition,
	mime_encapsulated_part :={
	xmlBody := {
	ims3gpp := p_ims3gpp
	}
	}
	},
	*
	}
	}
	}

	template MessageBody mw_MBody_MIME_Ims3gppCW(
	template charstring p_disposition,
	template TIMS3GPP p_ims3gpp
	):= {
	mimeMessageBody := {boundary:=?,
	mimeEncapsulatedList:= {
	*,
	{
	content_type:= c_ims3gppCwApplication,
	content_disposition:= p_disposition,
	mime_encapsulated_part :={
	xmlBody := {
	ims3gpp := p_ims3gpp
	}
	}
	},
	*
	}
	}
	}

	}		}
	/*		/*
	*		*
	@@ -3055,143 +2981,9 @@ group TemplatePreparationFunctions {
	*/		*/
	function f_XMLBody_Length(XmlBody p_mb, boolean p_ext_func) return integer		function f_XMLBody_Length(XmlBody p_mb, boolean p_ext_func) return integer
	{		{
	var integer v_result:=0;		return lengthof(p_mb.body);

	if ( p_ext_func){
	v_result := fx_calculateXMLBodyLen(p_mb);
	}else{
	// assume ConferenceInfo ONLY in the XML message body
	if (ischosen(p_mb.conference_type))
	{
	v_result := f_XMLBody_ConferenceInfo_Length(p_mb.conference_type);
	};

	// assume CUG ONLY in the XML message body
	if (ischosen(p_mb.cug))
	{
	v_result := f_XMLBody_Cug_Length(p_mb.cug);
	};

	// assume MCID ONLY in the XML message body
	if (ischosen(p_mb.mcid))
	{
	v_result := f_XMLBody_Mcid_Length(p_mb.mcid);
	};

	// assume PSTNTransit ONLY in the XML message body
	if (ischosen(p_mb.pstnTransit))
	{
	v_result := f_XMLBody_PSTNTransit_Length(p_mb.pstnTransit);
	};

	// assume Simservs ONLY in the XML message body
	if (ischosen(p_mb.simservs))
	{
	v_result := f_XMLBody_Simservs_Length(p_mb.simservs);
	};

	// assume ResourceLists ONLY in the XML message body
	if (ischosen(p_mb.resourceLists))
	{
	v_result := f_XMLBody_ResourceList_Length(p_mb.resourceLists);
	};

	// assume Ims3GPP ONLY in the XML message body
	if (ischosen(p_mb.ims3gpp))
	{
	v_result := f_XMLBody_Ims3GPP_Length(p_mb.ims3gpp);
	};

	/** Add aditional checks regarding to new variants,
	* also implement appropriate function for calculation
	*/
	}
	return v_result
	} //* f_XMLBodyLength		} //* f_XMLBodyLength

	group XMLBodies_calculation{

	/**
	*
	* @desc Calculation of XML ConferenceInfo element length
	* @param p_mb contain XML ConfInfo body
	* @return xml_length
	*/
	function f_XMLBody_ConferenceInfo_Length(Conference_type p_mb) return integer
	{
	var integer v_result:= lengthof(encvalue(p_mb))/8;
	return v_result
	} //* f_XMLBody_ConferenceInfo_Length

	/**
	*
	* @desc Calculation of XML CUG element length
	* @param p_mb contain XML CUG body
	* @return xml_length
	*/
	function f_XMLBody_Cug_Length(Cug p_mb) return integer
	{
	var integer v_result:= lengthof(encvalue(p_mb))/8;
	return v_result
	} //* f_XMLBody_Cug_Length

	/**
	*
	* @desc Calculation of XML MCID element length
	* @param p_mb contain XML MCID body
	* @return xml_length
	*/
	function f_XMLBody_Mcid_Length(Mcid p_mb) return integer
	{
	var integer v_result:= lengthof(encvalue(p_mb))/8;

	return v_result
	} //* f_XMLBody_Mcid_Length

	/**
	*
	* @desc Calculation of XML PSTNTransit element length
	* @param p_mb contain XML PSTNTransit body
	* @return xml_length
	*/
	function f_XMLBody_PSTNTransit_Length(PSTN_transit p_mb) return integer
	{
	var integer v_result:= lengthof(encvalue(p_mb))/8;
	return v_result
	} //* f_XMLBody_PSTNTransit_Length

	/** @desc Calculation of XML Simservs element length
	* @param p_mb contain XML Simservs body
	* @return xml_length
	*/
	function f_XMLBody_Simservs_Length(Simservs p_mb) return integer
	{
	var integer v_result:= lengthof(encvalue(p_mb))/8;
	return v_result
	} //* f_XMLBody_Simservs_Length

	/** @desc Calculation of XML ResourceList length
	* @param p_mb contain XML ResourceList body
	* @return xml_length
	*/
	function f_XMLBody_ResourceList_Length(Resource_lists p_mb) return integer
	{
	var integer v_result:= lengthof(encvalue(p_mb))/8;
	return v_result
	} //* f_XMLBody_ResourceList_Length

	/** @desc Calculation of XML Ims3GPP length
	* @param p_mb contain XML Ims3GPP body
	* @return xml_length
	*/
	function f_XMLBody_Ims3GPP_Length(TIMS3GPP p_mb) return integer
	{
	var integer v_result:= lengthof(encvalue(p_mb))/8;
	return v_result
	} //* f_XMLBody_Ims3GPP_Length

	} //* XMLBodies_calculation

	}//* group XMLlen_calculation		}//* group XMLlen_calculation

	group MIME_Len_calculation{		group MIME_Len_calculation{

ttcn/LibSip_XMLTypes.ttcn

+1 −61

Original line number	Original line	Diff line number	Diff line
	@@ -27,69 +27,9 @@
	*/		*/
	module LibSip_XMLTypes language "TTCN-3:2009" {		module LibSip_XMLTypes language "TTCN-3:2009" {

	import from XSDAUX all;

	import from org_w3_www__XML_1998_namespace language "XSD" all
	with {
	extension "File:../xsd/xml.xsd"
	}

	import from ietf_params_xml_ns_common_policy language "XSD" all
	with {
	extension "File:../xsd/common-policy.xsd"
	}

	import from ietf_params_xml_ns_resource_lists language "XSD" all
	with {
	extension "File:../xsd/ResourceList.xsd"
	}

	import from org_etsi_uri__ngn_params_xml_simservs_xcap language "XSD" all
	with {
	extension "File:../xsd/SupplementaryServices.xsd"
	}

	import from org_etsi_uri__ngn_params_xml_simservs_mcid language "XSD" all
	with {
	extension "File:../xsd/MCID.xsd"
	}

	import from Ims3gpp language "XSD" all
	with {
	extension "File:../xsd/Ims3gpp.xsd"
	}

	import from ietf_params_xml_ns_conference_info language "XSD" all
	with {
	extension "File:../xsd/CONF.xsd"
	}

	import from org_etsi_uri__ngn_params_xml_simservs_pstn language "XSD" all
	with {
	extension "File:../xsd/PSTN.xsd"
	}

	import from org_etsi_uri__ngn_params_xml_comm_div_info language "XSD" all
	with {
	extension "File:../xsd/CDIVN.xsd"
	}

	import from oma_xml_xdm_common_policy language "XSD" all
	with {
	extension "File:../xsd/xdm_commonPolicy-v1_0.xsd"
	}


	group XmlTypes {		group XmlTypes {
	type union XmlBody {		type union XmlBody {
	Mcid mcid, // if there is XML Mcid		charstring body
	Comm_div_info_type cdivn, // if there is XML cdivn
	Simservs simservs, // if there is XML simservs (Oip/r, Tip/r, Call Diversion, ICB, OCB ...)
	Conference_type conference_type, // if there is XML conf
	Cug cug, // if there is XML cug (defined in org_etsi_uri__ngn_params_xml_simservs_xcap.ttcn3view)
	TIMS3GPP ims3gpp, // if there is XML IMS 3GPP
	PSTN_transit pstnTransit, // if there is XML PSTN_transit
	Resource_lists resourceLists // if there is XML Resource List data
	}		}
	}		}
	} /* end module LibSip_XMLTypes */		} /* end module LibSip_XMLTypes */
			No newline at end of file