From: Prasanna Huddar <prasanna.huddar@ericsson.com>
Date: Mon, 20 Jan 2014 03:49:24 +0000 (-0800)
Subject: pyang fixes for base model type. changes do not affect plugin build
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~50
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9bef2a0bc41614347fe09a75cdabe8936759dc43;ds=sidebyside

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 a0beb2a84c..02bdd1a1fa 100644
--- 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 4442fbb335..ca64ae3d3c 100644
--- 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 06f832e114..cdcf0ecf14 100644
--- 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
+    }
+}