From: Tony Tkacik Date: Wed, 19 Aug 2015 12:53:16 +0000 (+0200) Subject: Bug 3871: Deprecate opendaylight-inventory model. X-Git-Tag: release/beryllium~24 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=973bde38d5f02b4e65f20363ef03d17587433a21 Bug 3871: Deprecate opendaylight-inventory model. Change-Id: I526496120b79158df41aec315d67303e4604074b Signed-off-by: Tony Tkacik Signed-off-by: Robert Varga --- diff --git a/opendaylight/model/model-inventory/src/main/yang/netconf-node-inventory.yang b/opendaylight/model/model-inventory/src/main/yang/netconf-node-inventory.yang index e7ac38cba1..45fbd42d8a 100644 --- a/opendaylight/model/model-inventory/src/main/yang/netconf-node-inventory.yang +++ b/opendaylight/model/model-inventory/src/main/yang/netconf-node-inventory.yang @@ -1,23 +1,24 @@ module netconf-node-inventory { namespace "urn:opendaylight:netconf-node-inventory"; prefix "netinv"; - + import opendaylight-inventory { prefix inv; revision-date "2013-08-19";} import yang-ext {prefix ext; revision-date "2013-07-09";} - + revision "2014-01-08" { description "Initial revision of Inventory model"; } - + grouping netconf-node-fields { + status deprecated; leaf connected { - type boolean; + type boolean; } - + leaf-list initial-capability { type string; } - + leaf-list current-capability { type string; } @@ -30,10 +31,10 @@ module netconf-node-inventory { mount extension."; } } - + augment /inv:nodes/inv:node { ext:augment-identifier "netconf-node"; - + status deprecated; uses netconf-node-fields; } } 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 64d212e9bc..9dc61ebe6b 100644 --- a/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang +++ b/opendaylight/model/model-inventory/src/main/yang/opendaylight-inventory.yang @@ -12,6 +12,7 @@ module opendaylight-inventory { typedef support-type { + status deprecated; type enumeration { enum native; enum emulated; @@ -20,6 +21,7 @@ module opendaylight-inventory { } typedef node-id { + status deprecated; type inet:uri; description "Identifier for a particular node. For example: @@ -33,6 +35,7 @@ module opendaylight-inventory { } typedef node-connector-id { + status deprecated; type inet:uri; description "Identifier for a particular node-connector. For example: @@ -48,20 +51,24 @@ 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."; } @@ -71,15 +78,17 @@ 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 @@ -101,7 +110,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."; @@ -113,6 +122,7 @@ 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."; @@ -125,7 +135,7 @@ module opendaylight-inventory { /** Base structure **/ container nodes { - + status deprecated; description "The root container of all nodes."; list node { @@ -139,7 +149,6 @@ 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.