Merge "On openflow plugin restart, NPE in tx poller"

[controller.git] / opendaylight / md-sal / model / model-flow-service / src / main / yang / meter-service.yang

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 d3777ff3320468bc55b5307ae6bdff61d016ae23..65b22b29ddbf5d6562c48238049978a0ada0f832 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
@@ -5,6 +5,7 @@ module sal-meter {
     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";}
+    import flow-capable-transaction {prefix tr;}
 
     revision "2013-09-18" {
         description "Initial revision of meter service";
@@ -31,30 +32,45 @@ module sal-meter {
     rpc add-meter {
         input {
             uses node-meter;
+            uses tr:transaction-aware;            
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
     rpc remove-meter {
         input {
             uses node-meter;
+            uses tr:transaction-aware;            
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
     rpc update-meter {
         input {
             uses meter-update;
+            uses tr:transaction-aware;            
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
         
     notification meter-added {
         uses node-meter;
+        uses tr:transaction-aware;
     }
 
     notification meter-updated {
         uses node-meter;
+        uses tr:transaction-aware;
     }
 
     notification meter-removed {
         uses node-meter;
+        uses tr:transaction-aware;
     }
 }
\ No newline at end of file