Commit be78a11b authored by canterburym's avatar canterburym
Browse files

Merge branch 'rap/103707' of forge.etsi.org:li/trial into rap/103707

parents ebe3f4c4 46943512
Pipeline #10678 passed with stage
in 34 seconds
......@@ -51,7 +51,9 @@ IPMMCC ::= SEQUENCE
-- May contain c= and m= lines extracts for instance
mMCCprotocol [4] MMCCprotocol OPTIONAL
-- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.)
-- Absence means mMCCContents contains RTP/RTCP packets
-- Absence means mMCCContents contains RTP/RTCP packets or audio frame as indicated by the
-- frameType parameter.
}
FrameType ::= ENUMERATED
......
......@@ -27,7 +27,7 @@
</xs:complexContent>
</xs:complexType>
<xs:complexType name="Reference">
<xs:complexType name="Reference">
<xs:choice>
<xs:element name="LDID" type="etsi:LDID"/>
<xs:element name="LIID" type="etsi:LIID"/>
......@@ -39,7 +39,7 @@
<xs:element name="Specification" type="common:DictionaryEntry"/>
<xs:element name="ExternalSchema" type="ExternalSchema"/>
</xs:choice>
</xs:complexType>
</xs:complexType>
<xs:complexType name="ExternalSchema">
<xs:sequence>
......@@ -59,7 +59,7 @@
<xs:sequence>
<xs:element name="schema" xmlns="http://www.w3.org/2001/XMLSchema"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:complexType>
<xs:complexType name="Delivery">
<xs:choice>
......@@ -73,6 +73,7 @@
<xs:element name="Data" type="xs:base64Binary" />
<xs:element name="ContentType" type="etsi:ShortString" minOccurs="0"/>
<xs:element name="Checksum" type="etsi:ShortString" minOccurs="0"/>
<xs:element name="ChecksumType" type="etsi:ShortString" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......@@ -80,5 +81,5 @@
<xs:sequence>
<xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"></xs:any>
</xs:sequence>
</xs:complexType>
</xs:complexType>
</xs:schema>
......@@ -53,6 +53,7 @@
<xs:element name="Contents" type="xs:base64Binary" minOccurs="0"></xs:element>
<xs:element name="ContentType" type="etsi:ShortString" minOccurs="0"></xs:element>
<xs:element name="Checksum" type="etsi:ShortString" minOccurs="0"></xs:element>
<xs:element name="ChecksumType" type="etsi:ShortString" minOccurs="0"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="NationalDocumentParameters" abstract="true">
......
......@@ -107,6 +107,7 @@
<xs:enumeration value="GetObject"/>
<xs:enumeration value="DeleteObject"/>
<xs:enumeration value="ListObjectsOfType"/>
<xs:enumeration value="DeleteAllObjects"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="ErrorInformation">
......@@ -922,4 +923,21 @@
<xs:element name="objectId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="DeleteAllObjectsRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="DeleteAllObjectsResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
<xs:sequence>
<xs:element name="oK" type="OK"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:schema>
<?xml version="1.0" ?>
<ns1:X1Request xmlns:ns1="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ns1:x1RequestMessage xsi:type="ns1:DeleteAllObjectsRequest">
<ns1:admfIdentifier>admfID</ns1:admfIdentifier>
<ns1:neIdentifier>neID</ns1:neIdentifier>
<ns1:messageTimestamp>2022-01-20T14:04:20.123456Z</ns1:messageTimestamp>
<ns1:version>v1.11.1</ns1:version>
<ns1:x1TransactionId>5775af53-a4a0-46ab-818a-86a406a335a</ns1:x1TransactionId>
</ns1:x1RequestMessage>
</ns1:X1Request>
<?xml version="1.0" ?>
<ns1:X1Response xmlns:ns1="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ns1:x1ResponseMessage xsi:type="ns1:DeleteAllObjectsResponse">
<ns1:admfIdentifier>admfID</ns1:admfIdentifier>
<ns1:neIdentifier>neID</ns1:neIdentifier>
<ns1:messageTimestamp>2022-01-20T14:04:20.123456Z</ns1:messageTimestamp>
<ns1:version>v1.11.1</ns1:version>
<ns1:x1TransactionId>5775af53-a4a0-46ab-818a-86a406a335ac</ns1:x1TransactionId>
<ns1:oK>AcknowledgedAndCompleted</ns1:oK>
</ns1:x1ResponseMessage>
</ns1:X1Response>
<?xml version="1.0" encoding="utf-8"?>
<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.7.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.8.1" elementFormDefault="qualified">
<xs:simpleType name="ShortString">
<xs:restriction base="xs:string">
<xs:maxLength value="255"/>
......@@ -246,4 +246,24 @@
<xs:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="CGI">
<xs:restriction base="xs:token">
<xs:pattern value="[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="ECGI">
<xs:restriction base="xs:token">
<xs:pattern value="[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="NCGI">
<xs:restriction base="xs:token">
<xs:pattern value="[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="ICCID">
<xs:restriction base="xs:token">
<xs:pattern value="[0-9]{19,20}"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
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