Compiles on TT, Reginfo and Register types are converted differently for TT... (2f7e5c5d) · Commits · TTCN-3 Libraries / LibIms

ttcn/LibIms_Templates.ttcn

+41 −42

Original line number	Diff line number	Diff line
		@@ -529,22 +529,21 @@ group XMLTemplates {
		template XmlBody
		m_XmlBody_ACR_ICB(template Incoming_communication_barring p_icb) := {
		simservs := {
		{},
		{{incoming_communication_barring := p_icb}},
		{{}}
		}
		absServiceGroup_list := {},
		extensions := {
		elem_list := p_icb.attr
		},
		attr := {}
		}
		};

		template XmlBody m_XmlBody_ACR_OCB(template Outgoing_communication_barring p_ocb) :=
		{
		template XmlBody m_XmlBody_ACR_OCB(template Outgoing_communication_barring p_ocb) := {
		simservs := {
		{},
		{
		{
		outgoing_communication_barring := p_ocb
		}
		absServiceGroup_list := {},
		extensions := {
		elem_list := p_ocb.attr
		},
		{{}}
		attr := {}
		}
		};

		@@ -568,7 +567,7 @@ group XMLTemplates {
		0,
		{m_registration(p_user)},
		{}
		}
		};

		template Registration m_registration (template XSDAUX.anyURI p_user):= {
		p_user, // XSDAUX.anyURI aor
		@@ -576,7 +575,7 @@ group XMLTemplates {
		init, //enumerated {active,init,terminated} state,
		{}, // record of Contact contact_list optional,
		{} // record of anytype elem_list optional
		}
		};

		template XmlBody mw_XmlBody_ConfInfo(template Conference_type p_confInfo) :=
		{
		@@ -625,7 +624,7 @@ group ACR_CBTemplates {
		template Incoming_communication_barring m_ICB(template RuleType p_ruleType) :=
		{
		active := omit,
		attr := omit,
		attr := {},
		ruleset := {
		{p_ruleType}
		}
		@@ -634,7 +633,7 @@ group ACR_CBTemplates {
		template Outgoing_communication_barring m_OCB(template(present) RuleType p_ruleType) :=
		{
		active := omit,
		attr := omit,
		attr := {},
		ruleset := {
		{p_ruleType}
		}
		@@ -665,7 +664,7 @@ group CUGTemplates {
		template TwoBitType p_cci
		):= {
		active := omit,
		attr := omit,
		attr := {},
		cugCallOperation := p_crt,
		networkIndicator := p_nit,
		cugInterlockBinaryCode := p_cibc,
		@@ -679,7 +678,7 @@ group CUGTemplates {
		template TwoBitType p_cci
		):= {
		active := omit,
		attr := omit,
		attr := ?,
		cugCallOperation := p_crt,
		networkIndicator := p_nit,
		cugInterlockBinaryCode := p_cibc,
		@@ -702,13 +701,13 @@ group CUGTemplates {
		group CWTemplates {

		template Ims_cw m_CW(template TEmptyType p_cwi) := {
		attr := omit,
		attr := {},
		communication_waiting_indication := p_cwi,
		elem_list := {}
		}

		template Ims_cw mw_ims_cw(template TEmptyType p_cwi) := {
		attr := omit,
		attr := ?,
		communication_waiting_indication := p_cwi,
		elem_list := ?
		}
		@@ -720,7 +719,7 @@ group CWTemplates {
		template TwoBitType p_cci
		):= {
		active := omit,
		attr := omit,
		attr := {},
		cugCallOperation := p_crt,
		networkIndicator := p_nit,
		cugInterlockBinaryCode := p_cibc,
		@@ -734,7 +733,7 @@ group CWTemplates {
		template TwoBitType p_cci
		):= {
		active := omit,
		attr := omit,
		attr := ?,
		cugCallOperation := p_crt,
		networkIndicator := p_nit,
		cugInterlockBinaryCode := p_cibc,
		@@ -1056,9 +1055,9 @@ group CDIVNTemplates {
		template Comm_div_info_type m_CDIVN_sub := {
		entity := "comm-div-info",
		comm_div_subs_info := {
		attr := omit,
		attr := {},
		comm_div_selection_criteria := {
		attr := omit,
		attr := {},
		originating_user_selection_criteria := omit,
		diverting_user_selection_criteria := omit,
		diverted_to_user_selection_criteria := omit,
		@@ -1089,7 +1088,7 @@ group ResourceListsTemplates {
		{
		list := {
		name := omit,
		attr := omit,
		attr := {},
		display_name := omit,
		sequence_list := {
		{
		@@ -1114,7 +1113,7 @@ group ResourceListsTemplates {
		uri :=
		p_user.userInfo.userOrTelephoneSubscriber & "@" &
		p_user.hostPort.host,
		attr := omit,
		attr := {},
		display_name := omit,
		elem_list := {}
		}
		@@ -1125,10 +1124,10 @@ group Ims3gppTemplates {
		//TODO:check commented and below templates when test will be validated
		template TIMS3GPP mw_Ims_3gpp_CW := {
		version := 1.0,
		attr := omit,
		attr := ?,
		choice := {
		alternative_service := {
		attr := omit,
		attr := ?,
		type_ := ?,
		reason := ?,
		elem_list := ?
		@@ -1165,7 +1164,7 @@ group CONFTemplates {

		template urn_ietf_params_xml_ns_conference_info.Media_type m_mediatype_status(template Media_status_type p_status):= {
		id:="1",
		attr := omit,
		attr := {},
		display_text :=omit,
		type_ :=omit,
		label_ :=omit,
		@@ -1177,7 +1176,7 @@ group CONFTemplates {
		template Endpoint_type m_endpoint(template charstring p_Uri,template Endpoint_status_type p_epStatus,template Joining_type p_joinMethod, template Disconnection_type p_discMethod, template urn_ietf_params_xml_ns_conference_info.Media_type p_mediastatus):= {
		entity:=p_Uri,
		state:=full,
		attr := omit,
		attr := {},
		display_text:=omit,
		referred:=omit,
		status:=p_epStatus,
		@@ -1193,7 +1192,7 @@ group CONFTemplates {
		template User_type m_1user (template charstring p_Uri,template Endpoint_type p_endpoint) := {
		entity:=p_Uri,
		state:=full,
		attr := omit,
		attr := {},
		display_text:=omit,
		associated_aors:=omit,
		roles:=omit,
		@@ -1205,20 +1204,20 @@ group CONFTemplates {

		template Users_type m_users_1user_full(template User_type p_user):={
		state:=full,
		attr := omit,
		attr := {},
		user_list:={p_user},
		elem_list:={}
		}

		template Users_type m_users_2user_full(template User_type p_user1,template User_type p_user2):={
		state:=full,
		attr := omit,
		attr := {},
		user_list:={p_user1,p_user2},
		elem_list:={}
		}

		template Conference_state_type m_conference_state(template unsignedInt p_nUsers, boolean p_active, boolean p_locked) := {
		attr := omit,
		attr := {},
		user_count:=p_nUsers,
		active:=p_active,
		locked:=p_locked,
		@@ -1229,7 +1228,7 @@ group CONFTemplates {
		entity := p_cUri,
		state := full,
		version := 1,
		attr := omit,
		attr := {},
		conference_description := omit,
		host_info := omit,
		conference_state := p_cState,

Admin message