Merge "Fix HashedWheelTimer exception for short living netconf clients."

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 07678f57e1b429d8655fa3665d26eaa9c83f74d8..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
@@ -81,14 +81,17 @@ 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 {

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 9106bca8a4826619f09062a3c3322b16e3551621..bbe4740e711b66850970b395ccce04f1d2e2c6f7 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
@@ -61,13 +61,16 @@ module sal-group {
 
     notification group-added {
         uses node-group;
+        uses tr:transaction-aware;
     }
 
     notification group-updated {
         uses node-group;
+        uses tr:transaction-aware;
     }
 
     notification group-removed {
         uses node-group;
+        uses tr:transaction-aware;
     }    
 }
\ No newline at end of file

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 c187181e5e89099cc4720031cd3fa888629d69a2..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
@@ -61,13 +61,16 @@ module sal-meter {
         
     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

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang
index d49675ad39366bb3e8c9b3a5a191f2a677683ce7..6795e6fd67a8090e525546deb18658f6dc5930d3 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang
@@ -43,9 +43,14 @@ module sal-port {
         output {
             uses port-type:flow-capable-port;
         }
-    }  
+    }
+    
+    notification port-updated {
+        uses port-update;
+        uses tr:transaction-aware;
+    }
     
     notification port-removed {
-        uses node-port;
+        uses node-port;       
     }
 }
\ No newline at end of file