From 0bfafa85b77a5d0ee76df369f9b667ad1652ef34 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 9 May 2021 22:15:43 +0200 Subject: [PATCH] Remove model-inventory and odl-mdsal-model-inventory 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 --- artifacts/pom.xml | 14 - docs/pom.xml | 6 - features/features-controller/pom.xml | 6 - features/odl-mdsal-model-inventory/pom.xml | 35 --- .../src/main/feature/feature.xml | 13 - features/pom.xml | 1 - model/model-inventory/pom.xml | 42 --- .../src/main/yang/opendaylight-inventory.yang | 251 ------------------ model/pom.xml | 32 --- pom.xml | 1 - 10 files changed, 401 deletions(-) delete mode 100644 features/odl-mdsal-model-inventory/pom.xml delete mode 100644 features/odl-mdsal-model-inventory/src/main/feature/feature.xml delete mode 100644 model/model-inventory/pom.xml delete mode 100644 model/model-inventory/src/main/yang/opendaylight-inventory.yang delete mode 100644 model/pom.xml diff --git a/artifacts/pom.xml b/artifacts/pom.xml index b56e4b981a..30b9e4bef8 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -59,13 +59,6 @@ test - - - org.opendaylight.controller.model - model-inventory - ${project.version} - - ${project.groupId} @@ -319,13 +312,6 @@ xml features - - ${project.groupId} - odl-mdsal-model-inventory - ${project.version} - xml - features - ${project.groupId} odl-toaster diff --git a/docs/pom.xml b/docs/pom.xml index 8cf8f4bcb1..f8e61114f6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -58,12 +58,6 @@ threadpool-config-impl - - - org.opendaylight.controller.model - model-inventory - - org.opendaylight.controller diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index 58156e2ed7..c810c413ee 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -77,12 +77,6 @@ xml features - - org.opendaylight.controller - odl-mdsal-model-inventory - xml - features - org.opendaylight.controller odl-mdsal-remoterpc-connector diff --git a/features/odl-mdsal-model-inventory/pom.xml b/features/odl-mdsal-model-inventory/pom.xml deleted file mode 100644 index 27050c37f9..0000000000 --- a/features/odl-mdsal-model-inventory/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.controller - single-feature-parent - 4.0.0-SNAPSHOT - ../single-feature-parent - - - odl-mdsal-model-inventory - feature - OpenDaylight :: MD-SAL :: Inventory Model - - - - org.opendaylight.mdsal.model - odl-mdsal-model-rfc6991 - xml - features - - - - org.opendaylight.controller.model - model-inventory - - - 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 index 2702dbdb32..0000000000 --- a/features/odl-mdsal-model-inventory/src/main/feature/feature.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - odl-mdsal-model-rfc6991 - - diff --git a/features/pom.xml b/features/pom.xml index e2e799b404..ae2de45173 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -53,7 +53,6 @@ odl-mdsal-broker odl-mdsal-clustering-commons odl-mdsal-distributed-datastore - odl-mdsal-model-inventory odl-mdsal-remoterpc-connector odl-toaster diff --git a/model/model-inventory/pom.xml b/model/model-inventory/pom.xml deleted file mode 100644 index 379181d647..0000000000 --- a/model/model-inventory/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - 4.0.0 - - org.opendaylight.mdsal - binding-parent - 8.0.0-SNAPSHOT - - - - org.opendaylight.controller.model - model-inventory - bundle - 4.0.0-SNAPSHOT - - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-inet-types - - - org.opendaylight.mdsal.model - yang-ext - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - 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 index f58fcc48fe..0000000000 --- a/model/model-inventory/src/main/yang/opendaylight-inventory.yang +++ /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: - - 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: - 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 index 9c51951084..0000000000 --- a/model/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 9.0.1 - - - - org.opendaylight.controller.model - model-aggregator - 4.0.0-SNAPSHOT - pom - - - true - true - - - - model-inventory - - diff --git a/pom.xml b/pom.xml index ec9c6b4609..0ff8524a65 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ bundle-parent benchmark jolokia - model opendaylight/md-sal -- 2.36.6