pyang fixes for base model type. changes do not affect plugin build

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

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
index a0beb2a84c936f51b83c20bd469b235563857949..02bdd1a1fa8a8510ebad0b27be5a2aa29e1bdd9e 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
@@ -2,7 +2,6 @@ module opendaylight-flow-types {
     namespace "urn:opendaylight:flow:types";
     prefix flow;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}    
     import opendaylight-match-types {prefix match; revision-date "2013-10-26";}
     import opendaylight-action-types {prefix action;}

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
similarity index 98%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
index 4442fbb3358001297434fee652faad30bb5712c4..ca64ae3d3c3fad798a9965d5e8c373a2fafed5b2 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
@@ -2,7 +2,6 @@ module opendaylight-group-types {
     namespace "urn:opendaylight:group:types";
     prefix group;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}   
     import opendaylight-action-types {prefix action;}
 
@@ -244,4 +243,4 @@ module opendaylight-group-types {
         }
     }
     
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/queue-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-queue-types.yang
similarity index 94%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/queue-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-queue-types.yang
index 06f832e114dab818e3e888bbdbcf0113485b2983..cdcf0ecf1408aea3dc5189ae40da3f88ffa9a07f 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/queue-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-queue-types.yang
@@ -2,7 +2,6 @@ module opendaylight-queue-types {
     namespace "urn:opendaylight:flow:types:queue";
     prefix queue-types;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     
     revision "2013-09-25" {
@@ -75,6 +74,5 @@ module opendaylight-queue-types {
             description "Port to be queried.";  
         }
         
-        }
- }
-}
\ No newline at end of file
+    }
+}