Commit df8a4f9c authored by canterburym's avatar canterburym
Browse files

Updating to align whitespace and clause references

parent ecb28190
Loading
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -1690,7 +1690,7 @@ QOSFlowProfile ::= SEQUENCE

QOSRules ::= OCTET STRING

-- See clauses 5.6.2.6-1 and 5.6.2.9-1 of TS 29.512 [Re3], clause table 5.6.2.5-1 of TS 29.508 [Re4] for the details of this structure
-- See clauses 5.6.2.6-1 and 5.6.2.9-1 of TS 29.512 [89], clause table 5.6.2.5-1 of TS 29.508 [90] for the details of this structure
PCCRule ::= SEQUENCE
{
    pCCRuleID                     [1] PCCRuleID OPTIONAL,
@@ -1713,7 +1713,7 @@ PCCRule ::= SEQUENCE
    eASIPReplaceInfos             [18] EASIPReplaceInfos OPTIONAL
}

-- See table 5.6.2.14-1 of TS 29.512 [Re3]
-- See table 5.6.2.14-1 of TS 29.512 [89]
PCCRuleID ::= UTF8String

PCCRuleSet ::= SET OF PCCRule
@@ -1724,7 +1724,7 @@ FlowInformationSet ::= SET OF FlowInformation

RouteToLocationSet ::= SET OF RouteToLocation

-- See table 5.6.2.14 of TS 29.512 [Re3]
-- See table 5.6.2.14 of TS 29.512 [89]
FlowInformation ::= SEQUENCE
{
    flowDescription    [1] FlowDescription OPTIONAL,
@@ -1735,7 +1735,7 @@ FlowInformation ::= SEQUENCE
    flowDirection      [6] FlowDirection OPTIONAL
}

-- See table 5.6.2.14 of TS 29.512 [Re3]
-- See table 5.6.2.14 of TS 29.512 [89]
FlowDescription ::= SEQUENCE
{
    sourceIPAddress       [1] IPAddressOrRangeOrAny,
@@ -1774,7 +1774,7 @@ AnyNextLayerProtocol ::= ENUMERATED
    ip(1)
}

-- See table 5.6.2.17-1 of TS 29.514 [Re5]
-- See table 5.6.2.17-1 of TS 29.514 [91]
EthFlowDescription ::= SEQUENCE
{
    destMacAddress    [1] MACAddress OPTIONAL,
@@ -1787,13 +1787,13 @@ EthFlowDescription ::= SEQUENCE
    destMacAddrEnd    [8] MACAddress OPTIONAL
}

-- See table 5.6.2.17-1 of TS 29.514 [Re5]
-- See table 5.6.2.17-1 of TS 29.514 [91]
FDir ::= ENUMERATED
{
    downlink(1)
}

-- See table 5.6.2.17-1 of TS 29.514 [Re5]
-- See table 5.6.2.17-1 of TS 29.514 [91]
VLANTag ::= SEQUENCE
{
    priority [1] BIT STRING (SIZE(3)),
@@ -1801,7 +1801,7 @@ VLANTag ::= SEQUENCE
    vLANID   [3] BIT STRING (SIZE(12))
}

-- See table 5.6.2.14 of TS 29.512 [Re3]
-- See table 5.6.2.14 of TS 29.512 [89]
FlowDirection ::= ENUMERATED
{
    downlinkOnly(1),
@@ -1834,14 +1834,14 @@ RouteInfo ::= SEQUENCE
    uDPPortNumberTunnelEndpoint   [2] PortNumber
}

-- See clause 4.1.4.2 of TS 29.512 [Re3]
-- See clause 4.1.4.2 of TS 29.512 [89]
EASIPReplaceInfos ::= SEQUENCE
{
    sourceEASAddress [1] EASServerAddress,
    targetEASAddress [2] EASServerAddress
}

-- See clause 4.1.4.2 of TS 29.512 [Re3]
-- See clause 4.1.4.2 of TS 29.512 [89]
EASServerAddress ::= SEQUENCE
{
    iPAddress        [1]  IPAddress,
+18 −15
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ XIRIEvent ::= CHOICE
    -- MME Events, see clause 6.3.2.2.8
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,

    -- AMF events, see 6.2.2.2.X continued from choice 5
    -- AMF events, see 6.2.2.2.9 continued from choice 5
    aMFRANHandoverCommand                               [113] AMFRANHandoverCommand,
    aMFRANHandoverRequest                               [114] AMFRANHandoverRequest
}
@@ -377,7 +377,7 @@ IRIEvent ::= CHOICE
    -- MME Events, see clause 6.3.2.2.8
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,

    -- AMF events, see 6.2.2.2.X continued from choice 5
    -- AMF events, see 6.2.2.2.9 continued from choice 5
    aMFRANHandoverCommand                               [113] AMFRANHandoverCommand,
    aMFRANHandoverRequest                               [114] AMFRANHandoverRequest
}
@@ -1237,7 +1237,7 @@ AMFPositioningInfoTransfer ::= SEQUENCE
    lcsCorrelationId            [8] UTF8String (SIZE(1..255))
}

