X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-service%2Fsrc%2Fmain%2Fyang%2Fmeter-service.yang;h=c187181e5e89099cc4720031cd3fa888629d69a2;hb=25ba6b145406b98f8521bcf510bb85bf0167ef72;hp=f9cbd640e0bbae98ce2336d9d117043c16dfa18a;hpb=2887eded48bd70a9e332e98530f23304ce153bc7;p=controller.git

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 f9cbd640e0..c187181e5e 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,25 +2,25 @@ 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";}
+    import flow-capable-transaction {prefix tr;}
 
     revision "2013-09-18" {
         description "Initial revision of meter service";
     }        
     
-    metering node-meter {
-        leaf node {
-            type inv:node-ref;
-        }
+    grouping node-meter {
+        uses "inv:node-context-ref";
         
         uses meter-type:meter;
     }
 
     /** Base configuration structure **/
-    metering meter-update {
+    grouping meter-update {
+        uses "inv:node-context-ref";
+
         container original-meter {
             uses meter-type:meter;
         }
@@ -32,18 +32,42 @@ 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 node-meter;
+            uses meter-update;
+            uses tr:transaction-aware;            
+        }
+        output {
+            uses tr:transaction-aware;
         }
-    }     
+    }
+        
+    notification meter-added {
+        uses node-meter;
+    }
+
+    notification meter-updated {
+        uses node-meter;
+    }
+
+    notification meter-removed {
+        uses node-meter;
+    }
 }
\ No newline at end of file