Commit 56677b8d authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/103120/0058' into 'meeting/LI65' 

TS 103 120 CR058 - Traffic Policy for Truncating Data Packets

See merge request !131
parents 3d03f59a 9cc68f14

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+4 −0
Original line number Diff line number Diff line
@@ -354,6 +354,10 @@ 
                <Value>Delivered</Value>

                <Meaning>Traffic that matches the policy is delivered</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Truncate</Value>

                <Meaning>Deliver only the specified number of the first octets of each datagram</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

103120/schema/json/ts_103120_TrafficPolicy.schema.json

+33 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ 
        },

        "tp:Action": {

          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"

        },

        "tp:Parameters": {

          "$ref": "#/$defs/ActionParameters"

        }

      },

      "required": [
@@ -272,6 +275,36 @@ 
      "required": [

        "tp:CommunicationServiceID"

      ]

    },

    "ActionParameters": {

      "oneOf": [

        {

          "type": "object",

          "properties": {

            "tp:TruncateActionParameters": {

              "$ref": "#/$defs/TruncateActionParameters"

            }

          },

          "required": [

            "tp:TruncateActionParameters"

          ]

        }

      ]

    },

    "TruncateActionParameters": {

      "type": "object",

      "properties": {

        "tp:NumberOfOctets": {

          "type": "integer",

          "minimum": 0

        },

        "tp:ProvideOriginalLength": {

          "type": "boolean"

        }

      },

      "required": [

		    "tp:NumberOfOctets"

	    ]

    }

  }

}

103120/schema/xsd/ts_103120_TrafficPolicy.xsd

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
        <xs:sequence>

            <xs:element name="Criteria" type="ListOfTrafficCriteria" minOccurs="0"/>

            <xs:element name="Action" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="Parameters" type="ActionParameters" minOccurs="0"/>

        </xs:sequence>

    </xs:group>

    <xs:complexType name="ListOfTrafficCriteria">
@@ -96,4 +97,15 @@ 
            <xs:element name="CommunicationServiceID" type="etsi:ShortString" minOccurs="1"/>

        </xs:sequence>

    </xs:complexType>

	<xs:complexType name="ActionParameters">

		<xs:choice>

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

		</xs:choice>

	</xs:complexType>

	<xs:complexType name="TruncateActionParameters">

		<xs:sequence>

            <xs:element name="NumberOfOctets" type="xs:nonNegativeInteger"/>

            <xs:element name="ProvideOriginalLength" type="xs:boolean" minOccurs="0"/>

		</xs:sequence>

	</xs:complexType>

</xs:schema>