pyang fixes for inventory and topology models

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I0ef0e3a7a0ca96743d5c1d304b3a9f70714593c5

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 aaaedc1dc570f9ef6d12ede48fa692e2c2150acf..1ccdfe87419a40a652880922067af579887fa7de 100644 (file)
--- 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";}
     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";}
 
 
     import opendaylight-inventory {prefix inv; revision-date "2013-08-19";}
 
 


@@ -20,4 +18,4 @@ module opendaylight-inventory-config {
             uses inv:node;
         }
     }    
             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 77c92f91ce4358883513079f209c0d5098d9b2aa..396206e28ed30f1a03c8b28f72fec645911fa86f 100644 (file)
--- 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 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" {
 
 
     revision "2013-08-19" {


@@ -119,4 +118,4 @@ module opendaylight-inventory {
             type node-connector-ref;
         }
     }
             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 21cf8fc8a82361e935c766445089c41e35227a12..99e5effdf6cc8bbc22ff3c6a3231f0b12c6e38da 100644 (file)
--- 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"; }
     prefix "nt";
 
     import yang-ext { prefix "ext"; }

-    import ietf-inet-types { prefix "inet"; }

     import network-topology {prefix "topo"; revision-date "2013-10-21"; }
     import network-topology {prefix "topo"; revision-date "2013-10-21"; }

-    import opendaylight-topology {prefix "odl";}

 
     organization "TBD";
 
 
     organization "TBD";