Merge "bulk transaction and co-relation support"

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-capable-transaction.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-capable-transaction.yang
index 483c0c9e126995c60c1a6bd343e796ae4b74084b..1c675f015dfd4a4964214bb289c4b765a05b1846 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-capable-transaction.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-capable-transaction.yang
@@ -3,6 +3,7 @@ module flow-capable-transaction {
     prefix type;
 
     import opendaylight-inventory {prefix inv; revision-date "2013-08-19";}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import yang-ext {prefix ext; revision-date "2013-07-09";}
     
     revision "2013-11-03" {
@@ -12,6 +13,12 @@ module flow-capable-transaction {
     typedef transaction-id {
        type uint64;
     }
+    // This refers to MD-SAL transaction reference.
+    grouping transaction-metadata {
+        leaf transaction-uri {
+            type inet:uri;
+        }
+    }
     
     grouping transaction-aware {
         leaf transaction-id {

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 d6a31c30deeae87f619e157c39901ee3456f9e1a..5c68a137c3d71f8c23da9cd8da3f64d6552e2b56 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
@@ -51,11 +51,11 @@ module sal-flow {
 
     rpc add-flow {
         input {
+            uses tr:transaction-metadata;
             leaf flow-ref {
                 type types:flow-ref;
             }
-            uses node-flow;
-            uses tr:transaction-aware;
+            uses node-flow;            
         }
         output {
             uses tr:transaction-aware;
@@ -64,11 +64,11 @@ module sal-flow {
 
     rpc remove-flow {
         input {
+            uses tr:transaction-metadata;
             leaf flow-ref {
                 type types:flow-ref;
             }
-            uses node-flow;
-            uses tr:transaction-aware;
+            uses node-flow;            
         }
         output {
             uses tr:transaction-aware;
@@ -77,11 +77,11 @@ module sal-flow {
 
     rpc update-flow {
         input {
+            uses tr:transaction-metadata;
             leaf flow-ref {
                 type types:flow-ref;
             }
-            uses flow-update;
-            uses tr:transaction-aware;
+            uses flow-update;           
         }
         output {
             uses tr:transaction-aware;
@@ -89,6 +89,7 @@ module sal-flow {
     }
 
     notification flow-added {
+        uses tr:transaction-metadata;
         leaf flow-ref {
             type types:flow-ref;
         }
@@ -97,15 +98,16 @@ module sal-flow {
     }
 
     notification flow-updated {
+        uses tr:transaction-metadata;
         leaf flow-ref {
             type types:flow-ref;
         }
         uses node-flow;
-        uses tr:transaction-aware;
-        
+        uses tr:transaction-aware;        
     }
 
     notification flow-removed {
+        uses tr:transaction-metadata;
         leaf flow-ref {
             type types:flow-ref;
         }
@@ -120,6 +122,7 @@ module sal-flow {
     notification node-error-notification {
         uses error:error-message;
         uses tr:transaction-aware;
+        uses tr:transaction-metadata;
     }
     
     notification node-experimenter-error-notification {

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 6cc1537ebc11c5d8f05a5921badbe79c300c8a12..7eeb0ac0f3767eb0d40e211d0b9c88d188cb8517 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
@@ -31,11 +31,11 @@ module sal-group {
 
     rpc add-group {
         input {
+            uses tr:transaction-metadata;
             leaf group-ref {
                 type group-type:group-ref;
             }
-            uses node-group;
-            uses tr:transaction-aware;
+            uses node-group;            
         }
         output {
             uses tr:transaction-aware;
@@ -44,11 +44,11 @@ module sal-group {
 
     rpc remove-group {
         input {
+            uses tr:transaction-metadata;
             leaf group-ref {
                 type group-type:group-ref;
             }
-            uses node-group;
-            uses tr:transaction-aware;
+            uses node-group;            
         }
         output {
             uses tr:transaction-aware;
@@ -57,11 +57,11 @@ module sal-group {
 
     rpc update-group {
         input {
+            uses tr:transaction-metadata;
             leaf group-ref {
                 type group-type:group-ref;
             }
-            uses group-update;
-            uses tr:transaction-aware;
+            uses group-update;            
         }
         output {
             uses tr:transaction-aware;
@@ -69,6 +69,7 @@ module sal-group {
     } 
 
     notification group-added {
+        uses tr:transaction-metadata;
         leaf group-ref {
             type group-type:group-ref;
         }
@@ -77,6 +78,7 @@ module sal-group {
     }
 
     notification group-updated {
+        uses tr:transaction-metadata;
         leaf group-ref {
             type group-type:group-ref;
         }
@@ -85,6 +87,7 @@ module sal-group {
     }
 
     notification group-removed {
+        uses tr:transaction-metadata;
         leaf group-ref {
             type group-type:group-ref;
         }

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 6205fed529d85a849ea77bdf5c6ff87b0b5c1331..ecdef41951aa63482b11c122c51f08d602cb8f26 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
@@ -31,11 +31,11 @@ module sal-meter {
 
     rpc add-meter {
         input {
+            uses tr:transaction-metadata;            
             leaf meter-ref {
                 type meter-type:meter-ref;
             }
-            uses node-meter;
-            uses tr:transaction-aware;            
+            uses node-meter;            
         }
         output {
             uses tr:transaction-aware;
@@ -44,12 +44,12 @@ module sal-meter {
 
     rpc remove-meter {
         input {
+            uses tr:transaction-metadata;            
             leaf meter-ref {
                 type meter-type:meter-ref;
             }
             
-            uses node-meter;
-            uses tr:transaction-aware;            
+            uses node-meter;                       
         }
         output {
             uses tr:transaction-aware;
@@ -58,12 +58,12 @@ module sal-meter {
 
     rpc update-meter {
         input {
+            uses tr:transaction-metadata;            
             leaf meter-ref {
                 type meter-type:meter-ref;
             }
             
-            uses meter-update;
-            uses tr:transaction-aware;            
+            uses meter-update;                       
         }
         output {
             uses tr:transaction-aware;
@@ -71,6 +71,7 @@ module sal-meter {
     }
         
     notification meter-added {
+        uses tr:transaction-metadata;
         leaf meter-ref {
             type meter-type:meter-ref;
         }
@@ -79,6 +80,7 @@ module sal-meter {
     }
 
     notification meter-updated {
+        uses tr:transaction-metadata;
         leaf meter-ref {
             type meter-type:meter-ref;
         }
@@ -87,6 +89,7 @@ module sal-meter {
     }
 
     notification meter-removed {
+        uses tr:transaction-metadata;
         leaf meter-ref {
             type meter-type:meter-ref;
         }