From b5722763e3a620003e8058bca591e58822f38abb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 17 Apr 2020 14:57:01 +0200 Subject: [PATCH] Remove odl-mdsal-model-draft-ietf-netmod-acl-model-07 These models come from a draft which has been published as RFC8519. As we are shipping the standardized model, remove the old draft reducing associated baggage. The only downstream user is netvirt's aclservice, which will have these models integrated. JIRA: MDSAL-537 Change-Id: Iacb09209a831fc9539496247ee3432c0f7ac21c4 Signed-off-by: Robert Varga --- artifacts/pom.xml | 21 -- docs/pom.xml | 9 - features/features-mdsal/pom.xml | 6 - .../pom.xml | 41 ---- features/pom.xml | 1 - model/ietf/ietf-access-control-list/pom.xml | 33 --- .../main/yang/ietf-access-control-list.yang | 209 ------------------ model/ietf/ietf-packet-fields/pom.xml | 37 ---- .../src/main/yang/ietf-packet-fields.yang | 195 ---------------- model/ietf/pom.xml | 4 - 10 files changed, 556 deletions(-) delete mode 100644 features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml delete mode 100644 model/ietf/ietf-access-control-list/pom.xml delete mode 100644 model/ietf/ietf-access-control-list/src/main/yang/ietf-access-control-list.yang delete mode 100644 model/ietf/ietf-packet-fields/pom.xml delete mode 100644 model/ietf/ietf-packet-fields/src/main/yang/ietf-packet-fields.yang diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 022feec332..50fff24314 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -732,20 +732,6 @@ 2013.10.21.18.0-SNAPSHOT - - - - org.opendaylight.mdsal.model - ietf-packet-fields - 0.16.0-SNAPSHOT - - - org.opendaylight.mdsal.model - ietf-access-control-list - 0.16.0-SNAPSHOT - - org.opendaylight.mdsal.model @@ -916,13 +902,6 @@ features xml - - org.opendaylight.mdsal.model - odl-mdsal-model-draft-ietf-netmod-acl-model-07 - 6.0.0-SNAPSHOT - features - xml - org.opendaylight.mdsal.model odl-mdsal-model-odl-l2-types diff --git a/docs/pom.xml b/docs/pom.xml index 26b34134ff..1400308969 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -414,15 +414,6 @@ ietf-topology-ospf - - org.opendaylight.mdsal.model - ietf-packet-fields - - - org.opendaylight.mdsal.model - ietf-access-control-list - - javax.inject diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml index 33c507e3ad..534bb299d1 100644 --- a/features/features-mdsal/pom.xml +++ b/features/features-mdsal/pom.xml @@ -290,12 +290,6 @@ features xml - - org.opendaylight.mdsal.model - odl-mdsal-model-draft-ietf-netmod-acl-model-07 - features - xml - org.opendaylight.mdsal.model diff --git a/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml b/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml deleted file mode 100644 index d2e46ca075..0000000000 --- a/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.mdsal - feature-parent - 6.0.0-SNAPSHOT - ../feature-parent - - - org.opendaylight.mdsal.model - odl-mdsal-model-draft-ietf-netmod-acl-model-07 - 6.0.0-SNAPSHOT - feature - OpenDaylight :: MD-SAL :: Model :: draft-ietf-netmod-acl-model-07 - Models from draft-ietf-netmod-acl-model-07 - - - - org.opendaylight.mdsal.model - odl-mdsal-model-rfc7223 - features - xml - - - org.opendaylight.mdsal.model - ietf-packet-fields - - - org.opendaylight.mdsal.model - ietf-access-control-list - - - diff --git a/features/pom.xml b/features/pom.xml index 9cdd9c91e0..86474a008d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -93,7 +93,6 @@ odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01 odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal - odl-mdsal-model-draft-ietf-netmod-acl-model-07 odl-mdsal-model-odl-l2-types diff --git a/model/ietf/ietf-access-control-list/pom.xml b/model/ietf/ietf-access-control-list/pom.xml deleted file mode 100644 index 87a7d4ed74..0000000000 --- a/model/ietf/ietf-access-control-list/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - org.opendaylight.mdsal - binding-parent - 6.0.0-SNAPSHOT - ../../../binding/binding-parent - - - 4.0.0 - org.opendaylight.mdsal.model - ietf-access-control-list - 0.16.0-SNAPSHOT - ${project.artifactId} - ${project.artifactId} - bundle - - - - org.opendaylight.mdsal.model - ietf-packet-fields - - - diff --git a/model/ietf/ietf-access-control-list/src/main/yang/ietf-access-control-list.yang b/model/ietf/ietf-access-control-list/src/main/yang/ietf-access-control-list.yang deleted file mode 100644 index 90681653aa..0000000000 --- a/model/ietf/ietf-access-control-list/src/main/yang/ietf-access-control-list.yang +++ /dev/null @@ -1,209 +0,0 @@ -module ietf-access-control-list { - yang-version 1.1; - namespace "urn:ietf:params:xml:ns:yang:ietf-access-control-list"; - prefix acl; - import ietf-yang-types { - prefix yang; revision-date 2013-07-15; - } - import ietf-packet-fields { - prefix packet-fields; revision-date 2016-02-18; - } - organization "IETF NETMOD (NETCONF Data Modeling Language) - Working Group"; - contact - "WG Web: http://tools.ietf.org/wg/netmod/ - WG List: netmod@ietf.org - WG Chair: Juergen Schoenwaelder - j.schoenwaelder@jacobs-university.de - WG Chair: Tom Nadeau - tnadeau@lucidvision.com - Editor: Dean Bogdanovic - ivandean@gmail.com - Editor: Kiran Agrahara Sreenivasa - kkoushik@cisco.com - Editor: Lisa Huang - lyihuang@juniper.net - Editor: Dana Blair - dblair@cisco.com"; - description - "This YANG module defines a component that describing the - configuration of Access Control Lists (ACLs). - Copyright (c) 2016 IETF Trust and the persons identified as - the document authors. All rights reserved. - Redistribution and use in source and binary forms, with or - without modification, is permitted pursuant to, and subject - to the license terms contained in, the Simplified BSD - License set forth in Section 4.c of the IETF Trust's Legal - Provisions Relating to IETF Documents - (http://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC XXXX; see - the RFC itself for full legal notices."; - revision 2016-02-18 { - description - "Base model for Network Access Control List (ACL)."; - reference - "RFC XXXX: Network Access Control List (ACL) - YANG Data Model"; - } - identity acl-base { - description - "Base Access Control List type for all Access Control List type - identifiers."; - } - identity ipv4-acl { - base acl:acl-base; - description - "ACL that primarily matches on fields from the IPv4 header - (e.g. IPv4 destination address) and layer 4 headers (e.g. TCP - destination port). An acl of type ipv4-acl does not contain - matches on fields in the ethernet header or the IPv6 header."; - } - identity ipv6-acl { - base acl:acl-base; - description - "ACL that primarily matches on fields from the IPv6 header - (e.g. IPv6 destination address) and layer 4 headers (e.g. TCP - destination port). An acl of type ipv6-acl does not contain - matches on fields in the ethernet header or the IPv4 header."; - } - identity eth-acl { - base acl:acl-base; - description - "ACL that primarily matches on fields in the ethernet header, - like 10/100/1000baseT or WiFi Access Control List. An acl of - type eth-acl does not contain matches on fields in the IPv4 - header, IPv6 header or layer 4 headers."; - } - typedef acl-type { - type identityref { - base acl:acl-base; - } - description - "This type is used to refer to an Access Control List - (ACL) type"; - } - typedef access-control-list-ref { - type leafref { - path "/access-lists/acl/acl-name"; - } - description - "This type is used by data models that need to reference an - Access Control List"; - } - container access-lists { - description - "This is a top level container for Access Control Lists. - It can have one or more Access Control Lists."; - list acl { - key "acl-type acl-name"; - description - "An Access Control List(ACL) is an ordered list of - Access List Entries (ACE). Each Access Control Entry has a - list of match criteria and a list of actions. - Since there are several kinds of Access Control Lists - implemented with different attributes for - different vendors, this - model accommodates customizing Access Control Lists for - each kind and for each vendor."; - leaf acl-name { - type string; - description - "The name of access-list. A device MAY restrict the length - and value of this name, possibly space and special - characters are not allowed."; - } - leaf acl-type { - type acl-type; - description - "Type of access control list. Indicates the primary intended - type of match criteria (e.g. ethernet, IPv4, IPv6, mixed, etc) - used in the list instance."; - } - container acl-oper-data { - config false; - description - "Overall Access Control List operational data"; - } - container access-list-entries { - description - "The access-list-entries container contains - a list of access-list-entries(ACE)."; - list ace { - key "rule-name"; - ordered-by user; - description - "List of access list entries(ACE)"; - leaf rule-name { - type string; - description - "A unique name identifying this Access List - Entry(ACE)."; - } - container matches { - description - "Definitions for match criteria for this Access List - Entry."; - choice ace-type { - description - "Type of access list entry."; - case ace-ip { - description "IP Access List Entry."; - choice ace-ip-version { - description - "IP version used in this Access List Entry."; - case ace-ipv4 { - uses packet-fields:acl-ipv4-header-fields; - } - case ace-ipv6 { - uses packet-fields:acl-ipv6-header-fields; - } - } - uses packet-fields:acl-ip-header-fields; - } - case ace-eth { - description - "Ethernet Access List entry."; - uses packet-fields:acl-eth-header-fields; - } - } - uses packet-fields:metadata; - } - container actions { - description - "Definitions of action criteria for this Access List - Entry."; - choice packet-handling { - default "deny"; - description - "Packet handling action."; - case deny { - leaf deny { - type empty; - description - "Deny action."; - } - } - case permit { - leaf permit { - type empty; - description - "Permit action."; - } - } - } - } - container ace-oper-data { - config false; - description - "Operational data for this Access List Entry."; - leaf match-counter { - type yang:counter64; - description - "Number of matches for this Access List Entry"; - } - } - } - } - } - } -} \ No newline at end of file diff --git a/model/ietf/ietf-packet-fields/pom.xml b/model/ietf/ietf-packet-fields/pom.xml deleted file mode 100644 index f67114dba5..0000000000 --- a/model/ietf/ietf-packet-fields/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - org.opendaylight.mdsal - binding-parent - 6.0.0-SNAPSHOT - ../../../binding/binding-parent - - - 4.0.0 - org.opendaylight.mdsal.model - ietf-packet-fields - 0.16.0-SNAPSHOT - ${project.artifactId} - ${project.artifactId} - bundle - - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991 - - - org.opendaylight.mdsal.binding.model.ietf - rfc7223 - - - diff --git a/model/ietf/ietf-packet-fields/src/main/yang/ietf-packet-fields.yang b/model/ietf/ietf-packet-fields/src/main/yang/ietf-packet-fields.yang deleted file mode 100644 index 0ca86a8905..0000000000 --- a/model/ietf/ietf-packet-fields/src/main/yang/ietf-packet-fields.yang +++ /dev/null @@ -1,195 +0,0 @@ -module ietf-packet-fields { - yang-version 1.1; - namespace "urn:ietf:params:xml:ns:yang:ietf-packet-fields"; - prefix packet-fields; - import ietf-inet-types { - prefix inet; revision-date 2013-07-15; - } - import ietf-yang-types { - prefix yang; revision-date 2013-07-15; - } - import ietf-interfaces { - prefix if; revision-date 2014-05-08; - } - organization "IETF NETMOD (NETCONF Data Modeling Language) Working - Group"; - contact - "WG Web: http://tools.ietf.org/wg/netmod/ - WG List: netmod@ietf.org - WG Chair: Juergen Schoenwaelder - j.schoenwaelder@jacobs-university.de - WG Chair: Tom Nadeau - tnadeau@lucidvision.com - Editor: Dean Bogdanovic - deanb@juniper.net - Editor: Kiran Agrahara Sreenivasa - kkoushik@cisco.com - Editor: Lisa Huang - lyihuang@juniper.net - Editor: Dana Blair - dblair@cisco.com"; - description - "This YANG module defines groupings that are used by - ietf-access-control-list YANG module. Their usage is not - limited to ietf-access-control-list and can be - used anywhere as applicable. - Copyright (c) 2016 IETF Trust and the persons identified as - the document authors. All rights reserved. - Redistribution and use in source and binary forms, with or - without modification, is permitted pursuant to, and subject - to the license terms contained in, the Simplified BSD - License set forth in Section 4.c of the IETF Trust's Legal - Provisions Relating to IETF Documents - (http://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC XXXX; see - the RFC itself for full legal notices."; - revision 2016-02-18 { - description - "Initial version of packet fields used by - ietf-access-control-list"; - reference - "RFC XXXX: Network Access Control List (ACL) - YANG Data Model"; - } - grouping acl-transport-header-fields { - description - "Transport header fields"; - container source-port-range { - presence "Enables setting source port range"; - description - "Inclusive range representing source ports to be used. - When only lower-port is present, it represents a single port."; - leaf lower-port { - type inet:port-number; - mandatory true; - description - "Lower boundary for port."; - } - leaf upper-port { - type inet:port-number; - must ". >= ../lower-port" { - error-message - "The upper-port must be greater than or equal to lower-port"; - } - description - "Upper boundary for port . If existing, the upper port - must be greater or equal to lower-port."; - } - } - container destination-port-range { - presence "Enables setting destination port range"; - description - "Inclusive range representing destination ports to be used. When - only lower-port is present, it represents a single port."; - leaf lower-port { - type inet:port-number; - mandatory true; - description - "Lower boundary for port."; - } - leaf upper-port { - type inet:port-number; - must ". >= ../lower-port" { - error-message - "The upper-port must be greater than or equal to lower-port"; - } - - description - "Upper boundary for port. If existing, the upper port must - be greater or equal to lower-port"; - } - } - } - grouping acl-ip-header-fields { - description - "IP header fields common to ipv4 and ipv6"; - leaf dscp { - type inet:dscp; - description - "Value of dscp."; - } - leaf protocol { - type uint8; - description - "Internet Protocol number."; - } - uses acl-transport-header-fields; - } - grouping acl-ipv4-header-fields { - description - "Fields in IPv4 header."; - leaf destination-ipv4-network { - type inet:ipv4-prefix; - description - "Destination IPv4 address prefix."; - } - leaf source-ipv4-network { - type inet:ipv4-prefix; - description - "Source IPv4 address prefix."; - } - } - grouping acl-ipv6-header-fields { - description - "Fields in IPv6 header"; - leaf destination-ipv6-network { - type inet:ipv6-prefix; - description - "Destination IPv6 address prefix."; - } - leaf source-ipv6-network { - type inet:ipv6-prefix; - description - "Source IPv6 address prefix."; - } - leaf flow-label { - type inet:ipv6-flow-label; - description - "IPv6 Flow label."; - } - reference - "RFC 4291: IP Version 6 Addressing Architecture - RFC 4007: IPv6 Scoped Address Architecture - RFC 5952: A Recommendation for IPv6 Address Text Representation"; - } - grouping acl-eth-header-fields { - description - "Fields in Ethernet header."; - leaf destination-mac-address { - type yang:mac-address; - description - "Destination IEEE 802 MAC address."; - } - leaf destination-mac-address-mask { - type yang:mac-address; - description - "Destination IEEE 802 MAC address mask."; - } - leaf source-mac-address { - type yang:mac-address; - description - "Source IEEE 802 MAC address."; - } - leaf source-mac-address-mask { - type yang:mac-address; - description - "Source IEEE 802 MAC address mask."; - } - reference - "IEEE 802: IEEE Standard for Local and Metropolitan Area - Networks: Overview and Architecture."; - } - - grouping metadata { - description - "Fields associated with a packet whick are not in - the header."; - leaf input-interface { - type if:interface-ref { - require-instance false; - } - description - "Packet was received on this interface."; - } - } -} \ No newline at end of file diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index ad652db8d1..c7d53f0c82 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -107,10 +107,6 @@ rfc8542-ietf-dc-fabric-topology rfc8542-ietf-dc-fabric-types - - ietf-packet-fields - ietf-access-control-list - ietf-ted ietf-topology -- 2.36.6