From 0ff4645c53789c32f45e4587938ef2ff491d6e59 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 5 Sep 2019 08:34:00 +0200
Subject: [PATCH] Revert "Bug 3871: Deprecate opendaylight-inventory model."

This reverts commit 973bde38d5f02b4e65f20363ef03d17587433a21,
as the migration is not coming along and deprecated constructs
are causing massive number of warnings, hiding more important
ones.

Change-Id: I1e3d27374ffba0e584f194d468cebcfa9cecfe81
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../src/main/yang/opendaylight-inventory.yang   | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang b/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang
index bf025f415a..d61a4c0f77 100644
--- a/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang
+++ b/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang
@@ -12,7 +12,6 @@ module opendaylight-inventory {
 
 
     typedef support-type {
-        status deprecated;
         type enumeration {
             enum native;
             enum emulated;
@@ -21,7 +20,6 @@ module opendaylight-inventory {
     }
 
     typedef node-id {
-        status deprecated;
         type inet:uri;
         description "Identifier for a particular node. For example:
 
@@ -35,7 +33,6 @@ module opendaylight-inventory {
     }
 
     typedef node-connector-id {
-        status deprecated;
         type inet:uri;
         description "Identifier for a particular node-connector. For example:
 
@@ -51,24 +48,20 @@ module opendaylight-inventory {
     //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 {
-        status deprecated;
         type instance-identifier;
         description "A reference that points to an opendaylight-light:nodes/node in the data tree.";
     }
 
     typedef node-connector-ref {
-        status deprecated;
         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 {
-        status deprecated;
         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 {
-        status deprecated;
         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.";
     }
 
@@ -78,17 +71,15 @@ module opendaylight-inventory {
     //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 {
-        status deprecated;
         description "A base identity definition which represents a generic node type and can be extended in other yang files.";
     }
 
     identity node-connector-type {
-        status deprecated;
         description "A base identity definition which represents a generic node connector type and can be extended in other yang files.";
     }
 
     grouping node {
-        status deprecated;
+
         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
@@ -110,7 +101,7 @@ module opendaylight-inventory {
     }
 
     grouping node-connector {
-        status deprecated;
+
         description "Describes a generic node connector which consists of an ID.
                      Acts as an augmentation point where other yang files can
                       add additional information.";
@@ -122,7 +113,6 @@ module opendaylight-inventory {
     }
 
     grouping node-context-ref {
-        status deprecated;
         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.";
 
@@ -135,7 +125,7 @@ module opendaylight-inventory {
 
     /** Base structure **/
     container nodes {
-        status deprecated;
+
         description "The root container of all nodes.";
 
         list node {
@@ -149,6 +139,7 @@ module opendaylight-inventory {
     //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.
-- 
2.36.6