Remove model-topology

The opendaylight-topology*.yang models are the very first cut at
modeling a network. As such they have been superseded by standard-track
draft ietf-topology, which evolved into ietf-network.

There is noone using these old models in OpenDaylight proper, which
means they are just a maintenance burden and serve only to confuse
newcomers.

JIRA: CONTROLLER-1978
Change-Id: I051781d05f1caf10b9b3c65a4f178b20162adad6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index af916f3a9285c10e3d19b6edb4cdf3bb428b6bc9..7b5685df277edfb51a998b201839438c962edfa8 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -65,11 +65,6 @@
                 <artifactId>model-inventory</artifactId>
                 <version>${project.version}</version>
             </dependency>
                 <artifactId>model-inventory</artifactId>
                 <version>${project.version}</version>
             </dependency>

-            <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-topology</artifactId>
-                <version>${project.version}</version>
-            </dependency>

 
             <!-- Clustered implementation -->
             <dependency>
 
             <!-- Clustered implementation -->
             <dependency>


@@ -331,13 +326,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>

-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-controller-model-topology</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-toaster</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-toaster</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
index 7168d72abb7e8fe9b270a5ce30ff81003baf29eb..e6417653ce826571659271823e4090617dad37f3 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -63,10 +63,6 @@
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>

-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-topology</artifactId>
-        </dependency>

 
         <!-- Clustered implementation -->
         <dependency>
 
         <!-- Clustered implementation -->
         <dependency>

diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index 5e452869b94d1afb89d03f7293a1e642f540ff02..d39607d8df93b442de4416bdd8a5ebccc48368fd 100644 (file)
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -83,12 +83,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-controller-model-topology</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>

diff --git a/features/odl-controller-model-topology/pom.xml b/features/odl-controller-model-topology/pom.xml
deleted file mode 100644 (file)
index c39b314..0000000
--- a/features/odl-controller-model-topology/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2018 Ericsson India Global Services Pvt Ltd. 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.controller</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../single-feature-parent</relativePath>
-    </parent>
-
-    <artifactId>odl-controller-model-topology</artifactId>
-    <packaging>feature</packaging>
-    <name>OpenDaylight :: MD-SAL :: Topology Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-model-inventory</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-topology</artifactId>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/odl-controller-model-topology/src/main/feature/feature.xml b/features/odl-controller-model-topology/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 1b0e403..0000000
--- a/features/odl-controller-model-topology/src/main/feature/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2020 PANTHEON.tech, s.r.o. and others.
-
- 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
- -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-model-topology-${project.version}">
-    <feature name="odl-controller-model-topology" version="${project.version}">
-        <feature version="[7,8)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
-    </feature>
-</features>

diff --git a/features/pom.xml b/features/pom.xml
index 3651ae28f05f011a60f3b074922b25d0beab5401..14b2abcd976b1985417b593f6d2873eff04b2444 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -48,7 +48,6 @@
     <!-- Single features, to be cleaned up -->
     <module>odl-controller-blueprint</module>
     <module>odl-controller-mdsal-common</module>
     <!-- Single features, to be cleaned up -->
     <module>odl-controller-blueprint</module>
     <module>odl-controller-mdsal-common</module>

-    <module>odl-controller-model-topology</module>

     <module>odl-jolokia</module>
     <module>odl-mdsal-broker-local</module>
     <module>odl-mdsal-broker</module>
     <module>odl-jolokia</module>
     <module>odl-mdsal-broker-local</module>
     <module>odl-mdsal-broker</module>

diff --git a/model/model-topology/pom.xml b/model/model-topology/pom.xml
deleted file mode 100644 (file)
index 9a37132..0000000
--- a/model/model-topology/pom.xml
+++ /dev/null
@@ -1,40 +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">
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../opendaylight/md-sal/parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.controller.model</groupId>
-    <artifactId>model-topology</artifactId>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-topology</artifactId>
-        </dependency>
-    </dependencies>
-    <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    </scm>
-</project>

diff --git a/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang b/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
deleted file mode 100644 (file)
index 86a02b8..0000000
--- a/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
+++ /dev/null
@@ -1,34 +0,0 @@
-module opendaylight-topology-inventory {
-    yang-version 1;
-    namespace "urn:opendaylight:model:topology:inventory";
-    // replace with IANA namespace when assigned
-    prefix "nt";
-
-    import yang-ext { prefix "ext"; }
-    import opendaylight-inventory {prefix "inv";}
-    import network-topology {prefix "topo"; revision-date "2013-10-21"; }
-
-    organization "TBD";
-
-    contact "WILL-BE-DEFINED-LATER";
-
-    revision 2013-10-30 {
-        description
-            "Initial revision.";
-    }
-
-    augment "/topo:network-topology/topo:topology/topo:node" {
-        ext:augment-identifier "inventory-node";
-        leaf inventory-node-ref {
-            type inv:node-ref;
-        }
-    }
-
-    augment "/topo:network-topology/topo:topology/topo:node/topo:termination-point" {
-        ext:augment-identifier "inventory-node-connector";
-        leaf inventory-node-connector-ref {
-            ext:context-reference "inv:node-connector-context";
-            type inv:node-connector-ref;
-        }
-    }
-}

diff --git a/model/model-topology/src/main/yang/opendaylight-topology-view.yang b/model/model-topology/src/main/yang/opendaylight-topology-view.yang
deleted file mode 100644 (file)
index 99e5eff..0000000
--- a/model/model-topology/src/main/yang/opendaylight-topology-view.yang
+++ /dev/null
@@ -1,46 +0,0 @@
-module opendaylight-topology-view  {
-    yang-version 1;
-    namespace "urn:opendaylight:model:topology:view";
-    // replace with IANA namespace when assigned
-    prefix "nt";
-
-    import yang-ext { prefix "ext"; }
-    import network-topology {prefix "topo"; revision-date "2013-10-21"; }
-
-    organization "TBD";
-
-    contact "WILL-BE-DEFINED-LATER";
-
-    revision 2013-10-30 {
-        description
-            "Initial revision.";
-    }
-    
-
-    grouping aggregate-topology {
-        leaf-list original-topology {
-            type topo:topology-ref;    
-        }
-    }
-
-    grouping aggregate-node {
-        list original-node {
-            leaf topology {
-                type topo:topology-ref;
-            }
-            leaf node {
-                type topo:node-ref;
-            }
-        }
-    }
-
-    augment "/topo:network-topology/topo:topology" {
-        ext:augment-identifier "aggregated-topology";
-        uses aggregate-topology;
-    }
-
-    augment "/topo:network-topology/topo:topology/topo:node" {
-        ext:augment-identifier "aggregated-node";
-        uses aggregate-node;
-    }
-}

diff --git a/model/model-topology/src/main/yang/opendaylight-topology.yang b/model/model-topology/src/main/yang/opendaylight-topology.yang
deleted file mode 100644 (file)
index c960085..0000000
--- a/model/model-topology/src/main/yang/opendaylight-topology.yang
+++ /dev/null
@@ -1,63 +0,0 @@
-module opendaylight-topology {
-    yang-version 1;
-    namespace "urn:opendaylight:model:topology:general";
-    // replace with IANA namespace when assigned
-    prefix "nt";
-
-    import yang-ext { prefix "ext"; }
-    import ietf-inet-types { prefix "inet"; }
-    import network-topology {prefix "topo"; revision-date "2013-10-21"; }
-
-    organization "TBD";
-
-    contact "WILL-BE-DEFINED-LATER";
-
-    revision 2013-10-30 {
-        description
-            "Initial revision.";
-    }
-
-    identity node-type {
-    
-    }
-    
-    typedef node-type-ref {
-        type identityref {
-            base node-type;
-       }
-    }
-    
-    identity topology-context {
-    
-    }
-    
-    identity topology-node-context {
-        
-    }
-
-    grouping node-identifiers {
-        list node-identifier {
-            key "type identifier";
-            leaf type {
-                type node-type-ref;
-            }
-            leaf identifier {
-                type inet:uri;
-            }
-        }
-    }
-
-    augment "/topo:network-topology/topo:topology" {
-        ext:context-instance "topology-context";
-    }
-
-    /* Inventory Augmentations */
-    augment "/topo:network-topology/topo:topology/topo:node" {
-        ext:context-instance "topology-node-context";
-    }
-
-    augment "/topo:network-topology/topo:topology/topo:node" {
-        ext:augment-identifier "identifiable-node";
-        uses node-identifiers;
-    }
-}

diff --git a/model/pom.xml b/model/pom.xml
index 7b9cf857d440577ed42c28fcd2da457904a2844c..878256e631f621727a89cfd25edc865e1cb909d7 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -28,6 +28,5 @@
 
     <modules>
         <module>model-inventory</module>
 
     <modules>
         <module>model-inventory</module>

-        <module>model-topology</module>

     </modules>
 </project>
     </modules>
 </project>