Commit b33bc5dc authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Updating OIDs and XSD namespaces

parent ce691395
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
IPAccessPDU
IPAccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version19(19)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version20(20)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
BEGIN
@@ -16,7 +16,7 @@ IMPORTS
-- Object Identifier Definition
-- Object Identifier Definition
-- ============================
-- ============================


iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version19(19)}
iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version20(20)}
iPIRIObjId RELATIVE-OID                     ::= {iPAccessPDUObjId iRI(1)}
iPIRIObjId RELATIVE-OID                     ::= {iPAccessPDUObjId iRI(1)}
iPCCObjId RELATIVE-OID                      ::= {iPAccessPDUObjId cC(2)}
iPCCObjId RELATIVE-OID                      ::= {iPAccessPDUObjId cC(2)}
iPIRIOnlyObjId RELATIVE-OID                 ::= {iPAccessPDUObjId iRIOnly(3)}
iPIRIOnlyObjId RELATIVE-OID                 ::= {iPAccessPDUObjId iRIOnly(3)}
+2 −2
Original line number Original line Diff line number Diff line
L2AccessPDU
L2AccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)
li-ps(5) l2Access(4) version9(9)}
li-ps(5) l2Access(4) version10(10)}


DEFINITIONS IMPLICIT TAGS ::=
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
BEGIN
@@ -9,7 +9,7 @@ BEGIN
-- Object Identifier Definition
-- Object Identifier Definition
-- ============================
-- ============================


l2AccessPDUObjId RELATIVE-OID   ::= {li-ps(5) l2Access(4) version9(9)}
l2AccessPDUObjId RELATIVE-OID   ::= {li-ps(5) l2Access(4) version10(10)}
l2IRIObjId RELATIVE-OID         ::= {l2AccessPDUObjId iRI(1)}
l2IRIObjId RELATIVE-OID         ::= {l2AccessPDUObjId iRI(1)}
l2CCObjId RELATIVE-OID          ::= {l2AccessPDUObjId cC(2)}
l2CCObjId RELATIVE-OID          ::= {l2AccessPDUObjId cC(2)}
l2IRIOnlyObjId RELATIVE-OID     ::= {l2AccessPDUObjId iRIOnly(3)}
l2IRIOnlyObjId RELATIVE-OID     ::= {l2AccessPDUObjId iRIOnly(3)}
+2 −2
Original line number Original line Diff line number Diff line
<?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="urn:etsi:li:103221-1:configuration-details:v1" targetNamespace="urn:etsi:li:103221-1:configuration-details:v1" xmlns:etsi104000="urn:etsi:li:104000:xsdns:v2" xmlns:etsi103221="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:etsi:li:103221-1:configuration-details:v1" targetNamespace="urn:etsi:li:103221-1:configuration-details:v1" xmlns:etsi104000="urn:etsi:li:104000:xsdns:v3" xmlns:etsi103221="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace="urn:etsi:li:104000:xsdns:v2"/>
<xs:import namespace="urn:etsi:li:104000:xsdns:v3"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
    <xs:complexType name="X1ConfigurationDetails">
    <xs:complexType name="X1ConfigurationDetails">
        <xs:complexContent>
        <xs:complexContent>
+2 −2
Original line number Original line Diff line number Diff line
<?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="urn:etsi:li:103221-2:configuration-details:v1" targetNamespace="urn:etsi:li:103221-2:configuration-details:v1" xmlns:etsi104000="urn:etsi:li:104000:xsdns:v2" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:etsi:li:103221-2:configuration-details:v1" targetNamespace="urn:etsi:li:103221-2:configuration-details:v1" xmlns:etsi104000="urn:etsi:li:104000:xsdns:v3" elementFormDefault="qualified" attributeFormDefault="unqualified">
    <xs:import namespace= "urn:etsi:li:104000:xsdns:v2"/>   
    <xs:import namespace= "urn:etsi:li:104000:xsdns:v3"/>   
    <xs:complexType name="X2ConfigurationDetails">
    <xs:complexType name="X2ConfigurationDetails">
        <xs:complexContent>
        <xs:complexContent>
            <xs:extension base="etsi104000:ConfigurationDetails">
            <xs:extension base="etsi104000:ConfigurationDetails">
+5 −5
Original line number Original line Diff line number Diff line
{
{
  "$id": "urn:etsi:li:103705:record-schema-id:v1.1.1",
  "$id": "urn:etsi:li:103705:record-schema-id:v1.2.1",
  "$schema": "https://json-schema.org/draft/2020-12/schema",
  "$schema": "https://json-schema.org/draft/2020-12/schema",
  "title": "CSP Record Schema",
  "title": "CSP Record Schema",
  "description": "Defines the valid set of Records that may appear in a RecordSet (see ETSI TS 103 705 clause 6.2.4)",
  "description": "Defines the valid set of Records that may appear in a RecordSet (see ETSI TS 103 705 clause 6.2.4)",
@@ -13,12 +13,12 @@
        {
        {
          "allOf": [
          "allOf": [
            {
            {
              "$ref": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"
              "$ref": "urn:etsi:li:103705:type-schema-id:v1.2.1#/$defs/CallRecord"
            },
            },
            {
            {
              "properties": {
              "properties": {
                "type": {
                "type": {
                  "const": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"
                  "const": "urn:etsi:li:103705:type-schema-id:v1.2.1#/$defs/CallRecord"
                }
                }
              }
              }
            }
            }
@@ -27,12 +27,12 @@
        {
        {
          "allOf": [
          "allOf": [
            {
            {
              "$ref": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/MessagingRecord"
              "$ref": "urn:etsi:li:103705:type-schema-id:v1.2.1#/$defs/MessagingRecord"
            },
            },
            {
            {
              "properties": {
              "properties": {
                "type": {
                "type": {
                  "const": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/MessagingRecord"
                  "const": "urn:etsi:li:103705:type-schema-id:v1.2.1#/$defs/MessagingRecord"
                }
                }
              }
              }
            }
            }
Loading