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

Merge branch 'cr/103120/0029' into meeting/LI61

parents 7e9d215c a395c8ff

103120/examples/request7_TrafficPolicyObject.xml

0 → 100644
+81 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:policy="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task">

  <Header>

    <SenderIdentifier>

      <CountryCode>XX</CountryCode>

      <UniqueIdentifier>ACTOR01</UniqueIdentifier>

    </SenderIdentifier>

    <ReceiverIdentifier>

      <CountryCode>XX</CountryCode>

      <UniqueIdentifier>ACTOR02</UniqueIdentifier>

    </ReceiverIdentifier>

    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaa8eb</TransactionIdentifier>

    <Timestamp>2022-07-01T12:00:00.000000Z</Timestamp>

    <Version>

      <ETSIVersion>V1.11.1</ETSIVersion>

      <NationalProfileOwner>XX</NationalProfileOwner>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

    </Version>

  </Header>

  <Payload>

    <RequestPayload>

      <ActionRequests>

        <ActionRequest>

          <ActionIdentifier>0</ActionIdentifier>

          <CREATE>

            <HI1Object xsi:type="policy:TrafficRuleObject">

              <ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</ObjectIdentifier>

              <CountryCode>XX</CountryCode>

              <OwnerIdentifier>ACTOR01</OwnerIdentifier>

              <policy:Criteria>

                <policy:Criteria>

                  <policy:IPPolicyCriteria>

                    <policy:SourceIPRange>

                      <etsi:IPv4CIDR>203.0.113.0/24</etsi:IPv4CIDR>

                    </policy:SourceIPRange>

                  </policy:IPPolicyCriteria>

                </policy:Criteria>

              </policy:Criteria>

              <policy:Action>

                <common:Owner>ETSI</common:Owner>

                <common:Name>PolicyAction</common:Name>

                <common:Value>PDSR</common:Value>

              </policy:Action>

            </HI1Object>

          </CREATE>

        </ActionRequest>

        <ActionRequest>

          <ActionIdentifier>1</ActionIdentifier>

          <CREATE>

            <HI1Object xsi:type="policy:TrafficPolicyObject">

              <ObjectIdentifier>55e25c0a-787b-4049-b7fb-518a13a9483b</ObjectIdentifier>

              <CountryCode>XX</CountryCode>

              <OwnerIdentifier>ACTOR01</OwnerIdentifier>

              <policy:TrafficPolicyName>Template Rule 1</policy:TrafficPolicyName>

              <policy:TrafficRules>

                <policy:TrafficRuleReference>

                  <policy:Order>1</policy:Order>

                  <policy:ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</policy:ObjectIdentifier>

                </policy:TrafficRuleReference>

              </policy:TrafficRules>

            </HI1Object>

          </CREATE>

        </ActionRequest>

        <ActionRequest>

          <ActionIdentifier>1</ActionIdentifier>

          <UPDATE>

            <HI1Object xsi:type="task:LITaskObject">

              <ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>

              <task:ListOfTrafficPolicyReferences>

                <task:TrafficPolicyReference>

                  <task:Order>1</task:Order>

                  <task:ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</task:ObjectIdentifier>

                </task:TrafficPolicyReference>

              </task:ListOfTrafficPolicyReferences>

            </HI1Object>

          </UPDATE>

        </ActionRequest>

      </ActionRequests>

    </RequestPayload>

  </Payload>

</HI1Message>

103120/schema/ts_103120_Task.xsd

+13 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
					<xs:element name="InvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>

					<xs:element name="InvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>

					<xs:element name="Flags" type="TaskFlags" minOccurs="0"/>

					<xs:element name="Flags" type="TaskFlags" minOccurs="0"/>

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

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

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

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>
@@ -177,4 +178,15 @@ 
			<xs:element name="CountryCode" type="etsi:ISOCountryCode"/>

			<xs:element name="CountryCode" type="etsi:ISOCountryCode"/>

		</xs:sequence>

		</xs:sequence>

	</xs:complexType>

	</xs:complexType>

 	<xs:complexType name="ListOfTrafficPolicyReferences">

		<xs:sequence>

			<xs:element name="TrafficPolicyReference" type="TrafficPolicyReference" maxOccurs="unbounded"/>

		</xs:sequence>

	</xs:complexType>

	<xs:complexType name="TrafficPolicyReference">

		<xs:sequence>

			<xs:element name="Order" type="xs:positiveInteger" minOccurs="0"/>

			<xs:element name="ObjectIdentifier" type="core:ObjectIdentifier" minOccurs="0"/>

		</xs:sequence>

	</xs:complexType>

</xs:schema>
 
</xs:schema>

103120/schema/ts_103120_TrafficPolicy.xsd

0 → 100644
+57 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" targetNamespace="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" elementFormDefault="qualified" attributeFormDefault="unqualified">

    <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>

    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

    <xs:complexType name="TrafficPolicyObject">

        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

                    <xs:element name="TrafficPolicyName" type="etsi:ShortString" minOccurs="0"/>

                    <xs:element name="TrafficRules" type="ListOfTrafficRuleReferences" minOccurs="0"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="ListOfTrafficRuleReferences">

        <xs:sequence>

            <xs:element name="TrafficRuleReference" type="TrafficRuleReference" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="TrafficRuleReference">

        <xs:sequence>

            <xs:element name="Order" type="xs:positiveInteger"/>

            <xs:element name="ObjectIdentifier" type="core:ObjectIdentifier"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="TrafficRuleObject">

        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="ListOfTrafficCriteria">

        <xs:sequence>

          <xs:element name="Criteria" type="TrafficCriteria" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="TrafficCriteria">

        <xs:choice>

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

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="IPPolicyCriteria">

        <xs:sequence>

            <xs:element name="IPProtocol" type="xs:nonNegativeInteger" minOccurs="0"/>

            <xs:element name="SourceIPRange" type="etsi:IPCIDR" minOccurs="0"/>

            <xs:element name="SourcePortRange" type="etsi:PortRange" minOccurs="0"/>

            <xs:element name="DestinationIPRange" type="etsi:IPCIDR" minOccurs="0"/>

            <xs:element name="DestinationPortRange" type="etsi:PortRange" minOccurs="0"/>

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

        </xs:sequence>

    </xs:complexType>

</xs:schema>

testing/xsd_compile_targets.json

+1 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ 
            "103120/schema/ts_103120_Document.xsd",

            "103120/schema/ts_103120_Document.xsd",

            "103120/schema/ts_103120_Notification.xsd",

            "103120/schema/ts_103120_Notification.xsd",

            "103120/schema/ts_103120_Task.xsd",

            "103120/schema/ts_103120_Task.xsd",

            "103120/schema/ts_103120_TrafficPolicy.xsd",

            "103280/TS_103_280.xsd",

            "103280/TS_103_280.xsd",

            "testing/deps/xmldsig/xmldsig-core-schema.xsd",

            "testing/deps/xmldsig/xmldsig-core-schema.xsd",

            "103120/examples/FooServiceSchema.xsd"

            "103120/examples/FooServiceSchema.xsd"