Skip to content
GitLab
Commit 60d9a104 authored by canterburym's avatar canterburym
Browse files

TS 103 280 v2.1.1 (2017-08-04) agreed at LI#45 (Tallinn, 2017-06-20)

parent f835c49b
Pipeline #4117 passed with stage
in 6 seconds
Hide whitespace changes
Inline Side-by-side
103280/TS_103_280.asn1
View file @ 60d9a104
Common-Parameters Common-Parameters
{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN
-- Object Identifier definitions -- Object Identifier definitions
commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
-- Common Parameter: LIID (as defined in clause 6) -- Common Parameter: LIID (as defined in clause 6)
LIID ::= OCTET STRING (SIZE (1..25)) LIID ::= OCTET STRING (SIZE (1..25))
-- Common Parameter: TCPPort (as defined in clause 6)
TCPPort ::= INTEGER (1..65535)
-- Common Parameter: TCPPortRange (as defined in clause 6)
TCPPortRange ::= SEQUENCE
{
start [0] TCPPort,
end [1] TCPPort
}
-- Common Parameter: UDPPort (as defined in clause 6)
UDPPort ::= INTEGER (0..65535)
-- Common Parameter: UDPPortRange (as defined in clause 6)
UDPPortRange ::= SEQUENCE
{
start [0] UDPPort,
end [1] UDPPort
}
-- Common Parameter: Port (as defined in clause 6)
Port ::= CHOICE
{
tCPPort [0] TCPPort,
uDPPort [1] UDPPort
}
-- Common Parameter: PortRange (as defined clause 6)
PortRange ::= CHOICE
{
tCPPortRange [0] TCPPortRange,
uDPPortRange [1] UDPPortRange
}
END END
103280/TS_103_280.xsd
View file @ 60d9a104
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2015/08" targetNamespace="http://uri.etsi.org/03280/common/2015/08" version="1.1.1" elementFormDefault="qualified"> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.1.1" elementFormDefault="qualified">
<xs:simpleType name="ShortString"> <xs:simpleType name="ShortString">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="255"/> <xs:maxLength value="255"/>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="IMSI"> <xs:simpleType name="IMSI">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:pattern value="[0-9]{15}"/> <xs:pattern value="[0-9]{6,15}"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="IMEI"> <xs:simpleType name="IMEI">
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<xs:element name="IPv4Address" type="IPv4Address"/> <xs:element name="IPv4Address" type="IPv4Address"/>
<xs:element name="IPv6Address" type="IPv6Address"/> <xs:element name="IPv6Address" type="IPv6Address"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="IPCIDR"> <xs:complexType name="IPCIDR">
<xs:choice> <xs:choice>
<xs:element name="IPv4CIDR" type="IPv4CIDR"/> <xs:element name="IPv4CIDR" type="IPv4CIDR"/>
<xs:element name="IPv6CIDR" type="IPv6CIDR"/> <xs:element name="IPv6CIDR" type="IPv6CIDR"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:simpleType name="TCPPort"> <xs:simpleType name="TCPPort">
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<xs:minExclusive value="1"/> <xs:minExclusive value="1"/>
...@@ -116,25 +116,25 @@ ...@@ -116,25 +116,25 @@
<xs:element name="TCPPort" type="TCPPort"/> <xs:element name="TCPPort" type="TCPPort"/>
<xs:element name="UDPPort" type="UDPPort"/> <xs:element name="UDPPort" type="UDPPort"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="PortRange"> <xs:complexType name="PortRange">
<xs:choice> <xs:choice>
<xs:element name="TCPPortRange" type="TCPPortRange"/> <xs:element name="TCPPortRange" type="TCPPortRange"/>
<xs:element name="UDPPortRange" type="UDPPortRange"/> <xs:element name="UDPPortRange" type="UDPPortRange"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="IPAddressPort"> <xs:complexType name="IPAddressPort">
<xs:sequence> <xs:sequence>
<xs:element name="address" type="IPAddress"/> <xs:element name="address" type="IPAddress"/>
<xs:element name="port" type="Port"/> <xs:element name="port" type="Port"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="IPAddressPortRange"> <xs:complexType name="IPAddressPortRange">
<xs:sequence> <xs:sequence>
<xs:element name="address" type="IPAddress"/> <xs:element name="address" type="IPAddress"/>
<xs:element name="portRange" type="PortRange"/> <xs:element name="portRange" type="PortRange"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="MACAddress"> <xs:simpleType name="MACAddress">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/> <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
...@@ -155,4 +155,14 @@ ...@@ -155,4 +155,14 @@
<xs:pattern value="[A-Z]{2}"/> <xs:pattern value="[A-Z]{2}"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="SIPURI">
<xs:restriction base="xs:anyURI">
<xs:pattern value="sips?:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="TELURI">
<xs:restriction base="xs:anyURI">
<xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
</xs:restriction>
</xs:simpleType>
</xs:schema> </xs:schema>
103280/portal/TS_103_280_v010201.asn1 deleted 100644 → 0
View file @ f835c49b
Common-Parameters
{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN
-- Object Identifier definitions
commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)}
-- Common Parameter: LIID (as defined in clause 6)
LIID ::= OCTET STRING (SIZE (1..25))
END
103280/portal/TS_103_280_v020101.asn1 0 → 100644
View file @ 60d9a104
Common-Parameters
{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN
-- Object Identifier definitions
commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
-- Common Parameter: LIID (as defined in clause 6)
LIID ::= OCTET STRING (SIZE (1..25))
-- Common Parameter: TCPPort (as defined in clause 6)
TCPPort ::= INTEGER (1..65535)
-- Common Parameter: TCPPortRange (as defined in clause 6)
TCPPortRange ::= SEQUENCE
{
start [0] TCPPort,
end [1] TCPPort
}
-- Common Parameter: UDPPort (as defined in clause 6)
UDPPort ::= INTEGER (0..65535)
-- Common Parameter: UDPPortRange (as defined in clause 6)
UDPPortRange ::= SEQUENCE
{
start [0] UDPPort,
end [1] UDPPort
}
-- Common Parameter: Port (as defined in clause 6)
Port ::= CHOICE
{
tCPPort [0] TCPPort,
uDPPort [1] UDPPort
}
-- Common Parameter: PortRange (as defined clause 6)
PortRange ::= CHOICE
{
tCPPortRange [0] TCPPortRange,
uDPPortRange [1] UDPPortRange
}
END
103280/portal/TS_103_280_v010101.xsd → 103280/portal/TS_103_280_v020101.xsd
View file @ 60d9a104
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2015/08" targetNamespace="http://uri.etsi.org/03280/common/2015/08" version="1.1.1" elementFormDefault="qualified"> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.1.1" elementFormDefault="qualified">
<xs:simpleType name="ShortString"> <xs:simpleType name="ShortString">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="255"/> <xs:maxLength value="255"/>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="IMSI"> <xs:simpleType name="IMSI">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:pattern value="[0-9]{15}"/> <xs:pattern value="[0-9]{6,15}"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="IMEI"> <xs:simpleType name="IMEI">
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<xs:element name="IPv4Address" type="IPv4Address"/> <xs:element name="IPv4Address" type="IPv4Address"/>
<xs:element name="IPv6Address" type="IPv6Address"/> <xs:element name="IPv6Address" type="IPv6Address"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="IPCIDR"> <xs:complexType name="IPCIDR">
<xs:choice> <xs:choice>
<xs:element name="IPv4CIDR" type="IPv4CIDR"/> <xs:element name="IPv4CIDR" type="IPv4CIDR"/>
<xs:element name="IPv6CIDR" type="IPv6CIDR"/> <xs:element name="IPv6CIDR" type="IPv6CIDR"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:simpleType name="TCPPort"> <xs:simpleType name="TCPPort">
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<xs:minExclusive value="1"/> <xs:minExclusive value="1"/>
...@@ -116,25 +116,25 @@ ...@@ -116,25 +116,25 @@
<xs:element name="TCPPort" type="TCPPort"/> <xs:element name="TCPPort" type="TCPPort"/>
<xs:element name="UDPPort" type="UDPPort"/> <xs:element name="UDPPort" type="UDPPort"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="PortRange"> <xs:complexType name="PortRange">
<xs:choice> <xs:choice>
<xs:element name="TCPPortRange" type="TCPPortRange"/> <xs:element name="TCPPortRange" type="TCPPortRange"/>
<xs:element name="UDPPortRange" type="UDPPortRange"/> <xs:element name="UDPPortRange" type="UDPPortRange"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="IPAddressPort"> <xs:complexType name="IPAddressPort">
<xs:sequence> <xs:sequence>
<xs:element name="address" type="IPAddress"/> <xs:element name="address" type="IPAddress"/>
<xs:element name="port" type="Port"/> <xs:element name="port" type="Port"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="IPAddressPortRange"> <xs:complexType name="IPAddressPortRange">
<xs:sequence> <xs:sequence>
<xs:element name="address" type="IPAddress"/> <xs:element name="address" type="IPAddress"/>
<xs:element name="portRange" type="PortRange"/> <xs:element name="portRange" type="PortRange"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="MACAddress"> <xs:simpleType name="MACAddress">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/> <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
...@@ -155,4 +155,14 @@ ...@@ -155,4 +155,14 @@
<xs:pattern value="[A-Z]{2}"/> <xs:pattern value="[A-Z]{2}"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="SIPURI">
<xs:restriction base="xs:anyURI">
<xs:pattern value="sips?:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="TELURI">
<xs:restriction base="xs:anyURI">
<xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
</xs:restriction>
</xs:simpleType>
</xs:schema> </xs:schema>
Supports Markdown
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