Merge "Unify topology versions used in controller"

[controller.git] / opendaylight / md-sal / model / model-topology / src / main / yang / opendaylight-topology-inventory.yang

diff --git a/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang b/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
index 33c03ba059722a1a2162c7f3b3559a24c6267b49..87de0f5ae191e51b205668e72b8b08def97c1e7b 100644 (file)
--- a/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
+++ b/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang
@@ -8,7 +8,7 @@ module opendaylight-topology-inventory {
     import ietf-inet-types { prefix "inet"; }
     import opendaylight-inventory {prefix "inv";}
     import opendaylight-topology {prefix "odt";}
-    import network-topology {prefix "topo";}
+    import network-topology {prefix "topo"; revision-date "2013-07-12"; }
 
     organization "TBD";
 
@@ -21,14 +21,16 @@ module opendaylight-topology-inventory {
 
     augment "/topo:network-topology/topo:topology/topo:node" {
         ext:augment-identifier "inventory-node";
-        uses inv:node-context-ref;
+        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 node-connector {
+        leaf inventory-node-connector-ref {
             ext:context-reference "inv:node-connector-context";
             type inv:node-connector-ref;
         }
     }
-}
\ No newline at end of file
+}