Remove ietf-ted/topology extensions 18/92418/2
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 7 Sep 2020 13:33:43 +0000 (15:33 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 7 Sep 2020 13:39:33 +0000 (15:39 +0200)
We are providing standardized ietf-network(-topology), we are moving
away from drafts. Remove the constructs used only by bgpcep, so that
it can take ownership of these.

JIRA: MDSAL-590
Change-Id: I3dc4ebd8b9f02ef6164e6b9d094a9c18675714d2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
14 files changed:
artifacts/pom.xml
docs/pom.xml
features/features-mdsal/pom.xml
features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml [deleted file]
features/pom.xml
model/ietf/ietf-ted/pom.xml [deleted file]
model/ietf/ietf-ted/src/main/yang/ted@2013-10-21.yang [deleted file]
model/ietf/ietf-topology-isis/pom.xml [deleted file]
model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang [deleted file]
model/ietf/ietf-topology-l3-unicast-igp/pom.xml [deleted file]
model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang [deleted file]
model/ietf/ietf-topology-ospf/pom.xml [deleted file]
model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-10-21.yang [deleted file]
model/ietf/pom.xml

index a8fec328ea16274fd68f431aed191ba3f07085ed..80eee885e5bb036750e43a31596e0427cc08687c 100644 (file)
             </dependency>
 
             <!-- draft-clemm-netmod-yang-network-topo-01 -->
-            <!-- FIXME: figure out migration path towads:
-                        RFC8345
-                        RFC8346
-                        draft-ietf-teas-yang-te-topo-15 (?)
-                        draft-ietf-teas-yang-l3-te-topo-01 (?) -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-ted</artifactId>
-                <version>2013.10.21.19.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-topology</artifactId>
                 <version>2013.10.21.19.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-isis</artifactId>
-                <version>2013.10.21.19.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-                <version>2013.10.21.19.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-ospf</artifactId>
-                <version>2013.10.21.19.0-SNAPSHOT</version>
-            </dependency>
 
             <!-- Features -->
             <dependency>
                 <type>xml</type>
             </dependency>
 
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
-                <version>7.0.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
index d81d227fc6caca2a889bbacfa4eb95759fcef0c7..8fd51148e9280ba148ea7d1e2ffef06d8e61804b 100644 (file)
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc8542</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-ted</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-isis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-ospf</artifactId>
-        </dependency>
 
         <!-- Also add dependencies we are using -->
         <dependency>
index f41c22c7d05e4532d54ae1ff95ba2da3d0ac10a5..2399a803b12ae43e27765ecb356e241396bc1aea 100644 (file)
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
diff --git a/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml b/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml
deleted file mode 100644 (file)
index f025273..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Pantheon Technologies, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>feature-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <name>OpenDaylight :: MD-SAL :: Model :: draft-clemm-netmod-yang-network-topo-01</name>
-    <description>Models from draft-clemm-netmod-yang-network-topo-01</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-ted</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-isis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-ospf</artifactId>
-        </dependency>
-    </dependencies>
-</project>
index 616bf6205d5cab6ba14a675c39a6683a31cc3bbf..5ecdf744bbe99af8205758a6be23c33ebd389a6a 100644 (file)
@@ -96,7 +96,6 @@
         <module>odl-mdsal-model-rfc8542</module>
 
         <!-- IETF drafts -->
-        <module>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</module>
         <module>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</module>
 
         <!-- OpenDaylight-specific -->
diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
deleted file mode 100644 (file)
index 324e591..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../../../binding/binding-parent</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-ted</artifactId>
-    <version>2013.10.21.19.0-SNAPSHOT</version>
-    <name>${project.artifactId}</name>
-    <description>${project.artifactId}</description>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/ietf-ted/src/main/yang/ted@2013-10-21.yang b/model/ietf/ietf-ted/src/main/yang/ted@2013-10-21.yang
deleted file mode 100644 (file)
index 91d8359..0000000
+++ /dev/null
@@ -1,306 +0,0 @@
-module ted {
-  yang-version 1;
-  namespace "urn:TBD:params:xml:ns:yang:network:ted";
-  // replace with IANA namespace when assigned
-  prefix ted;
-
-  import ietf-inet-types {
-    prefix inet;
-    revision-date 2013-07-15;
-  }
-
-  organization "TBD";
-  contact
-    "TBD";
-  description
-    "Helper module to hold TED attributes for OSPF/ISIS";
-
-  revision 2013-10-21 {
-
-    description
-      "Initial revision";
-  }
-
-  typedef switching-capabilities {
-    description
-      "Switching Capabilities of an interface.";
-    reference
-      "RFC 5307: IS-IS Extensions in Support of Generalized
-       Multi-Protocol Label Switching (GMPLS)";
-    type enumeration {
-      enum "PSC-1" {
-        description
-          "Packet-Switch Capable-1 (PSC-1)";
-        value 1;
-      }
-      enum "PSC-2" {
-        description
-          "Packet-Switch Capable-2 (PSC-2)";
-        value 2;
-      }
-      enum "PSC-3" {
-        description
-          "Packet-Switch Capable-3 (PSC-3)";
-        value 3;
-      }
-      enum "PSC-4" {
-        description
-          "Packet-Switch Capable-4 (PSC-4)";
-        value 4;
-      }
-      enum "L2SC" {
-        description
-          "Layer-2 Switch Capable (L2SC)";
-        value 51;
-      }
-      enum "TDM" {
-        description
-          "Time-Division-Multiplex Capable (TDM)";
-        value 100;
-      }
-      enum "LSC" {
-        description
-          "Lambda-Switch Capable (LSC)";
-        value 150;
-      }
-      enum "FSC" {
-        description
-
-          "Fiber-Switch Capable (FSC)";
-        value 200;
-      }
-    }
-  }
-
-  typedef pcc-capabilities {
-    description
-      "Path Computation Capabilities.";
-    reference
-      "RFC 5088, draft-ietf-pce-disco-protoc-isis-07.txt
-       OSPF/ISIS Protocol Extensions for Path Computation Element (PCE) Discovery.";
-    type bits {
-      bit path-computation-with-gmpls-link-constraints {
-        position 0;
-      }
-      bit bidirectional-path-computation {
-        position 1;
-      }
-      bit diverse-path-computation {
-        position 2;
-      }
-      bit load-balanced-path-computation {
-        position 3;
-      }
-      bit synchronized-path-computation {
-        position 4;
-      }
-      bit support-for-multiple-objective-functions {
-        position 5;
-      }
-      bit support-for-additive-path-constraints {
-        position 6;
-      }
-      bit support-for-request-prioritization {
-        position 7;
-      }
-      bit support-for-multiple-requests-per-message {
-        position 8;
-      }
-    }
-  }
-
-  grouping ted-node-attributes {
-    description
-      "Identifier to uniquely identify a node in TED";
-    reference "RFC 5305, RFC 6119: IPv6 Traffic Engineering in IS-IS/OSPF";
-    leaf te-router-id-ipv4 {
-
-      description
-        "Globally unique IPv4 Traffic Engineering Router ID.";
-      type inet:ipv4-address;
-    }
-    leaf te-router-id-ipv6 {
-      description
-        "Globally unique IPv6 Traffic Engineering Router ID";
-      type inet:ipv6-address;
-    }
-    list ipv4-local-address {
-      description
-        "List of IPv4 Local Address(OSPF). RFC 5786";
-      key "ipv4-prefix";
-      leaf ipv4-prefix {
-        description
-          "Local IPv4 address for the node";
-        type inet:ipv4-prefix;
-      }
-    }
-    list ipv6-local-address {
-      description
-        "List of IPv6 Local Address.";
-      reference
-        "RFC 5786: Advertising a Router's Local Addresses
-         in OSPF Traffic Engineering (TE) Extensions";
-      key "ipv6-prefix";
-      leaf ipv6-prefix {
-        description
-          "Local IPv6 address for the node";
-        type inet:ipv6-prefix;
-      }
-      leaf prefix-option {
-        description
-          "IPv6 prefix option.";
-        type uint8;
-      }
-    }
-    leaf pcc-capabilities {
-      description
-        "OSPF/ISIS PCC capabilities";
-      type pcc-capabilities;
-    }
-  }
-
-  grouping ted-link-attributes {
-    description
-      "TED Attributes associated with the link.";
-    reference "RFC 3630, RFC 3784: IS-IS / OSPF Traffic Engineering (TE)";
-
-    leaf color {
-      description
-        "Administrative group or color of the link";
-      type uint32;
-    }
-    leaf max-link-bandwidth {
-      description
-        "Maximum bandwidth that can be see on this link in this direction. Units in bytes per second";
-      type decimal64 {
-        fraction-digits 2;
-      }
-    }
-    leaf max-resv-link-bandwidth {
-      description
-        "Maximum amount of bandwidth that can be reserved in this direction in this link. Units in bytes per second";
-      type decimal64 {
-        fraction-digits 2;
-      }
-    }
-    list unreserved-bandwidth {
-      description
-        "Unreserved bandwidth for 0-7 priority levels. Units in bytes per second";
-      max-elements "8";
-      key "priority";
-      leaf priority {
-        type uint8 {
-          range "0..7";
-        }
-      }
-      leaf bandwidth {
-        description
-          "Unreserved bandwidth for this level";
-        type decimal64 {
-          fraction-digits 2;
-        }
-      }
-    }
-    leaf te-default-metric {
-      description
-        "Traffic Engineering Metric";
-      type uint32;
-    }
-    container srlg {
-      description
-        "Shared Risk Link Group Attributes";
-      uses srlg-attributes;
-    }
-  }
-
-  grouping srlg-attributes {
-    description
-      "Shared Risk Link Group Attributes";
-    reference
-      "RFC 5307, RFC 4203: ISIS / OSPF Extensions in Support of
-       Generalized Multi-Protocol Label Switching (GMPLS)";
-    list interface-switching-capabilities {
-      description
-        "List of interface capabilities for this interface";
-      key "switching-capability";
-      leaf switching-capability {
-        description
-          "Switching Capability for this interface";
-        type ted:switching-capabilities;
-      }
-      leaf encoding {
-        description
-          "Encoding supported by this interface";
-        type uint8;
-      }
-      list max-lsp-bandwidth {
-        description
-          "Maximum LSP Bandwidth at priorities 0-7";
-        max-elements "8";
-        key "priority";
-        leaf priority {
-          type uint8 {
-            range "0..7";
-          }
-        }
-        leaf bandwidth {
-          description
-            "Max LSP Bandwidth for this level";
-          type decimal64 {
-            fraction-digits 2;
-          }
-        }
-      }
-      container packet-switch-capable {
-        when "../switching-capability = PSC-1 or ../switching-capability = PSC-2 or ../switching-capability = PSC-3 or ../switching-capability = PSC-4";
-        description
-          "Interface has packet-switching capabilities";
-        leaf minimum-lsp-bandwidth {
-          description
-            "Minimum LSP Bandwidth. Units in bytes per second";
-          type decimal64 {
-            fraction-digits 2;
-          }
-
-        }
-        leaf interface-mtu {
-          description
-            "Interface MTU";
-          type uint16;
-        }
-      }
-      container time-division-multiplex-capable {
-        when "../switching-capability = TDM";
-        description
-          "Interface has time-division multiplex capabilities";
-        leaf minimum-lsp-bandwidth {
-          description
-            "Minimum LSP Bandwidth. Units in bytes per second";
-          type decimal64 {
-            fraction-digits 2;
-          }
-        }
-        leaf indication {
-          description
-            "Indication whether the interface supports Standard or Arbitrary SONET/SDH";
-          type uint16;
-        }
-      }
-    }
-    list srlg-values {
-      description
-        "List of Shared Risk Link Group this interface belongs to.";
-      key "srlg-value";
-      leaf srlg-value {
-        description
-          "Shared Risk Link Group value";
-        type uint32;
-      }
-    }
-    leaf link-protection-type {
-      description
-        "Link Protection Type desired for this link";
-      type uint16;
-    }
-  }
-}
diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml
deleted file mode 100644 (file)
index b30afd2..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../../../binding/binding-parent</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-topology-isis</artifactId>
-    <version>2013.10.21.19.0-SNAPSHOT</version>
-    <name>${project.artifactId}</name>
-    <description>${project.artifactId}</description>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-ted</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang
deleted file mode 100644 (file)
index f581202..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-module isis-topology {
-    yang-version 1;
-    namespace "urn:TBD:params:xml:ns:yang:network:isis-topology";
-    // replace with IANA namespace when assigned
-    prefix "isis";
-    import network-topology {
-        prefix nt;
-        revision-date 2013-10-21;
-    }
-    import l3-unicast-igp-topology {
-        prefix igp;
-        revision-date 2013-10-21;
-    }
-    import ted {
-        prefix ted;
-        revision-date 2013-10-21;
-    }
-
-    organization "TBD";
-    contact "TBD";
-    description "ISIS Topology model";
-
-    revision "2013-10-21" {
-        description "Initial version";
-    }
-    typedef iso-system-id {
-        description "ISO System ID. RFC 1237";
-        type string {
-            pattern '[0-9a-fA-F]{4}(\.[0-9a-fA-F]{4}){2}';
-        }
-    }
-
-    typedef iso-pseudonode-id {
-        description "ISO pseudonode id for broadcast network";
-        type string {
-            pattern '[0-9a-fA-F]{2}';
-        }
-    }
-    typedef iso-net-id {
-        description "ISO NET ID. RFC 1237";
-        type string {
-            pattern '[0-9a-fA-F]{2}((\.[0-9a-fA-F]{4}){6})';
-        }
-    }
-
-    grouping isis-topology-type {
-        container isis {
-            presence "Indicates ISIS Topology";
-        }
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:topology-types/igp:l3-unicast-igp-topology" {
-        uses isis-topology-type;
-    }
-
-    augment "/nt:network-topology/nt:topology/igp:igp-topology-attributes" {
-        when "../nt:topology-types/igp:l3-unicast-igp-topology/isis";
-        container isis-topology-attributes {
-            leaf net {
-                type iso-net-id;
-            }
-        }
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:node/igp:igp-node-attributes" {
-        when "../../nt:topology-types/igp:l3-unicast-igp-topology/isis";
-        uses isis-node-attributes;
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:link/igp:igp-link-attributes" {
-
-        when "../../nt:topology-types/igp:l3-unicast-igp-topology/isis";
-        uses isis-link-attributes;
-    }
-
-    grouping isis-node-attributes {
-        container isis-node-attributes {
-            container iso {
-                leaf iso-system-id {
-                    type iso-system-id;
-                }
-                leaf iso-pseudonode-id {
-                    default "00";
-                    type iso-pseudonode-id;
-                }
-            }
-            leaf-list net {
-                max-elements 3;
-                type iso-net-id;
-            }
-            leaf-list multi-topology-id {
-                description "List of Multi Topology Identifier upto 128 (0-127). RFC 4915";
-                max-elements "128";
-                type uint8 {
-                    range "0..127";
-                }
-            }
-            choice router-type {
-                case level-2 {
-                    leaf level-2 {
-                        type empty;
-                    }
-                }
-                case level-1 {
-                    leaf level-1 {
-                        type empty;
-                    }
-                }
-                case level-1-2 {
-                    leaf level-1-2 {
-                        type empty;
-                    }
-                }
-            }
-            container ted {
-                uses ted:ted-node-attributes;
-            }
-        }
-    }
-
-    grouping isis-link-attributes {
-        container isis-link-attributes {
-            leaf multi-topology-id {
-                type uint8 {
-                    range "0..127";
-                }
-            }
-            container ted {
-                uses ted:ted-link-attributes;
-            }
-        }
-    }
-
-    augment "/igp:igp-node-event" {
-        uses isis-topology-type;
-        uses isis-node-attributes;
-    }
-
-    augment "/igp:igp-link-event" {
-        uses isis-topology-type;
-        uses isis-link-attributes;
-    }
-} // Module isis-topology
diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
deleted file mode 100644 (file)
index 43943f5..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../../../binding/binding-parent</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-    <version>2013.10.21.19.0-SNAPSHOT</version>
-    <name>${project.artifactId}</name>
-    <description>${project.artifactId}</description>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang
deleted file mode 100644 (file)
index 73ae1ce..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-module l3-unicast-igp-topology {
-    yang-version 1;
-    namespace "urn:TBD:params:xml:ns:yang:nt:l3-unicast-igp-topology";
-    // replace with IANA namespace when assigned
-    prefix "l3t";
-    import network-topology {
-        prefix "nt";
-        revision-date 2013-10-21;
-    }
-
-    import ietf-inet-types {
-        prefix "inet";
-       revision-date 2013-07-15;
-    }
-
-    organization "TBD";
-    contact "TBD";
-
-    revision "2013-10-21" {
-        description "Initial revision";
-        reference "TBD";
-    }
-
-    typedef igp-event-type {
-        description "IGP Event type for notifications";
-            type enumeration {
-                enum "add" {
-                    value 0;
-                        description "An IGP node or link or prefix or termination-point has been added";
-                }
-                enum "remove" {
-                    value 1;
-                    description "An IGP node or link or prefix or termination-point has been removed";
-                }
-                enum "update" {
-                    value 2;
-                    description "An IGP node or link or prefix or termination-point has been updated";
-                }
-            }
-        } // igp-event-type
-
-    identity flag-identity {
-        description "Base type for flags";
-    }
-    identity undefined-flag {
-        base "flag-identity";
-    }
-
-    typedef flag-type {
-
-        type identityref {
-            base "flag-identity";
-        }
-    }
-
-    grouping igp-prefix-attributes {
-        leaf prefix {
-            type inet:ip-prefix;
-        }
-        leaf metric {
-            type uint32;
-        }
-        leaf-list flag {
-            type flag-type;
-        }
-    }
-
-    grouping l3-unicast-igp-topology-type {
-        container l3-unicast-igp-topology {
-            presence "indicates L3 Unicast IGP Topology";
-        }
-    }
-
-    grouping igp-topology-attributes {
-        container igp-topology-attributes {
-            leaf name {
-                description "Name of the topology";
-                    type string;
-            }
-            leaf-list flag {
-                description "Topology flags";
-                type flag-type;
-            }
-        }
-    }
-
-    grouping igp-node-attributes {
-        container igp-node-attributes {
-            leaf name {
-                description "Node name";
-                type inet:domain-name;
-            }
-            leaf-list flag {
-                description "Node operational flags";
-                type flag-type;
-            }
-            leaf-list router-id {
-                description "Router-id for the node";
-
-                type inet:ip-address;
-            }
-            list prefix {
-                key "prefix";
-                uses igp-prefix-attributes;
-            }
-        }
-    }
-
-    grouping igp-link-attributes {
-        container igp-link-attributes {
-            leaf name {
-                description "Link Name";
-                type string;
-            }
-            leaf-list flag {
-                description "Link flags";
-                type flag-type;
-            }
-            leaf metric {
-                description "Link Metric";
-                type uint32 {
-                    range "0..16777215"  {
-                        description "
-                        ";
-                        // OSPF/ISIS supports max 3 byte metric.
-                        // Ideally we would like this restriction to be
-                        // defined in the derived models, however,
-                        // we are not allowed to augment a "must" statement.
-                    }
-                }
-            }
-        }
-    } // grouping igp-link-attributes
-
-    grouping igp-termination-point-attributes {
-        container igp-termination-point-attributes {
-            choice termination-point-type {
-                case ip {
-                   leaf-list ip-address {
-                    description "IPv4 or IPv6 address";
-                    type inet:ip-address;
-                    }
-                }
-                case unnumbered {
-                    leaf unnumbered-id {
-                    description "Unnumbered interface identifier";
-                    type uint32;
-
-                    }
-                }
-            }
-        }
-    } // grouping igp-termination-point-attributes
-
-
-    augment "/nt:network-topology/nt:topology/nt:topology-types" {
-        uses l3-unicast-igp-topology-type;
-    }
-
-    augment "/nt:network-topology/nt:topology" {
-        when "nt:topology-types/l3-unicast-igp-topology";
-        uses igp-topology-attributes;
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:node" {
-        when "../nt:topology-types/l3-unicast-igp-topology";
-        uses igp-node-attributes;
-    }
-    augment "/nt:network-topology/nt:topology/nt:link" {
-        when "../nt:topology-types/l3-unicast-igp-topology";
-        uses igp-link-attributes;
-    }
-    augment "/nt:network-topology/nt:topology/nt:node/nt:termination-point" {
-        when "../../nt:topology-types/l3-unicast-igp-topology";
-        uses igp-termination-point-attributes;
-    }
-
-    notification igp-node-event {
-        leaf igp-event-type {
-            type igp-event-type;
-        }
-        leaf topology-ref {
-            type nt:topology-ref;
-        }
-        uses l3-unicast-igp-topology-type;
-        uses nt:node-attributes;
-        uses igp-node-attributes;
-    }
-
-    notification igp-link-event {
-        leaf igp-event-type {
-            type igp-event-type;
-        }
-        leaf topology-ref {
-            type nt:topology-ref;
-        }
-
-        uses l3-unicast-igp-topology-type;
-        uses nt:link-attributes;
-        uses igp-link-attributes;
-    }
-
-    notification igp-prefix-event {
-        leaf igp-event-type {
-            type igp-event-type;
-        }
-        leaf topology-ref {
-            type nt:topology-ref;
-        }
-        leaf node-ref {
-            type nt:node-ref;
-        }
-        uses l3-unicast-igp-topology-type;
-        container prefix {
-            uses igp-prefix-attributes;
-        }
-    }
-
-    notification termination-point-event {
-        leaf igp-event-type {
-            type igp-event-type;
-        }
-        leaf topology-ref {
-            type nt:topology-ref;
-        }
-        leaf node-ref {
-            type nt:node-ref;
-        }
-        uses l3-unicast-igp-topology-type;
-        uses nt:tp-attributes;
-        uses igp-termination-point-attributes;
-    }
-}
diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml
deleted file mode 100644 (file)
index 7fc5486..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../../../binding/binding-parent</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-topology-ospf</artifactId>
-    <version>2013.10.21.19.0-SNAPSHOT</version>
-    <name>${project.artifactId}</name>
-    <description>${project.artifactId}</description>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-ted</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-10-21.yang b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-10-21.yang
deleted file mode 100644 (file)
index 925250a..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-module ospf-topology {
-    yang-version 1;
-    namespace "urn:TBD:params:xml:ns:yang:ospf-topology";
-    // replace with IANA namespace when assigned
-
-    prefix "ospf";
-
-    import network-topology {
-        prefix "nt";
-        revision-date 2013-10-21;
-    }
-
-    import l3-unicast-igp-topology {
-        prefix "l3t";
-        revision-date 2013-10-21;
-    }
-    import ietf-inet-types {
-        prefix "inet";
-       revision-date 2013-07-15;
-    }
-    import ted {
-        prefix "ted";
-        revision-date 2013-10-21;
-    }
-
-    organization "TBD";
-    contact "TBD";
-    description "OSPF Topology model";
-
-    revision "2013-10-21" {
-        description "Initial revision";
-        reference "TBD";
-    }
-
-    typedef area-id {
-        description "OSPF Area ID";
-        type uint32;
-    }
-
-    grouping ospf-topology-type {
-        container ospf {
-            presence "indiates OSPF Topology";
-        }
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:topology-types/l3t:l3-unicast-igp-topology" {
-        uses ospf-topology-type;
-    }
-
-    augment "/nt:network-topology/nt:topology/l3t:igp-topology-attributes" {
-        when "../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
-        container ospf-topology-attributes {
-            leaf area-id {
-                type area-id;
-            }
-        }
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:node/l3t:igp-node-attributes" {
-        when "../../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
-        uses ospf-node-attributes;
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:link/l3t:igp-link-attributes" {
-        when "../../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
-        uses ospf-link-attributes;
-    }
-
-    augment "/nt:network-topology/nt:topology/nt:node/l3t:igp-node-attributes/l3t:prefix" {
-        when "../../../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
-        uses ospf-prefix-attributes;
-    }
-
-    grouping ospf-node-attributes {
-        container ospf-node-attributes {
-            choice router-type {
-                case abr {
-                    leaf abr {
-                        type empty;
-                    }
-                }
-                case asbr {
-                    leaf asbr {
-                        type empty;
-                    }
-                }
-                case internal {
-                    leaf internal {
-                        type empty;
-                    }
-                }
-                case pseudonode {
-                    leaf pseudonode {
-                        type empty;
-                    }
-                }
-            }
-            leaf dr-interface-id {
-                when "../router-type/pseudonode";
-                description "For pseudonodes, DR interface-id";
-                default "0";
-                type uint32;
-            }
-            leaf-list multi-topology-id {
-                description "List of Multi-Topology Identifier up-to 128 (0-127). RFC 4915";
-                max-elements "128";
-
-                type uint8 {
-                    range "0..127";
-                }
-            }
-            leaf capabilities {
-                description "OSPF capabilities as bit vector. RFC 4970";
-                type bits {
-                    bit graceful-restart-capable {
-                        position 0;
-                    }
-                    bit graceful-restart-helper {
-                        position 1;
-                    }
-                    bit stub-router-support {
-                        position 2;
-                    }
-                    bit traffic-engineering-support {
-                        position 3;
-                    }
-                    bit point-to-point-over-lan {
-                        position 4;
-                    }
-                    bit experimental-te {
-                        position 5;
-                    }
-                }
-            }
-            container ted {
-                uses ted:ted-node-attributes;
-            }
-        } // ospf
-    } // ospf-node-attributes
-
-    grouping ospf-link-attributes {
-        container ospf-link-attributes {
-            leaf multi-topology-id {
-                type uint8 {
-                    range "0..127";
-                }
-            }
-            container ted {
-                uses ted:ted-link-attributes;
-            }
-        }
-    } // ospf-link-attributes
-
-    grouping ospf-prefix-attributes {
-        container ospf-prefix-attributes {
-
-            leaf forwarding-address {
-                when "../../l3t:l3-unicast-igp-topology/l3t:ospf/l3t:router-type/l3t:asbr";
-                type inet:ipv4-address;
-            }
-        }
-    }
-
-    augment "/l3t:igp-node-event" {
-        uses ospf-topology-type;
-        uses ospf:ospf-node-attributes;
-    }
-
-    augment "/l3t:igp-link-event" {
-        uses ospf-topology-type;
-        uses ospf:ospf-link-attributes;
-    }
-
-    augment "/l3t:igp-prefix-event" {
-        uses ospf-topology-type;
-        uses ospf:ospf-prefix-attributes;
-    }
-}
index 11bed3bd0fde8e31d346d7d50aaaaf524f53d37b..da424076f2cddeafec5ef633175934717099c189 100644 (file)
         <module>rfc8542-ietf-dc-fabric-types</module>
 
         <!-- Legacy IETF topology models -->
-        <module>ietf-ted</module>
         <module>ietf-topology</module>
-        <module>ietf-topology-isis</module>
-        <module>ietf-topology-l3-unicast-igp</module>
-        <module>ietf-topology-ospf</module>
     </modules>
 
     <properties>