-- See clause 6.2.2.2.X.2 for details of this structure
-- See clause 6.2.2.2.9.2 for details of this structure
AMFRANHandoverCommand ::= SEQUENCE
{
    userIdentifiers              [1] UserIdentifiers,
@@ -1247,7 +1247,7 @@ AMFRANHandoverCommand ::= SEQUENCE
    targetToSourceContainer      [5] RANTargetToSourceContainer
}

-- See clause 6.2.2.2.X.3 for details of this structure
-- See clause 6.2.2.2.9.3 for details of this structure
AMFRANHandoverRequest ::= SEQUENCE
{
    userIdentifiers                     [1] UserIdentifiers,
@@ -1724,7 +1724,7 @@ QOSFlowProfile ::= SEQUENCE

QOSRules ::= OCTET STRING

-- See clauses 5.6.2.6-1 and 5.6.2.9-1 of TS 29.512 [Re3], clause table 5.6.2.5-1 of TS 29.508 [Re4] for the details of this structure
-- See clauses 5.6.2.6-1 and 5.6.2.9-1 of TS 29.512 [89], clause table 5.6.2.5-1 of TS 29.508 [90] for the details of this structure
PCCRule ::= SEQUENCE
{
    pCCRuleID                     [1] PCCRuleID OPTIONAL,
@@ -1747,7 +1747,7 @@ PCCRule ::= SEQUENCE
    eASIPReplaceInfos             [18] EASIPReplaceInfos OPTIONAL
}

-- See table 5.6.2.14-1 of TS 29.512 [Re3]
-- See table 5.6.2.14-1 of TS 29.512 [89]
PCCRuleID ::= UTF8String

PCCRuleSet ::= SET OF PCCRule
@@ -1758,7 +1758,7 @@ FlowInformationSet ::= SET OF FlowInformation

RouteToLocationSet ::= SET OF RouteToLocation

-- See table 5.6.2.14 of TS 29.512 [Re3]
-- See table 5.6.2.14 of TS 29.512 [89]
FlowInformation ::= SEQUENCE
{
    flowDescription    [1] FlowDescription OPTIONAL,
@@ -1769,7 +1769,7 @@ FlowInformation ::= SEQUENCE
    flowDirection      [6] FlowDirection OPTIONAL
}

-- See table 5.6.2.14 of TS 29.512 [Re3]
-- See table 5.6.2.14 of TS 29.512 [89]
FlowDescription ::= SEQUENCE
{
    sourceIPAddress       [1] IPAddressOrRangeOrAny,
@@ -1808,7 +1808,7 @@ AnyNextLayerProtocol ::= ENUMERATED
    ip(1)
}

-- See table 5.6.2.17-1 of TS 29.514 [Re5]
-- See table 5.6.2.17-1 of TS 29.514 [91]
EthFlowDescription ::= SEQUENCE
{
    destMacAddress    [1] MACAddress OPTIONAL,
@@ -1821,13 +1821,13 @@ EthFlowDescription ::= SEQUENCE
    destMacAddrEnd    [8] MACAddress OPTIONAL
}

-- See table 5.6.2.17-1 of TS 29.514 [Re5]
-- See table 5.6.2.17-1 of TS 29.514 [91]
FDir ::= ENUMERATED
{
    downlink(1)
}

-- See table 5.6.2.17-1 of TS 29.514 [Re5]
-- See table 5.6.2.17-1 of TS 29.514 [91]
VLANTag ::= SEQUENCE
{
    priority [1] BIT STRING (SIZE(3)),
@@ -1835,7 +1835,7 @@ VLANTag ::= SEQUENCE
    vLANID   [3] BIT STRING (SIZE(12))
}

-- See table 5.6.2.14 of TS 29.512 [Re3]
-- See table 5.6.2.14 of TS 29.512 [89]
FlowDirection ::= ENUMERATED
{
    downlinkOnly(1),
@@ -1868,14 +1868,14 @@ RouteInfo ::= SEQUENCE
    uDPPortNumberTunnelEndpoint   [2] PortNumber
}

-- See clause 4.1.4.2 of TS 29.512 [Re3]
-- See clause 4.1.4.2 of TS 29.512 [89]
EASIPReplaceInfos ::= SEQUENCE
{
    sourceEASAddress [1] EASServerAddress,
    targetEASAddress [2] EASServerAddress
}

-- See clause 4.1.4.2 of TS 29.512 [Re3]
-- See clause 4.1.4.2 of TS 29.512 [89]
EASServerAddress ::= SEQUENCE
{
    iPAddress        [1]  IPAddress,
@@ -4003,6 +4003,7 @@ HandoverCause ::= CHOICE
    protocol        [4] CauseProtocol,
    misc            [5] CauseMisc
}

HandoverType ::= ENUMERATED
{
    intra5GS(1),
@@ -4134,6 +4135,8 @@ PLMNID ::= SEQUENCE
    mNC [2] MNC
}

PLMNList ::= SEQUENCE (SIZE(1..MAX)) OF PLMNID

PDUSessionID ::= INTEGER (0..255)

PDUSessionResourceInformation ::= SEQUENCE
+61 −9
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@
  <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>
      <xs:element name="Extension" type="X1Extension" minOccurs="1" maxOccurs="unbounded"></xs:element>
    </xs:sequence>
  </xs:complexType>

  <xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"></xs:element>
  <xs:complexType name="PTCLIX1TargetIdentifierExtensions">
@@ -90,6 +85,7 @@
      <xs:element name="HeaderReporting" type="PDHRReportingExtensions"></xs:element>
      <xs:element name="SMSFExtensions" type="SMSFProvisioningExtensions"></xs:element>
      <xs:element name="IdentifierAssociation" type="IdentifierAssociationExtensions"></xs:element>
      <xs:element name="SDP" type="SDP"></xs:element>
    </xs:choice>
  </xs:complexType>

@@ -295,4 +291,60 @@
    <xs:restriction base="xs:anyURI"></xs:restriction>
  </xs:simpleType>

  <xs:element name="IMST3TargetIdentifierExtensions" type="IMST3TargetIdentifierExtensions"></xs:element>

  <xs:complexType name="IMST3TargetIdentifierExtensions">
    <xs:sequence>
      <xs:element name="IMST3TargetIdentifierExtension" type="IMST3TargetIdentifierExtension" minOccurs="1" maxOccurs="unbounded"></xs:element>
    </xs:sequence>
  </xs:complexType>

  <xs:complexType name="IMST3TargetIdentifierExtension">
    <xs:choice>
      <xs:element name="H248ContextID" type="H248ContextID"></xs:element>
      <xs:element name="PayloadDirectionAssignment" type="PayloadDirectionAssignment"></xs:element>
      <xs:element name="TriggerScope" type="TriggerScope"></xs:element>
    </xs:choice>
  </xs:complexType>

 <xs:simpleType name="PayloadDirectionAssignment">
    <xs:restriction base="xs:string">
      <xs:enumeration value="ToTarget"></xs:enumeration>
      <xs:enumeration value="FromTarget"></xs:enumeration>
      <xs:enumeration value="NotDetermined"></xs:enumeration>
    </xs:restriction>
  </xs:simpleType>

  <xs:simpleType name="H248ContextID">
    <xs:restriction base="xs:integer">
      <xs:minInclusive value="1"></xs:minInclusive>
      <xs:maxInclusive value="4294967293"></xs:maxInclusive>
    </xs:restriction>
  </xs:simpleType>

  <xs:simpleType name="TriggerScope">
    <xs:restriction base="xs:string">
      <xs:enumeration value="Unidirectional"></xs:enumeration>
      <xs:enumeration value="Bidirectional"></xs:enumeration>
    </xs:restriction>
  </xs:simpleType>

  <xs:complexType name="SDP">
    <xs:sequence>
      <xs:element name="SDPData" type="SDPData" minOccurs="1" maxOccurs="unbounded"></xs:element>
    </xs:sequence>
  </xs:complexType>

  <xs:complexType name="SDPData">
    <xs:choice>
      <xs:element name="LocalSDP" type="SDPInfo"></xs:element>
      <xs:element name="RemoteSDP" type="SDPInfo"></xs:element>
    </xs:choice>
  </xs:complexType>

  <xs:simpleType name="SDPInfo">
    <xs:restriction base="xs:string">
    </xs:restriction>
  </xs:simpleType>

</xs:schema>