Merge branch 'cr/ts_102657/137_138_139_140' into 'meeting/LI58e' (bbe3392d) · Commits · Biagio Maione / TC LI schemas definitions

102657/RDMessage.asn

+56 −9

Original line number	Diff line number	Diff line
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)}
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version26(26)}

		DEFINITIONS IMPLICIT TAGS ::=

		@@ -12,7 +12,7 @@ BEGIN
		retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}

		-- rdHeader
		rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)}
		rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version26(26)}

		-- ======================================
		-- Top level definitions for RDHI wrapper
		@@ -837,9 +837,11 @@ TelephonyServiceUsage ::= SEQUENCE
		nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL,
		-- To be defined on a national basis
		-- Only to be used in case the present document cannot fulfil the national requirements
		operatorSpecificCallDetails [11] UTF8String OPTIONAL
		operatorSpecificCallDetails [11] UTF8String OPTIONAL,
		-- CSP specific value which indicates the nature of a call
		-- (e.g. "CallIndicator: GPR, CallActionCode: 2")
		trunkGroupIDs [12] TrunkGroupIDs OPTIONAL,
		interOperatorIDs [13] InterOperatorIDs OPTIONAL
		}

		NationalTelephonyServiceUsage ::= SEQUENCE
		@@ -1157,6 +1159,26 @@ TelephonyPartyRole ::= ENUMERATED
		mmsRecipientTrn(17)
		}

		TrunkGroupIDs ::= SEQUENCE
		{
		incomingTrunkGroupID [1] UTF8String OPTIONAL,
		-- identifies the incoming PSTN leg. Format as defined by the CSP.
		outgoingTrunkGroupID [2] UTF8String OPTIONAL,
		-- identifies the outgoing PSTN leg. Format as defined by the CSP.
		...
		}

		InterOperatorIDs ::= SEQUENCE
		{
		originatingInterOperatorID [1] UTF8String OPTIONAL,
		-- orig-ioi formated as defined in IETF RFC 7315 [55].
		terminatingInterOperatorID [2] UTF8String OPTIONAL,
		-- term-ioi, formated as defined in IETF RFC 7315 [55].
		transitInterOperatorIDList [3] UTF8String OPTIONAL,
		-- transit-ioi-list, formated as defined in IETF RFC 7315 [55].
		...
		}

		-- =======================
		-- Device Data definitions
		-- =======================
		@@ -1678,7 +1700,9 @@ MsgTransmission ::= SEQUENCE
		...,
		messageID [10] MessageID OPTIONAL,
		sourceServerName [11] UTF8String OPTIONAL,
		destinationServerName [12] UTF8String OPTIONAL
		destinationServerName [12] UTF8String OPTIONAL,
		clientPort [13] PortNumber OPTIONAL,
		serverPort [14] PortNumber OPTIONAL
		}

		MsgStoreOperation ::= SEQUENCE
		@@ -1700,7 +1724,11 @@ MsgStoreOperation ::= SEQUENCE
		addMsg(5),
		-- E.g. the APPEND command in IMAP
		...,
		editMsg(6)
		editMsg(6),
		sendMsg(7),
		-- Only applicable to webmail solutions
		forwardMsg(8)
		-- Only applicable to webmail solutions
		} OPTIONAL,
		senderAddress [5] MsgAddress OPTIONAL,
		-- For Internet email, use the From address in the mail headers
		@@ -1716,7 +1744,9 @@ MsgStoreOperation ::= SEQUENCE
		clientID [8] IPAddress OPTIONAL,
		serverID [9] IPAddress OPTIONAL,
		...,
		messageID [10] MessageID OPTIONAL
		messageID [10] MessageID OPTIONAL,
		clientPort [11] PortNumber OPTIONAL,
		serverPort [12] PortNumber OPTIONAL
		}

		MessageID ::= UTF8String
		@@ -1929,7 +1959,9 @@ MultimediaServiceUsage ::= SEQUENCE
		vmLength [21] INTEGER OPTIONAL, -- number of seconds
		reason [22] UTF8String OPTIONAL,
		smsInformation [23] SmsInformation OPTIONAL,
		mmsInformation [24] MmsInformation OPTIONAL
		mmsInformation [24] MmsInformation OPTIONAL,
		trunkGroupIDs [25] TrunkGroupIDs OPTIONAL,
		interOperatorIDs [26] InterOperatorIDs OPTIONAL
		}

		MultimediaPartyInformation ::= SEQUENCE
		@@ -2403,9 +2435,13 @@ WifiInformation ::= SEQUENCE
		accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL,
		-- Informal description of location, category or type of access point,
		-- or a name of the network to which the access point belongs.
		accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL
		accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL,
		-- For WiFi, there may be other parties involved in hosting or owning the
		-- Access Points, e.g. access point provider or partner providers
		cSPDefinedName [10] UTF8String OPTIONAL
		-- CSP-defined label or name assigned to the access point.
		-- The access points of a CSP within a venue or geographical location
		-- typically share this name.
		}

		AuthenticationType ::= ENUMERATED
		@@ -2787,6 +2823,17 @@ IPAddress ::= CHOICE
		...
		}

		PortNumber ::= CHOICE
		{
		tCPPort [0] TCPPort,
		uDPPort [1] UDPPort,
		...
		}

		TCPPort ::= INTEGER (1..65535)

		UDPPort ::= INTEGER (0..65535)

		NAAssignedAddress ::= SEQUENCE
		{
		addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL,

102657/RDMessage.xsd

+46 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0"?>
		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.27.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.27.1#/RetainedData" elementFormDefault="qualified">
		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.28.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.28.1#/RetainedData" elementFormDefault="qualified">
		<xsd:annotation>
		<xsd:documentation xml:lang="en">
		XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1
		XSD translated from ASN.1 derived from outcome of TS 102 657 v1.28.1
		</xsd:documentation>
		</xsd:annotation>
		<xsd:simpleType name="GeneralizedTime">
		@@ -223,6 +223,21 @@
		<xsd:any namespace="##other" processContents="lax"/>
		</xsd:choice>
		</xsd:complexType>
		<xsd:complexType name="TrunkGroupIDs">
		<xsd:sequence>
		<xsd:element name="incomingTrunkGroupID" type="xsd:string" minOccurs="0"/>
		<xsd:element name="outgoingTrunkGroupID" type="xsd:string" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="InterOperatorIDs">
		<xsd:sequence>
		<xsd:element name="originatingInterOperatorID" type="xsd:string" minOccurs="0"/>
		<xsd:element name="terminatingInterOperatorID" type="xsd:string" minOccurs="0"/>
		<xsd:element name="transitInterOperatorIDList" type="xsd:string" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:simpleType name="TelephonyDeviceID">
		<xsd:restriction base="xsd:hexBinary"/>
		</xsd:simpleType>
		@@ -349,6 +364,24 @@
		<xsd:any namespace="##other" processContents="lax"/>
		</xsd:choice>
		</xsd:complexType>
		<xsd:complexType name="PortNumber">
		<xsd:choice>
		<xsd:element name="TCPPort" type="TCPPort"/>
		<xsd:element name="UDPPort" type="UDPPort"/>
		</xsd:choice>
		</xsd:complexType>
		<xsd:simpleType name="TCPPort">
		<xsd:restriction base="xsd:integer">
		<xsd:minExclusive value="1"/>
		<xsd:maxInclusive value="65535"/>
		</xsd:restriction>
		</xsd:simpleType>
		<xsd:simpleType name="UDPPort">
		<xsd:restriction base="xsd:integer">
		<xsd:minInclusive value="0"/>
		<xsd:maxInclusive value="65535"/>
		</xsd:restriction>
		</xsd:simpleType>
		<xsd:complexType name="IPRange">
		<xsd:sequence>
		<xsd:element name="prefix" type="IPAddress"/>
		@@ -1089,6 +1122,8 @@
		<xsd:element name="mmsInformation" type="MmsInformation" minOccurs="0"/>
		<xsd:element name="nationalTelephonyServiceUsage" type="NationalTelephonyServiceUsage" minOccurs="0"/>
		<xsd:element name="operatorSpecificCallDetails" type="xsd:string" minOccurs="0"/>
		<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
		<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -1755,6 +1790,8 @@
		<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
		<xsd:element name="sourceServerName" type="xsd:string" minOccurs="0"/>
		<xsd:element name="destinationServerName" type="xsd:string" minOccurs="0"/>
		<xsd:element name="clientPort" type="PortNumber" minOccurs="0"/>
		<xsd:element name="serverPort" type="PortNumber" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -1773,6 +1810,8 @@
		<xsd:element name="deleteMsg" type="NULL"/>
		<xsd:element name="addMsg" type="NULL"/>
		<xsd:element name="editMsg" type="NULL"/>
		<xsd:element name="sendMsg" type="NULL"/>
		<xsd:element name="forwardMsg" type="NULL"/>
		</xsd:choice>
		</xsd:complexType>
		</xsd:element>
		@@ -1796,6 +1835,8 @@
		<xsd:element name="clientID" type="IPAddress" minOccurs="0"/>
		<xsd:element name="serverID" type="IPAddress" minOccurs="0"/>
		<xsd:element name="messageID" type="MessageID" minOccurs="0"/>
		<xsd:element name="clientPort" type="PortNumber" minOccurs="0"/>
		<xsd:element name="serverPort" type="PortNumber" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -2157,6 +2198,7 @@
		<xsd:element name="accessPointIPAddress" type="IPAddress" minOccurs="0"/>
		<xsd:element name="accessPointAdditionalDescriptions" type="xsd:string" minOccurs="0"/>
		<xsd:element name="accessPointAdditionalProviders" type="xsd:string" minOccurs="0"/>
		<xsd:element name="cSPDefinedName" type="xsd:string" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -2868,6 +2910,8 @@
		<xsd:element name="reason" type="xsd:string" minOccurs="0"/>
		<xsd:element name="smsInformation" type="SmsInformation" minOccurs="0"/>
		<xsd:element name="mmsInformation" type="MmsInformation" minOccurs="0"/>
		<xsd:element name="trunkGroupIDs" type="TrunkGroupIDs" minOccurs="0"/>
		<xsd:element name="interOperatorIDs" type="InterOperatorIDs" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>

Admin message