X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-service%2Fsrc%2Fmain%2Fyang%2Fflow-service.yang;h=5c68a137c3d71f8c23da9cd8da3f64d6552e2b56;hb=27bdffe07540e3789d4b9f84cf5fdccf9ac60525;hp=d6a31c30deeae87f619e157c39901ee3456f9e1a;hpb=c541f7868e6e2d654b8080b5426bb12a39bddf11;p=controller.git

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 d6a31c30de..5c68a137c3 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
@@ -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 {