implementation of XML values within user data (153a005a) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterShDh

ttcn/DiameterShDh_TCFunctions.ttcn3

+12 −11

Original line number	Diff line number	Diff line
		@@ -1142,7 +1142,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(SMS_REGISTRATION_INFO_E),
		m_user_Data_shData(encvalue_o(m_shImsData(m_imsdata_ext(m_imsdata_ext2(m_imsdata_ext3)))))
		m_user_Data_shData(encvalue_o(m_shImsData(m_imsdata_ext(m_imsdata_ext2(m_imsdata_ext3))))) // TODO: IP-SM-GW element
		)
		)
		);
		@@ -1189,7 +1189,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(SMS_REGISTRATION_INFO_E),
		m_user_Data_shData(char2oct("shimsdata_extension3")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_shImsData(m_imsdata_ext(m_imsdata_ext2(m_imsdata_ext3)))))
		)
		)
		);
		@@ -1235,7 +1235,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(STN_SR_E),
		m_user_Data_shData(char2oct("shimsdata_extension4_stn-sr")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_shImsData(m_imsdata_ext(m_imsdata_ext2(m_imsdata_ext3(m_imsdata_ext4))))))
		)
		)
		);
		@@ -1281,7 +1281,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(STN_SR_E),
		m_user_Data_shData(char2oct("shimsdata_extension4_stn-sr")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_shImsData(m_imsdata_ext(m_imsdata_ext2(m_imsdata_ext3(m_imsdata_ext4))))))
		)
		)
		);
		@@ -1327,7 +1327,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata_serviceinfo_seqnr")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_tSh_Data({m_repositoryData})))
		)
		)
		);
		@@ -1373,7 +1373,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata_serviceinfo_seqnr=0")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_tSh_Data({m_repositoryData(-,0)})))
		)
		)
		);
		@@ -1419,7 +1419,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata_serviceinfo_seqnr_servicedata>expected")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_tSh_Data({m_repositoryData(-,0, {elem:= "1"} )}))) //TODO serviceData value
		)
		)
		);
		@@ -1465,7 +1465,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata_serviceinfo_seqnr!=0")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_tSh_Data({m_repositoryData(-,1,-)})))
		)
		)
		);
		@@ -1511,7 +1511,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata_serviceinfo_seqnr_servicedata=empty")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_tSh_Data({m_repositoryData(-,1,{elem:= ""})}))) //TODO empty serviceData value
		)
		)
		);
		@@ -1557,7 +1557,7 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata_serviceinfo_seqnr_servicedata>expected")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_tSh_Data({m_repositoryData(-,0, {elem:= "1"} )}))) //TODO serviceData value
		)
		)
		);
		@@ -1647,7 +1647,8 @@ module DiameterShDh_TCFunctions {
		m_public_user_identity(PX_PublicUserIdentity)
		),
		m_data_Reference(REPOSITORY_DATA_E),
		m_user_Data_shData(char2oct("shdata_repositorydata(0)_serviceinfo_seqnr_servicedata_empty-repositorydata(1)_serviceinfo_seqnr_servicedata_empty")) //TODO import XML Schema
		// m_user_Data_shData(char2oct("shdata_repositorydata(0)_serviceinfo_seqnr_servicedata_empty-repositorydata(1)_serviceinfo_seqnr_servicedata_empty")) //TODO import XML Schema
		m_user_Data_shData(encvalue_o(m_tSh_Data({m_repositoryData(-,1,{elem:= ""}),m_repositoryData(-,1,{elem:= ""})}))) //TODO empty serviceData value
		)
		)
		);

ttcn/DiameterShDh_Templates.ttcn3

+30 −2

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ module DiameterShDh_Templates {
		extension_ := p_extension_
		}

		template TShIMSDataExtension3 m_imsdata_ext3:= {
		template TShIMSDataExtension3 m_imsdata_ext3 (template TShIMSDataExtension4 p_extension_:= omit):= {
		serviceLevelTraceInfo := omit,
		iPv4Address := omit,
		iPv6Prefix := omit,
		@@ -213,7 +213,15 @@ module DiameterShDh_Templates {
		servicePriorityLevel := omit,
		uEReachabilityForIP := omit,
		sMSRegistrationInfo := omit,
		extension_ := omit
		extension_ := p_extension_
		}

		template TShIMSDataExtension4 m_imsdata_ext4 (template TShIMSDataExtension5 p_extension_:= omit):={
		sTN_SR := "",
		uE_SRVCC_Capability := omit,
		extendedPriority_list := {},
		cSRN := omit,
		extension_ := p_extension_
		}

		template TSh_Data mw_tSh_Data (template (present) TSh_Data.repositoryData_list p_repositoryData_list):= {
		@@ -228,6 +236,18 @@ module DiameterShDh_Templates {
		elem_list := ?
		}

		template TSh_Data m_tSh_Data (TSh_Data.repositoryData_list p_repositoryData_list):= {
		publicIdentifiers := omit,
		repositoryData_list := p_repositoryData_list,
		sh_IMS_Data := omit,
		cSLocationInformation := omit,
		pSLocationInformation := omit,
		cSUserState := omit,
		pSUserState := omit,
		extension_ := omit,
		elem_list := {}
		}

		template TTransparentData mw_repositoryData:= {
		serviceIndication := ?,
		sequenceNumber := ?,
		@@ -236,6 +256,14 @@ module DiameterShDh_Templates {
		elem_list := ?
		}

		template TTransparentData m_repositoryData (TString p_serviceIndication:="", TSequenceNumber p_sequenceNumber:=0, template (omit) TServiceData p_serviceData:=omit):= {
		serviceIndication := p_serviceIndication,
		sequenceNumber := p_sequenceNumber,
		serviceData := p_serviceData,
		extension_ := omit,
		elem_list := {}
		}

		}// End of group Sh_XML_templates

		group Sh_modified_message_templates {