From ebc73539ef71045df4295559e1d8c365dc6fd00c Mon Sep 17 00:00:00 2001 From: Prasanna Huddar Date: Sun, 19 Jan 2014 19:43:39 -0800 Subject: [PATCH 1/1] pyang fixes for inventory and topology models Signed-off-by: Prasanna Huddar Change-Id: I0ef0e3a7a0ca96743d5c1d304b3a9f70714593c5 --- .../src/main/yang/opendaylight-inventory-config.yang | 4 +--- .../yang/{node-inventory.yang => opendaylight-inventory.yang} | 3 +-- .../{topology-view.yang => opendaylight-topology-view.yang} | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) rename opendaylight/md-sal/model/model-inventory/src/main/yang/{node-inventory.yang => opendaylight-inventory.yang} (97%) rename opendaylight/md-sal/model/model-topology/src/main/yang/{topology-view.yang => opendaylight-topology-view.yang} (92%) diff --git a/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang index aaaedc1dc5..1ccdfe8741 100644 --- a/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang +++ b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang @@ -3,8 +3,6 @@ module opendaylight-inventory-config { prefix inv-config; import yang-ext {prefix ext; revision-date "2013-07-09";} - import ietf-inet-types {prefix inet; revision-date "2010-09-24";} - import ietf-yang-types {prefix yang; revision-date "2010-09-24";} import opendaylight-inventory {prefix inv; revision-date "2013-08-19";} @@ -20,4 +18,4 @@ module opendaylight-inventory-config { uses inv:node; } } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang similarity index 97% rename from opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang rename to opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang index 77c92f91ce..396206e28e 100644 --- a/opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang +++ b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang @@ -4,7 +4,6 @@ module opendaylight-inventory { import yang-ext {prefix ext; revision-date "2013-07-09";} import ietf-inet-types {prefix inet; revision-date "2010-09-24";} - import ietf-yang-types {prefix yang; revision-date "2010-09-24";} revision "2013-08-19" { @@ -119,4 +118,4 @@ module opendaylight-inventory { type node-connector-ref; } } -} \ No newline at end of file +} diff --git a/opendaylight/md-sal/model/model-topology/src/main/yang/topology-view.yang b/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang similarity index 92% rename from opendaylight/md-sal/model/model-topology/src/main/yang/topology-view.yang rename to opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang index 21cf8fc8a8..99e5effdf6 100644 --- a/opendaylight/md-sal/model/model-topology/src/main/yang/topology-view.yang +++ b/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang @@ -5,9 +5,7 @@ module opendaylight-topology-view { prefix "nt"; import yang-ext { prefix "ext"; } - import ietf-inet-types { prefix "inet"; } import network-topology {prefix "topo"; revision-date "2013-10-21"; } - import opendaylight-topology {prefix "odl";} organization "TBD"; -- 2.36.6