Commit 74f0f51f authored by canterburym's avatar canterburym

Merge branch 'trialmerge/sa93e/1' into 'main'

Trial merge for SA93e

See merge request !94
parents e1dfe288 bd01b8d9
Pipeline #5275 passed with stages
in 2 minutes
TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version6(6)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version7(7)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
......@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs
-- =============
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version6(6)}
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version7(7)}
xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
......@@ -253,7 +253,8 @@ CCPDU ::= CHOICE
{
uPFCCPDU [1] UPFCCPDU,
extendedUPFCCPDU [2] ExtendedUPFCCPDU,
mMSCCPDU [3] MMSCCPDU
mMSCCPDU [3] MMSCCPDU,
pTCCCPDU [4] PTCCCPDU
}
-- ===========================
......@@ -1704,6 +1705,11 @@ PTCAccessPolicy ::= SEQUENCE
pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL
}
-- =========
-- PTC CCPDU
-- =========
PTCCCPDU ::= OCTET STRING
-- =================
-- 5G PTC parameters
......
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v3"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v4"
xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"
xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v3"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v4"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
......@@ -143,7 +143,7 @@
<xs:simpleType name="TAC">
<xs:restriction base="xs:string">
<xs:pattern value="[A-Fa-f0-9]{4}"></xs:pattern>
<xs:pattern value="([A-Fa-f0-9]{2}){2,3}"></xs:pattern>
</xs:restriction>
</xs:simpleType>
......
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v1"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v2"
xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"
xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v1"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v2"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
......@@ -143,7 +143,7 @@
<xs:simpleType name="TAC">
<xs:restriction base="xs:string">
<xs:pattern value="[A-Fa-f0-9]{4}"></xs:pattern>
<xs:pattern value="([A-Fa-f0-9]{2}){2,3}"></xs:pattern>
</xs:restriction>
</xs:simpleType>
......
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r16:v3"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r16:v3"
xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:element name="X1Extensions" type="X1Extension"></xs:element>
<xs:complexType name="X1Extensions">
<xs:sequence>
......@@ -11,8 +14,8 @@
</xs:sequence>
</xs:complexType>
<xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"></xs:element>
<xs:complexType name="PTCLIX1TargetIdentifierExtensions">
<xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"></xs:element>
<xs:complexType name="PTCLIX1TargetIdentifierExtensions">
<xs:sequence>
<xs:element name="PTCLIX1TargetIdentifier" type="PTCLIX1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
</xs:sequence>
......@@ -59,16 +62,16 @@
<xs:complexType name="FSEID">
<xs:sequence>
<xs:element name="SEID" type="xs:unsignedLong"></xs:element>
<xs:element name="IPv4Address" type="IPv4Address" minOccurs="0"></xs:element>
<xs:element name="IPv6Address" type="IPv6Address" minOccurs="0"></xs:element>
<xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"></xs:element>
<xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="FTEID">
<xs:sequence>
<xs:element name="TEID" type="xs:unsignedInt"></xs:element>
<xs:element name="IPv4Address" type="IPv4Address" minOccurs="0"></xs:element>
<xs:element name="IPv6Address" type="IPv6Address" minOccurs="0"></xs:element>
<xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"></xs:element>
<xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"></xs:element>
</xs:sequence>
</xs:complexType>
......@@ -175,24 +178,12 @@
<xs:complexType name="LILCSClientIPAddress">
<xs:sequence>
<xs:choice>
<xs:element name="IPv4Address" type="IPv4Address"/>
<xs:element name="IPv6Address" type="IPv6Address"/>
<xs:element name="IPv4Address" type="common:IPv4Address"/>
<xs:element name="IPv6Address" type="common:IPv6Address"/>
</xs:choice>
</xs:sequence>
</xs:complexType>
<xs:simpleType name="IPv4Address">
<xs:restriction base="xs:token">
<xs:pattern value="((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="IPv6Address">
<xs:restriction base="xs:token">
<xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="PDHRReportingExtensions">
<xs:sequence>
<xs:element name="PDHType" type="PDHType"></xs:element>
......@@ -245,4 +236,45 @@
</xs:simpleType>
<xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"></xs:element>
<xs:element name="AKMATargetIdentifier" type="AKMATargetIdentifier"></xs:element>
<xs:complexType name="AKMATargetIdentifier">
<xs:choice>
<xs:element name="AKID" type="common:NAI"></xs:element>
</xs:choice>
</xs:complexType>
<xs:element name="HR" type="EmptyElement"></xs:element>
<xs:element name="IMSSignaling" type="EmptyElement"></xs:element>
<xs:element name="HRLIT1TargetIdentifierExtensions" type="HRLIT1TargetIdentifierExtensions"></xs:element>
<xs:complexType name="HRLIT1TargetIdentifierExtensions">
<xs:sequence>
<xs:element name="HRLIT1TargetIdentifier" type="HRLIT1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="HRLIT1TargetIdentifier">
<xs:choice>
<xs:element name="PDUSessionID" type="PDUSessionID"></xs:element>
<xs:element name="BearerID" type="BearerID"></xs:element>
<xs:element name="IMSVoiceMedia" type="EmptyElement"></xs:element>
</xs:choice>
</xs:complexType>
<xs:simpleType name="PDUSessionID">
<xs:restriction base="xs:unsignedInt">
<xs:minInclusive value="0"/>
<xs:maxInclusive value="255"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="BearerID">
<xs:restriction base="xs:unsignedInt">
<xs:minInclusive value="0"/>
<xs:maxInclusive value="255"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment