Remove model-inventory and odl-mdsal-model-inventory 98/96098/1
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 9 May 2021 20:15:43 +0000 (22:15 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 9 May 2021 20:16:37 +0000 (22:16 +0200)
This model is only used by OpenFlow world, do not carry it in controller
and let OFP take ownership of it.

JIRA: CONTROLLER-1979
Change-Id: I12371cafba9f8033e8d2174181769b6ac11793d3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
artifacts/pom.xml
docs/pom.xml
features/features-controller/pom.xml
features/odl-mdsal-model-inventory/pom.xml [deleted file]
features/odl-mdsal-model-inventory/src/main/feature/feature.xml [deleted file]
features/pom.xml
model/model-inventory/pom.xml [deleted file]
model/model-inventory/src/main/yang/opendaylight-inventory.yang [deleted file]
model/pom.xml [deleted file]
pom.xml

index b56e4b9..30b9e4b 100644 (file)
                 <scope>test</scope>
             </dependency>
 
-            <!-- Base model augmentations -->
-            <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-inventory</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- Clustered implementation -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-model-inventory</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-toaster</artifactId>
index 8cf8f4b..f8e6111 100644 (file)
             <artifactId>threadpool-config-impl</artifactId>
         </dependency>
 
-        <!-- Base model augmentations -->
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
-
         <!-- Clustered implementation -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
index 58156e2..c810c41 100644 (file)
             <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</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>
diff --git a/features/odl-mdsal-model-inventory/pom.xml b/features/odl-mdsal-model-inventory/pom.xml
deleted file mode 100644 (file)
index 27050c3..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. 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
- -->
-<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-mdsal-model-inventory</artifactId>
-    <packaging>feature</packaging>
-    <name>OpenDaylight :: MD-SAL :: Inventory Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-rfc6991</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/odl-mdsal-model-inventory/src/main/feature/feature.xml b/features/odl-mdsal-model-inventory/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 2702dbd..0000000
+++ /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-mdsal-model-inventory-${project.version}">
-    <feature name="odl-mdsal-model-inventory" version="${project.version}">
-        <feature version="[8,9)">odl-mdsal-model-rfc6991</feature>
-    </feature>
-</features>
index e2e799b..ae2de45 100644 (file)
@@ -53,7 +53,6 @@
     <module>odl-mdsal-broker</module>
     <module>odl-mdsal-clustering-commons</module>
     <module>odl-mdsal-distributed-datastore</module>
-    <module>odl-mdsal-model-inventory</module>
     <module>odl-mdsal-remoterpc-connector</module>
     <module>odl-toaster</module>
   </modules>
diff --git a/model/model-inventory/pom.xml b/model/model-inventory/pom.xml
deleted file mode 100644 (file)
index 379181d..0000000
+++ /dev/null
@@ -1,42 +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.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller.model</groupId>
-    <artifactId>model-inventory</artifactId>
-    <packaging>bundle</packaging>
-    <version>4.0.0-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991-ietf-inet-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>yang-ext</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-inventory/src/main/yang/opendaylight-inventory.yang b/model/model-inventory/src/main/yang/opendaylight-inventory.yang
deleted file mode 100644 (file)
index f58fcc4..0000000
+++ /dev/null
@@ -1,251 +0,0 @@
-module opendaylight-inventory {
-    namespace "urn:opendaylight:inventory";
-    prefix inv;
-
-    import yang-ext { prefix ext; revision-date "2013-07-09"; }
-    import ietf-inet-types { prefix inet; revision-date "2013-07-15"; }
-
-    revision "2013-08-19" {
-        description "Initial revision of Inventory model";
-    }
-
-    typedef support-type {
-        type enumeration {
-            enum native;
-            enum emulated;
-            enum not-supported;
-        }
-    }
-
-    typedef node-id {
-        type inet:uri;
-        description "Identifier for a particular node. For example:
-
-                         myprotocol:<unique_node_id>
-
-                         myprotocol:12
-
-                     It is a good practice to always lead with a scoping
-                     identifier. In the example above the scoping was
-                     'myprotocol'. In your app you could use 'myapp' etc.";
-    }
-
-    typedef node-connector-id {
-        type inet:uri;
-        description "Identifier for a particular node-connector. For example:
-
-                         myprotocol:<unique_node_connector_id>
-                         myprotocol:3
-
-                     It is a good practice to always lead with a scoping
-                     identifier. In the example above the scoping was
-                     'myprotocol'. In your app you could use 'myapp' etc.";
-    }
-
-    // YANG does not have a statement which limits the scope of an
-    // instance-identifier to a particular subtree, which is why we are using
-    // a type capture and not an instance-identifier to define a node-ref and
-    // a node-connector-ref.
-    typedef node-ref {
-        type instance-identifier;
-        description "A reference that points to an
-                     opendaylight-light:nodes/node in the data tree.";
-    }
-
-    typedef node-connector-ref {
-        type instance-identifier;
-        description "A reference that points to an
-                     opendaylight-list:nodes/node/{node-id}/node-connector in
-                     the data tree.";
-    }
-
-    identity node-context {
-        description "A node-context is a classifier for node elements which
-                     allows an RPC to provide a service on behalf of a
-                     particular element in the data tree.";
-    }
-
-    identity node-connector-context {
-        description "A node-connector-context is a classifier for
-                     node-connector elements which allows an RPC to provide
-                     a service on behalf of a particular element in the data
-                     tree.";
-    }
-
-    // We are defining a base identity here because there are limitations with
-    // YANG enums. YANG does not allow you to extend enumeratations, therefore
-    // by defining a base identity we allow other yang files to extend this
-    // identity to define additional "enumerations". By using node-type as
-    // their base they are able to pass their object to fields that accept
-    // "node-types" while uniquely describing their type of node, such as
-    // "router-node" or "switch-node" etc.
-    // See https://wiki.opendaylight.org/view/YANG_Tools:YANG_to_Java_Mapping#Identity
-    // for more information.
-    identity node-type {
-        description "A base identity definition which represents a generic
-                     node type and can be extended in other yang files.";
-    }
-
-    identity node-connector-type {
-        description "A base identity definition which represents a generic
-                     node connector type and can be extended in other YANG
-                     files.";
-    }
-
-    grouping node {
-        description "Describes the contents of a generic node -
-                     essentially an ID and a list of node-connectors.
-                     Acts as an augmentation point where other YANG files
-                     can add additional information.";
-
-        leaf id {
-            type node-id;
-            description "The unique identifier for the node.";
-        }
-
-        list "node-connector" {
-            key "id";
-
-            description "A list of node connectors that belong this node.";
-            ext:context-instance "node-connector-context";
-
-            uses node-connector;
-        }
-    }
-
-    grouping node-connector {
-        description "Describes a generic node connector which consists of an ID.
-                     Acts as an augmentation point where other YANG files can
-                     add additional information.";
-
-        leaf id {
-            type node-connector-id;
-            description "The unique identifier for the node-connector.";
-        }
-    }
-
-    grouping node-context-ref {
-        description "A helper grouping which contains a reference to a node
-                     classified with a node-context. This allows RPCs in other
-                     YANG files to refine their input to a particular node
-                     instance.";
-
-        leaf node {
-            ext:context-reference "node-context";
-            type node-ref;
-            description "A reference to a particular node.";
-        }
-    }
-
-    // Base structure
-    container nodes {
-        description "The root container of all nodes.";
-
-        list node {
-            key "id";
-            ext:context-instance "node-context";
-            description "A list of nodes (as defined by the 'grouping node').";
-            uses node; //this refers to the 'grouping node' defined above.
-        }
-    }
-
-    // The following notifications should really be replaced by direct writes
-    // to the data tree with data change listeners listening to those changes.
-    // Notifications should be reserved for one time events which do not
-    // require persistence to the data tree.
-    notification node-updated {
-        status deprecated;
-
-        description "A notification sent by someone who realized there was
-                     a modification to a node, but did not modify the data
-                     tree.
-
-                     Describes that something on the node has been updated
-                     (including addition of a new node), but is for whatever
-                     reason is not modifying the data tree.
-
-                     Deprecated: If a process determines that a node was
-                     updated, then that logic should update the node using
-                     the DataBroker directly. Listeners interested update
-                     changes should register a data change listener for
-                     notifications on removals.";
-
-        leaf node-ref {
-            ext:context-reference "node-context";
-            description "A reference to the node which changed.";
-
-            type node-ref;
-        }
-        uses node;
-    }
-
-    notification node-connector-updated {
-        status deprecated;
-
-        description "A notification sent by someone who realized there was
-                     a modification to a node-connector, but did not modify
-                     the data tree.
-
-                     Describes that something on the node-connector has been
-                     updated (including addition of a new node-connector), but
-                     is for whatever reason is not modifying the data tree.
-
-                     Deprecated: If a process determines that a node-connector
-                     was updated, then that logic should update the
-                     node-connector using the DataBroker directly. Listeners
-                     interested update changes should register a data change
-                     listener for notifications on removals.";
-
-        leaf node-connector-ref {
-            ext:context-reference "node-connector-context";
-            type node-connector-ref;
-            description "A reference to the node-connector which changed.";
-        }
-        uses node-connector;
-    }
-
-    notification node-removed {
-        status deprecated;
-
-        description "A notification sent by someone who realized there was
-                     a node was removed, but did not modify the data tree.
-
-                     Describes that a node has been removed but is for whatever
-                     reason is not modifying the data tree.
-
-                     Deprecated: If a process determines that a node was
-                     removed, then that logic should remove the node from
-                     the DataBroker directly. Listeners interested in changes
-                     should register a data change listener for notifications
-                     on removals.";
-
-        leaf node-ref {
-            description "A reference to the node that was removed.";
-            ext:context-reference "node-context";
-            type node-ref;
-        }
-    }
-
-    notification node-connector-removed {
-        status deprecated;
-
-        description "A notification sent by someone who realized there was
-                     a node-connector was removed, but did not modify the data
-                     tree.
-
-                     Describes that a node-connector has been removed but is
-                     for whatever reason is not modifying the data tree.
-
-                     Deprecated: If a process determines that a node-connector
-                     was removed, then that logic should remove the
-                     node-connector from the DataBroker directly. Listeners
-                     interested in changes should register a data change
-                     listener for notifications on removals.";
-
-        leaf node-connector-ref {
-            description "A reference to the node-connector that was removed.";
-            ext:context-reference "node-connector-context";
-            type node-connector-ref;
-        }
-    }
-}
diff --git a/model/pom.xml b/model/pom.xml
deleted file mode 100644 (file)
index 9c51951..0000000
+++ /dev/null
@@ -1,32 +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.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>9.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller.model</groupId>
-    <artifactId>model-aggregator</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-
-    <modules>
-        <module>model-inventory</module>
-    </modules>
-</project>
diff --git a/pom.xml b/pom.xml
index ec9c6b4..0ff8524 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
     <module>bundle-parent</module>
     <module>benchmark</module>
     <module>jolokia</module>
-    <module>model</module>
 
     <!-- md-sal -->
     <module>opendaylight/md-sal</module>