Commit 251b6412 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Updating OIDs and XSD versions, and 657 XSD

parent 7d899d1d
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version35(35)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)}

DEFINITIONS IMPLICIT TAGS ::=

@@ -41,7 +41,7 @@ IMPORTS
    IPIRI,
    IPIRIOnly
        FROM IPAccessPDU
        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version15(15)}
        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)}

    -- from ETSI TS 102 232-4 [32]
    L2CC,
@@ -205,7 +205,7 @@ IMPORTS

lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version35(35)}
li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version36(36)}

-- ====================
-- Top-level definition
+3 −3
Original line number Diff line number Diff line
IPAccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version15(15)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)}

DEFINITIONS IMPLICIT TAGS ::=
BEGIN
@@ -9,14 +9,14 @@ IMPORTS
    IPAddress,
    Location
        FROM LI-PS-PDU
        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version35(35)};
        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)};


-- ============================
-- Object Identifier Definition
-- ============================

iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version15(15)}
iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version16(16)}
iPIRIObjId RELATIVE-OID                     ::= {iPAccessPDUObjId iRI(1)}
iPCCObjId RELATIVE-OID                      ::= {iPAccessPDUObjId cC(2)}
iPIRIOnlyObjId RELATIVE-OID                 ::= {iPAccessPDUObjId iRIOnly(3)}
+2 −2
Original line number Diff line number Diff line
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version27(27)}
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version28(28)}

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) version27(27)}
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version28(28)}

-- ======================================
-- Top level definitions for RDHI wrapper
+83 −2
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.29.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.29.1#/RetainedData" elementFormDefault="qualified">
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.1.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.1.1#/RetainedData" elementFormDefault="qualified">
    <xsd:annotation>
        <xsd:documentation xml:lang="en">
            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.29.1
            XSD translated from ASN.1 derived from outcome of TS 102 657 v2.1.1
        </xsd:documentation>
    </xsd:annotation>
    <xsd:simpleType name="GeneralizedTime">
@@ -3472,6 +3472,7 @@
            <xsd:element name="method" type="xsd:string" minOccurs="0"/>
            <xsd:element name="edgeComputingTransactionID" type="xsd:string" minOccurs="0"/>
            <xsd:element name="edgeComputingTransactionStatus" type="xsd:string" minOccurs="0"/>
            <xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="EdgeComputingDevice">
@@ -3492,4 +3493,84 @@
    <xsd:simpleType name="EdgeComputingDeviceID">
        <xsd:restriction base="xsd:hexBinary"/>
    </xsd:simpleType>
    <xsd:complexType name="DigitalTokenIdentifier">
        <xsd:sequence>
            <xsd:element name="baseRecord" type="BaseRecord"/>
            <xsd:element name="forkRecord" type="ForkRecord"/>
            <xsd:element name="informativeDataElements" type="InformativeDataElements"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:simpleType name="BaseRecord">
        <xsd:restriction base="xsd:hexBinary"/>
    </xsd:simpleType>
    <xsd:simpleType name="ForkRecord">
        <xsd:restriction base="xsd:hexBinary"/>
    </xsd:simpleType>
    <xsd:complexType name="InformativeDataElements">
        <xsd:sequence>
            <xsd:element name="digitalTokenName" type="DigitalTokenName"/>
            <xsd:element name="tokenIdentifierType" type="TokenIdentifierType"/>
            <xsd:element name="dTSRegistrationAuthorityIdentifier" type="DTIRegistrationAuthorityIdentifier"/>
            <xsd:element name="otherDataElements" type="OtherDataElements"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="DigitalTokenName">
        <xsd:sequence>
            <xsd:element name="digitalTokenLongName" type="DigitalTokenLongName"/>
            <xsd:element name="digitalTokenShortName" type="DigitalTokenShortName"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="DigitalTokenLongName">
        <xsd:sequence>
            <xsd:element name="digitalTokenLongName" type="xsd:string"/>
            <xsd:element name="originalLanguageDigitalTokenLongName" type="xsd:string"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="DigitalTokenShortName">
        <xsd:sequence>
            <xsd:element name="digitalTokenShortName" type="xsd:string"/>
            <xsd:element name="originalLanguageDigitalTokenShortName" type="xsd:string"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="TokenIdentifierType">
        <xsd:sequence>
            <xsd:element name="digitalTokenIdentifierType" type="DigitalTokenIdentifierType"/>
            <xsd:element name="digitalLedgerTechnologyType" type="DigitalLedgerTechnologyType"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="DigitalTokenIdentifierType">
        <xsd:choice>
            <xsd:element name="auxiliaryDigitalToken" type="NULL"/>
            <xsd:element name="nativeDigitalToken" type="NULL"/>
            <xsd:element name="distributedLedgerWithoutANativeDigitalToken" type="NULL"/>
            <xsd:element name="functionallyFungibleGroupOfDigitalTokens" type="NULL"/>
        </xsd:choice>
    </xsd:complexType>
    <xsd:complexType name="DigitalLedgerTechnologyType">
        <xsd:choice>
            <xsd:element name="blockchain" type="NULL"/>
            <xsd:element name="other" type="NULL"/>
        </xsd:choice>
    </xsd:complexType>
    <xsd:simpleType name="DTIRegistrationAuthorityIdentifier">
        <xsd:restriction base="xsd:string"/>
    </xsd:simpleType>
    <xsd:complexType name="OtherDataElements">
        <xsd:sequence>
            <xsd:element name="underlyingAssetExternalIdentifierType" type="xsd:string" minOccurs="0"/>
            <xsd:element name="underlyingAssetExternalIdentifierValue" type="xsd:string" minOccurs="0"/>
            <xsd:element name="digitalTokenExternalIdentifierType" type="xsd:string" minOccurs="0"/>
            <xsd:element name="digitalTokenExternalIdentifierValue" type="xsd:string" minOccurs="0"/>
            <xsd:element name="digitalTokenReferenceImplementationURL" type="xsd:string" minOccurs="0"/>
            <xsd:element name="digitalTokenUnitMultiplier" type="xsd:string" minOccurs="0"/>
            <xsd:element name="auxiliaryDigitaltoken" type="xsd:string" minOccurs="0"/>
            <xsd:element name="publicDistributedLedgerIndicator" type="PublicDistributedLedgerIndicator" minOccurs="0"/>
        </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="PublicDistributedLedgerIndicator">
        <xsd:choice>
            <xsd:element name="public" type="NULL"/>
            <xsd:element name="private" type="NULL"/>
        </xsd:choice>
    </xsd:complexType>
</xsd:schema>