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

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

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 f8589193d7cba41d76789782619c700243fceae9..089469f045c6ae30caf8f800bc61796d140bbf89 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
@@ -7,6 +7,7 @@ module sal-flow {
     import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import opendaylight-flow-types {prefix types;revision-date "2013-10-26";}
     import flow-capable-transaction {prefix tr;}
+    import flow-errors {prefix error;}
 
     revision "2013-08-19" {
         description "Initial revision of flow service";
@@ -51,7 +52,7 @@ module sal-flow {
     rpc add-flow {
         input {
             uses node-flow;
-            uses tr:transaction-aware;            
+            uses tr:transaction-aware;
         }
         output {
             uses tr:transaction-aware;
@@ -61,7 +62,7 @@ module sal-flow {
     rpc remove-flow {
         input {
             uses node-flow;
-            uses tr:transaction-aware;            
+            uses tr:transaction-aware;
         }
         output {
             uses tr:transaction-aware;
@@ -71,7 +72,7 @@ module sal-flow {
     rpc update-flow {
         input {
             uses flow-update;
-            uses tr:transaction-aware;            
+            uses tr:transaction-aware;
         }
         output {
             uses tr:transaction-aware;
@@ -80,17 +81,30 @@ module sal-flow {
 
     notification flow-added {
         uses node-flow;
+        uses tr:transaction-aware;
     }
 
     notification flow-updated {
         uses node-flow;
+        uses tr:transaction-aware;
     }
 
     notification flow-removed {
         uses node-flow;
+        uses tr:transaction-aware;
     }
     
     notification switch-flow-removed {
         uses node-flow-removed;
     }
+    
+    notification node-error-notification {
+        uses error:error-message;
+        uses tr:transaction-aware;
+    }
+    
+    notification node-experimenter-error-notification {
+        uses error:experimenter-error-message;
+        uses tr:transaction-aware;
+    }
 }
\ No newline at end of file