Removed import related warnings from most of YANG Models

  - Added revision-date statement to YANG models,
  - Added reusable grouping to inventory model, used this grouping
    in service models.

Change-Id: I78bfc3f97c5f58d755922839a6dfab07a2968ea0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/md-sal/model/model-flow-base/pom.xml b/opendaylight/md-sal/model/model-flow-base/pom.xml
index ff88ba75750eea0220ec991dec9de3fcd7ce5c3e..13ffa3f91002121c17dc71abb1d748ffe90f906f 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-base/pom.xml
@@ -16,11 +16,6 @@
     <artifactId>model-flow-base</artifactId>
     
     <dependencies>
     <artifactId>model-flow-base</artifactId>
     
     <dependencies>

-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>model-inventory</artifactId>
-            <version>${project.version}</version>
-        </dependency>

         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
index 5382daf45431b30feb0ed9e2a1c296384c59fe8a..8e8c82293505795d7a53e5ada9275320a05ad617 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
@@ -2,10 +2,11 @@ module opendaylight-flow-types {
     namespace "urn:opendaylight:flow:types";
     prefix flow;
 
     namespace "urn:opendaylight:flow:types";
     prefix flow;
 

-    import ietf-inet-types {prefix inet;}
-    import opendaylight-match-types {prefix match;}
-    import ietf-yang-types {prefix yang;}
-    import opendaylight-l2-types {prefix l2t;}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
+    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
+    import opendaylight-l2-types {prefix l2t; revision-date "2013-08-27";}
+    import opendaylight-match-types {prefix match; revision-date 2013-10-26";}
+    

 
     revision "2013-10-26" {
         description "Initial revision of flow service";
 
     revision "2013-10-26" {
         description "Initial revision of flow service";

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/group-types.yang
index def1bd8c5f030951e5ee88115521b83a99280124..5aaaf5ff51d7ad5b3f1c861fe95f7af8f928408f 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/group-types.yang
@@ -2,9 +2,9 @@ module opendaylight-group-types {
     namespace "urn:opendaylight:group:types";
     prefix group;
 
     namespace "urn:opendaylight:group:types";
     prefix group;
 

-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
-    import opendaylight-flow-types {prefix flow-types;}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
+    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
+    import opendaylight-flow-types {prefix flow-types;revision-date 2013-10-26";}

 
     revision "2013-10-18" {
         description "Initial revision of group service";
 
     revision "2013-10-18" {
         description "Initial revision of group service";

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/match-types.yang
index bee439ac021475c536d943f9b4fc627e800d2d52..a2aca362e20a30662ebfd42d92b13b259409cf9f 100644 (file)
--- 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/match-types.yang
@@ -2,9 +2,9 @@ module opendaylight-match-types {
     namespace "urn:opendaylight:model:match:types";
     prefix "match";
 
     namespace "urn:opendaylight:model:match:types";
     prefix "match";
 

-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
-    import opendaylight-l2-types {prefix l2t;}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
+    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
+    import opendaylight-l2-types {prefix l2t;revision-date "2013-08-27";}

 
     revision "2013-10-26" {
         description "Initial revision of macth types";
 
     revision "2013-10-26" {
         description "Initial revision of macth types";

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
index 971a8939f243d7d10cb1f9d575184018a9eac4d4..a425506e0275863632d29914141bc5e9a6ea29f5 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
@@ -2,8 +2,8 @@ module opendaylight-meter-types {
     namespace "urn:opendaylight:meter:types";
     prefix meter;
 
     namespace "urn:opendaylight:meter:types";
     prefix meter;
 

-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
+    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-18" {
 
 
     revision "2013-09-18" {


@@ -18,9 +18,9 @@ module opendaylight-meter-types {
         leaf flags {
             type bits {
                 bit meter-kbps;
         leaf flags {
             type bits {
                 bit meter-kbps;

-                bit meter_pktps;
-                bit meter_burst;
-                bit meter_stats;
+                bit meter-pktps;
+                bit meter-burst;
+                bit meter-stats;

             }
         }
     }
             }
         }
     }

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
index 0df6b52b0bb0faa46fa5319d457e5a275eb3c0df..6a83f75959edd624c35b43bf9de08290197ba89b 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
@@ -2,9 +2,8 @@ module opendaylight-port-types {
     namespace "urn:opendaylight:flow:types:port";
     prefix port-types;
 
     namespace "urn:opendaylight:flow:types:port";
     prefix port-types;
 

-    import yang-ext {prefix ext;}
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
+    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" {
         description "Initial revision of Port Inventory model";
     
     revision "2013-09-25" {
         description "Initial revision of Port Inventory model";


@@ -22,9 +21,9 @@ module opendaylight-port-types {
     
     typedef port-state {
             type enumeration {
     
     typedef port-state {
             type enumeration {

-                enum LINK-DOWN;
-                enum BLOCKED;
-                enum LIVE;
+                enum link-down;
+                enum blocked;
+                enum live;

         }
     }
 
         }
     }
 

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
index 0b77d758672051d212a0c7b82b4f7151626c59e3..98cf93d4b3825acd320b7dead11b183840eb0e08 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
@@ -2,9 +2,9 @@ module opendaylight-table-types {
     namespace "urn:opendaylight:table:types";
     prefix table;
 
     namespace "urn:opendaylight:table:types";
     prefix table;
 

-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
-    import 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-flow-types {prefix flow;revision-date 2013-10-26";}

 
 
     revision "2013-10-26" {
 
 
     revision "2013-10-26" {

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
index aa0409551fc1da73483316a7958a8b72240a3023..7361358aff2d65c18346db532e74ba9268a465e5 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
@@ -2,8 +2,8 @@ module flow-management {
     namespace "urn:opendaylight:flow:config";
     prefix flow-cfg;
 
     namespace "urn:opendaylight:flow:config";
     prefix flow-cfg;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}

     import opendaylight-flow-types {prefix flow;}
 
     revision "2013-08-19" {
     import opendaylight-flow-types {prefix flow;}
 
     revision "2013-08-19" {

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang
index 0b7ef294d203dc3e76233f70380233c78ac1f903..48dda2edcd9435a40e9230caf68ea797912bd0a3 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang
@@ -2,8 +2,8 @@ module group-management {
     namespace "urn:opendaylight:group:config";
     prefix group-cfg;
 
     namespace "urn:opendaylight:group:config";
     prefix group-cfg;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}    
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}  

     import opendaylight-group-types {prefix group;}
 
     revision "2013-10-24" {
     import opendaylight-group-types {prefix group;}
 
     revision "2013-10-24" {

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang
index 8fddf548f22dfea8fac65187ddb1e9e6663346ce..579ce70c626227234f7d07fbe7a2451b9fb4f81c 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang
@@ -2,8 +2,8 @@ module meter-management {
     namespace "urn:opendaylight:meter:config";
     prefix meter-cfg;
 
     namespace "urn:opendaylight:meter:config";
     prefix meter-cfg;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}    
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}  

     import opendaylight-meter-types {prefix meter;}
 
     revision "2013-10-24" {
     import opendaylight-meter-types {prefix meter;}
 
     revision "2013-10-24" {

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang
index 3cd371f2b8d4ba00ba60f74699b05db197df75fa..945cc32ab5d33bb194d10e9ff63d971d573495fb 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang
@@ -2,8 +2,8 @@ module port-management {
     namespace "urn:opendaylight:port:config";
     prefix port-cfg;
 
     namespace "urn:opendaylight:port:config";
     prefix port-cfg;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}    
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}    

     import opendaylight-port-types {prefix port;}
 
     revision "2013-10-24" {
     import opendaylight-port-types {prefix port;}
 
     revision "2013-10-24" {

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang
index 003f152cbf0d7208f41e086260de0b00a25b9966..88dcfce91c43c1f515e7067db045e7b2b6ee611b 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang
@@ -2,7 +2,7 @@ module table-management {
     namespace "urn:opendaylight:table:config";
     prefix table-cfg;
     
     namespace "urn:opendaylight:table:config";
     prefix table-cfg;
     

-    import opendaylight-inventory {prefix inv;}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}

     import opendaylight-table-types {prefix table;}
 
     revision "2013-10-24" {
     import opendaylight-table-types {prefix table;}
 
     revision "2013-10-24" {

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
index 61980d99d4e1f98a7f05b6de399865a637ff3de4..005f7c330daae6405218f1c4ca01d71c30535807 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
@@ -2,17 +2,16 @@ module flow-node-inventory {
     namespace "urn:opendaylight:flow:inventory";
     prefix flownode;
 
     namespace "urn:opendaylight:flow:inventory";
     prefix flownode;
 

-    import yang-ext {prefix ext;}
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
-    import opendaylight-port-types {prefix port;}
-    import opendaylight-inventory {prefix inv;}
+    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-port-types {prefix port;revision-date "2013-09-25";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}

     
     revision "2013-08-19" {
     
     revision "2013-08-19" {

-        description "Flow Capable Node extensions to the nventory model";
+        description "Flow Capable Node extensions to the Inventory model";

     }
     }

-    
-    
+

     grouping feature {
         leaf support-state {
             type inv:support-type;
     grouping feature {
         leaf support-state {
             type inv:support-type;

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
index 19f56db30e039f20edb3f55aff7fdc30ac2f2084..7501d8a579293d9bfdcd23e875614c2a0b72667c 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
@@ -2,10 +2,10 @@ module sal-flow {
     namespace "urn:opendaylight:flow:service";
     prefix flow;
 
     namespace "urn:opendaylight:flow:service";
     prefix flow;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
-    import ietf-inet-types {prefix inet;}
-    import opendaylight-flow-types {prefix types;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
+    import opendaylight-flow-types {prefix types;revision-date "2013-10-26";}

 
 
     revision "2013-08-19" {
 
 
     revision "2013-08-19" {


@@ -18,10 +18,8 @@ module sal-flow {
     }
     
     grouping node-flow {
     }
     
     grouping node-flow {

-        leaf node {
-            ext:context-reference "inv:node-context";
-            type inv:node-ref;
-        }
+        uses "inv:node-context-ref";
+

         leaf flow-table {
             type flow-table-ref;
         }
         leaf flow-table {
             type flow-table-ref;
         }


@@ -30,6 +28,8 @@ module sal-flow {
 
     /** Base configuration structure **/
     grouping flow-update {
 
     /** Base configuration structure **/
     grouping flow-update {

+        uses "inv:node-context-ref";
+

         container original-flow {
             uses types:flow;
         }
         container original-flow {
             uses types:flow;
         }


@@ -52,10 +52,6 @@ module sal-flow {
 
     rpc update-flow {
         input {
 
     rpc update-flow {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }

             uses flow-update;
         }
     }
             uses flow-update;
         }
     }

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang
index 2dd5f9f0c5dc8e9b1d24e6fc250a6f5d802dd801..6ad6b6dbc5532239ba9eba2d2a61f2fd6e3761fe 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang
@@ -2,12 +2,8 @@ module flow-topology-discovery {
     namespace "urn:opendaylight:flow:topology:discovery";
     prefix flow-node-topo;
 
     namespace "urn:opendaylight:flow:topology:discovery";
     prefix flow-node-topo;
 

-    import yang-ext {prefix ext;}
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
-    import opendaylight-port-types {prefix port;}
-    import opendaylight-inventory {prefix inv;}
-    import flow-node-inventory {prefix flowinv;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}

     
     revision "2013-08-19" {
         description "Flow Capable Node extensions to the Inventory model";
     
     revision "2013-08-19" {
         description "Flow Capable Node extensions to the Inventory model";

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
index d8231e9126fe3dbbc67d63a14fbdcb7ab6ec8ef5..fba1c0829c96b032f4094f82df13198b8a124730 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
@@ -2,25 +2,25 @@ module sal-group {
     namespace "urn:opendaylight:group:service";
     prefix group;
 
     namespace "urn:opendaylight:group:service";
     prefix group;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
-    import ietf-inet-types {prefix inet;}
-    import opendaylight-group-types {prefix group-type;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import ietf-inet-types {prefix inet;revision-date 2010-09-24;}
+    import opendaylight-group-types {prefix group-type;revision-date 2013-10-18;}

 
     revision "2013-09-18" {
         description "Initial revision of group service";
     }        
     
     grouping node-group {
 
     revision "2013-09-18" {
         description "Initial revision of group service";
     }        
     
     grouping node-group {

-        leaf node {
-            ext:context-reference "inv:node-context";
-            type inv:node-ref;
-        }
+        uses "inv:node-context-ref";
+        

         uses group-type:group;
     }
 
     /** Base configuration structure **/
     grouping group-update {
         uses group-type:group;
     }
 
     /** Base configuration structure **/
     grouping group-update {

+        uses "inv:node-context-ref";
+        

         container original-group {
             uses group-type:group;
         }
         container original-group {
             uses group-type:group;
         }


@@ -37,20 +37,12 @@ module sal-group {
 
     rpc remove-group {
         input {
 
     rpc remove-group {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }

             uses group-update;
         }
     }
 
     rpc update-group {
         input {
             uses group-update;
         }
     }
 
     rpc update-group {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }

             uses group-update;
         }
     } 
             uses group-update;
         }
     } 

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
index bea4a871736ca7d87373ffca48299943db363351..d3777ff3320468bc55b5307ae6bdff61d016ae23 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
@@ -2,26 +2,24 @@ module sal-meter {
     namespace "urn:opendaylight:meter:service";
     prefix meter;
 
     namespace "urn:opendaylight:meter:service";
     prefix meter;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
-    import ietf-inet-types {prefix inet;}
-    import opendaylight-meter-types {prefix meter-type;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import opendaylight-meter-types {prefix meter-type;revision-date "2013-09-18";}

 
     revision "2013-09-18" {
         description "Initial revision of meter service";
     }        
     
     grouping node-meter {
 
     revision "2013-09-18" {
         description "Initial revision of meter service";
     }        
     
     grouping node-meter {

-        leaf node {
-            ext:context-reference "inv:node-context";
-            type inv:node-ref;
-        }
+        uses "inv:node-context-ref";

         
         uses meter-type:meter;
     }
 
     /** Base configuration structure **/
     grouping meter-update {
         
         uses meter-type:meter;
     }
 
     /** Base configuration structure **/
     grouping meter-update {

+        uses "inv:node-context-ref";
+

         container original-meter {
             uses meter-type:meter;
         }
         container original-meter {
             uses meter-type:meter;
         }


@@ -44,10 +42,6 @@ module sal-meter {
 
     rpc update-meter {
         input {
 
     rpc update-meter {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }

             uses meter-update;
         }
     }
             uses meter-update;
         }
     }

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang
index f93b7b4c0c82a73ff04ee19ed8ed9d3a9e3894a0..bfdf5049c3d8b585be5a94c949c4718945440c8d 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/packet-processing.yang
@@ -2,11 +2,10 @@ module packet-processing {
     namespace "urn:opendaylight:packet:service";
     prefix flow;
 
     namespace "urn:opendaylight:packet:service";
     prefix flow;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;} 
-    import opendaylight-l2-types {prefix types;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import ietf-yang-types {prefix yang;revision-date "2010-09-24";} 
+    import opendaylight-l2-types {prefix types;revision-date "2013-08-27";}

     
     revision "2013-07-09" {
         description "";
     
     revision "2013-07-09" {
         description "";


@@ -45,13 +44,12 @@ module packet-processing {
 
     rpc transmit-packet {
        input {
 
     rpc transmit-packet {
        input {

+            uses inv:node-context-ref;
+

             leaf cookie {
                 type cookie;
             }
             leaf cookie {
                 type cookie;
             }

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
+            

                leaf egress {
                        type inv:node-connector-ref;
                }
                leaf egress {
                        type inv:node-connector-ref;
                }

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang
index 1e46b3f71e1a251774cf8888ec9d370d2d2a0019..e740f961d5a83d234342a94aa151d476f001b9cf 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang
@@ -2,9 +2,9 @@ module sal-table {
     namespace "urn:opendaylight:table:service";
     prefix table;
 
     namespace "urn:opendaylight:table:service";
     prefix table;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}    
-    import opendaylight-table-types {prefix table-type;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import opendaylight-table-types {prefix table-type;revision-date "2013-10-26";}

 
     revision "2013-10-26" {
         description "Initial revision of table service";
 
     revision "2013-10-26" {
         description "Initial revision of table service";

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
index fb6f82d05bb1b74e3db340617104ba2afbb81ac7..87d1559e4921ffed91ad38c8a431ec78523fd4d2 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
@@ -2,12 +2,11 @@ module opendaylight-flow-statistics {
     namespace "urn:opendaylight:flow:statistics";
     prefix flowstat;
 
     namespace "urn:opendaylight:flow:statistics";
     prefix flowstat;
 

-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
-    import opendaylight-flow-types {prefix flow-types;}
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    import opendaylight-flow-types {prefix flow-types;revision-date "2013-10-26";}

     import sal-flow {prefix flow;}
     import sal-flow {prefix flow;}

-    import opendaylight-statistics-types {prefix stat-types;}
-
+    import opendaylight-statistics-types {prefix stat-types;revision-date "2013-09-25";}

 
     revision "2013-08-19" {
         description "Initial revision of flow service";
 
     revision "2013-08-19" {
         description "Initial revision of flow service";


@@ -15,10 +14,7 @@ module opendaylight-flow-statistics {
 
     rpc get-node-connector-statistics {
         input {
 
     rpc get-node-connector-statistics {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
+            uses inv:node-context-ref;

             leaf node-connector {
                 type inv:node-connector-ref;
             }
             leaf node-connector {
                 type inv:node-connector-ref;
             }


@@ -30,10 +26,7 @@ module opendaylight-flow-statistics {
 
     rpc get-flow-statistics {
         input {
 
     rpc get-flow-statistics {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
+            uses inv:node-context-ref;

             uses flow-types:flow;
         }
         output {
             uses flow-types:flow;
         }
         output {


@@ -43,10 +36,7 @@ module opendaylight-flow-statistics {
 
     rpc get-all-flow-statistics {
         input {
 
     rpc get-all-flow-statistics {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
+            uses inv:node-context-ref;

         }
         output {
             list flow-statistics {
         }
         output {
             list flow-statistics {


@@ -57,10 +47,7 @@ module opendaylight-flow-statistics {
 
     rpc get-all-node-connector-statistics {
         input {
 
     rpc get-all-node-connector-statistics {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
+            uses inv:node-context-ref;

         }
         output {
             list node-connector-statistics {
         }
         output {
             list node-connector-statistics {


@@ -75,10 +62,7 @@ module opendaylight-flow-statistics {
 
     rpc get-flow-table-statistics {
         input {
 
     rpc get-flow-table-statistics {
         input {

-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
+            uses inv:node-context-ref;

         }
         output {
             uses flow-types:flow-table-statistics;
         }
         output {
             uses flow-types:flow-table-statistics;

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
index de91ffd360ed5b8f637e133565e2f9fc977e5a20..d0b2e6a95931f8abdebf7f0f0c7353791a49b481 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
@@ -3,8 +3,7 @@ module opendaylight-statistics-types {
     prefix stat-types;
 
     import ietf-yang-types {prefix yang;}
     prefix stat-types;
 
     import ietf-yang-types {prefix yang;}

-    import opendaylight-inventory {prefix inv;}
-    //import opendaylight-port-inventory {prefix port-inv;}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}

     
     revision "2013-09-25" {
         description "Initial revision of flow service";
     
     revision "2013-09-25" {
         description "Initial revision of flow service";

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/node-inventory.yang
index 40cfb8e4b7e8eab940697c286695f4b5ee5d9721..1ffc88732774ea561fcf7a486524363a134836fc 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/node-inventory.yang
@@ -2,9 +2,9 @@ module opendaylight-inventory {
     namespace "urn:opendaylight:inventory";
     prefix inv;
 
     namespace "urn:opendaylight:inventory";
     prefix inv;
 

-    import yang-ext {prefix ext;}
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
+    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" {


@@ -41,7 +41,15 @@ module opendaylight-inventory {
     }
 
     identity node-connector-context {
     }
 
     identity node-connector-context {

+        description "Identity used to mark node connector context";
+    }
+
+    identity node-type {
+        description "Base identity for node types";
+    }

 
 

+    identity node-connector-type {
+        description "Base identity for node connectors type";

     }
 
     grouping node {
     }
 
     grouping node {


@@ -64,6 +72,15 @@ module opendaylight-inventory {
         }
     }
 
         }
     }
 

+    grouping node-context-ref {
+        description 
+        "Helper grouping which contains a reference to node context.";
+        leaf node {
+            ext:context-reference "node-context";
+            type node-ref;
+        }
+    }
+

     /** Base structure **/
     container nodes {
         list node {
     /** Base structure **/
     container nodes {
         list node {

diff --git a/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/MDFlowMapping.xtend b/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/MDFlowMapping.xtend
index be9ec83f3709e84cf41cae9ea07c99b369755794..cd03df83987ecb43669e8b1abab7f17db272d7fe 100644 (file)
--- a/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/MDFlowMapping.xtend
+++ b/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/MDFlowMapping.xtend
@@ -121,20 +121,20 @@ public class MDFlowMapping {
 
     public static def flowStatisticsInput(Node sourceNode, Flow sourceFlow) {
         val source = flowAdded(sourceFlow);
 
     public static def flowStatisticsInput(Node sourceNode, Flow sourceFlow) {
         val source = flowAdded(sourceFlow);

-        val it = new GetFlowStatisticsInputBuilder(source);
+        val it = new GetFlowStatisticsInputBuilder(source as org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow);

         node = sourceNode.toNodeRef();
         return it.build();
     }
 
     public static def removeFlowInput(Node sourceNode, Flow sourceFlow) {
         val source = flowAdded(sourceFlow);
         node = sourceNode.toNodeRef();
         return it.build();
     }
 
     public static def removeFlowInput(Node sourceNode, Flow sourceFlow) {
         val source = flowAdded(sourceFlow);

-        val it = new RemoveFlowInputBuilder(source);
+        val it = new RemoveFlowInputBuilder(source as org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow);

         return it.build();
     }
 
     public static def addFlowInput(Node sourceNode, Flow sourceFlow) {
         val source = flowAdded(sourceFlow);
         return it.build();
     }
 
     public static def addFlowInput(Node sourceNode, Flow sourceFlow) {
         val source = flowAdded(sourceFlow);

-        val it = new AddFlowInputBuilder(source);
+        val it = new AddFlowInputBuilder(source as org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow);

         return it.build();
     }
 
         return it.build();
     }
 


@@ -142,9 +142,9 @@ public class MDFlowMapping {
         val it = new UpdateFlowInputBuilder();
         val sourceOld = flowAdded(newFlow);
 
         val it = new UpdateFlowInputBuilder();
         val sourceOld = flowAdded(newFlow);
 

-        val original = new OriginalFlowBuilder(sourceOld);
+        val original = new OriginalFlowBuilder(sourceOld as org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow);

         val sourceNew = flowAdded(newFlow);
         val sourceNew = flowAdded(newFlow);

-        val updated = new UpdatedFlowBuilder(sourceNew);
+        val updated = new UpdatedFlowBuilder(sourceNew as org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow);

         originalFlow = original.build()
         updatedFlow = updated.build();
         node = sourceNode.toNodeRef()
         originalFlow = original.build()
         updatedFlow = updated.build();
         node = sourceNode.toNodeRef()