From: Tony Tkacik <ttkacik@cisco.com>
Date: Mon, 4 Nov 2013 14:27:22 +0000 (+0100)
Subject: Removed import related warnings from most of YANG Models
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~505
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=723a5d5b870e81f4f0fe0fa5641b31fe4a609e93

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 ff88ba7575..13ffa3f910 100644
--- 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>
-        <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>
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 5382daf454..8e8c822935 100644
--- 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;
 
-    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";
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 def1bd8c5f..5aaaf5ff51 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/group-types.yang
@@ -2,9 +2,9 @@ module opendaylight-group-types {
     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";
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 bee439ac02..a2aca362e2 100644
--- 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";
 
-    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";
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 971a8939f2..a425506e02 100644
--- 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;
 
-    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" {
@@ -18,9 +18,9 @@ module opendaylight-meter-types {
         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 0df6b52b0b..6a83f75959 100644
--- 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;
 
-    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";
@@ -22,9 +21,9 @@ module opendaylight-port-types {
     
     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 0b77d75867..98cf93d4b3 100644
--- 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;
 
-    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" {
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 aa0409551f..7361358aff 100644
--- 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;
 
-    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" {
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 0b7ef294d2..48dda2edcd 100644
--- 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;
 
-    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" {
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 8fddf548f2..579ce70c62 100644
--- 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;
 
-    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" {
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 3cd371f2b8..945cc32ab5 100644
--- 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;
 
-    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" {
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 003f152cbf..88dcfce91c 100644
--- 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;
     
-    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" {
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 61980d99d4..005f7c330d 100644
--- 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;
 
-    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" {
-        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;
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 19f56db30e..7501d8a579 100644
--- 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;
 
-    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" {
@@ -18,10 +18,8 @@ module sal-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;
         }
@@ -30,6 +28,8 @@ module sal-flow {
 
     /** Base configuration structure **/
     grouping flow-update {
+        uses "inv:node-context-ref";
+
         container original-flow {
             uses types:flow;
         }
@@ -52,10 +52,6 @@ module sal-flow {
 
     rpc update-flow {
         input {
-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
             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 2dd5f9f0c5..6ad6b6dbc5 100644
--- 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;
 
-    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";
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 d8231e9126..fba1c0829c 100644
--- 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;
 
-    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 {
-        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 "inv:node-context-ref";
+        
         container original-group {
             uses group-type:group;
         }
@@ -37,20 +37,12 @@ module sal-group {
 
     rpc remove-group {
         input {
-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
             uses group-update;
         }
     }
 
     rpc update-group {
         input {
-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
             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 bea4a87173..d3777ff332 100644
--- 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;
 
-    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 {
-        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 "inv:node-context-ref";
+
         container original-meter {
             uses meter-type:meter;
         }
@@ -44,10 +42,6 @@ module sal-meter {
 
     rpc update-meter {
         input {
-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-ref;
-            }
             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 f93b7b4c0c..bfdf5049c3 100644
--- 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;
 
-    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 "";
@@ -45,13 +44,12 @@ module packet-processing {
 
     rpc transmit-packet {
     	input {
+            uses inv:node-context-ref;
+
             leaf cookie {
                 type cookie;
             }
-            leaf node {
-                ext:context-reference "inv:node-context";
-                type inv:node-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 1e46b3f71e..e740f961d5 100644
--- 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;
 
-    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";
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 fb6f82d05b..87d1559e49 100644
--- 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;
 
-    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 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";
@@ -15,10 +14,7 @@ module opendaylight-flow-statistics {
 
     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;
             }
@@ -30,10 +26,7 @@ module opendaylight-flow-statistics {
 
     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 {
@@ -43,10 +36,7 @@ module opendaylight-flow-statistics {
 
     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 {
@@ -57,10 +47,7 @@ module opendaylight-flow-statistics {
 
     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 {
@@ -75,10 +62,7 @@ module opendaylight-flow-statistics {
 
     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;
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 de91ffd360..d0b2e6a959 100644
--- 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;}
-    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";
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 40cfb8e4b7..1ffc887327 100644
--- 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;
 
-    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" {
@@ -41,7 +41,15 @@ module opendaylight-inventory {
     }
 
     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 {
@@ -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 {
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 be9ec83f37..cd03df8398 100644
--- 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);
-        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);
-        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);
-        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();
     }
 
@@ -142,9 +142,9 @@ public class MDFlowMapping {
         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 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()