X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmodel%2Fmodel-flow-service%2Fsrc%2Fmain%2Fyang%2Fflow-service.yang;h=a32a45f2fdfea5cb5ce894c9c569942e0752d48e;hb=25ba6b145406b98f8521bcf510bb85bf0167ef72;hp=113cb1287db71bf7d361e92f1b362de6e85540f3;hpb=2887eded48bd70a9e332e98530f23304ce153bc7;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 113cb1287d..a32a45f2fd 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
@@ -2,25 +2,35 @@ module sal-flow {
     namespace "urn:opendaylight:flow:service";
     prefix flow;
 
-    import yang-ext {prefix ext;}
-    import opendaylight-inventory {prefix inv;}
-    import ietf-inet-types {prefix inet;}
-    import opendaylight-flow-types {prefix types;}
-
+    import yang-ext {prefix ext; revision-date "2013-07-09";}
+    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
+    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";
     }
 
-
     typedef flow-table-ref {
         type instance-identifier;
     }
     
-    grouping node-flow {
+    grouping node-flow-removed {
         leaf node {
+            ext:context-reference "inv:node-context";
             type inv:node-ref;
         }
+        leaf flow-table {
+            type flow-table-ref;
+        }
+        uses types:flow-mod-removed;
+    }
+    
+    grouping node-flow {
+        uses "inv:node-context-ref";
+
         leaf flow-table {
             type flow-table-ref;
         }
@@ -29,6 +39,8 @@ module sal-flow {
 
     /** Base configuration structure **/
     grouping flow-update {
+        uses "inv:node-context-ref";
+
         container original-flow {
             uses types:flow;
         }
@@ -40,18 +52,30 @@ module sal-flow {
     rpc add-flow {
         input {
             uses node-flow;
+            uses tr:transaction-aware;            
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
     rpc remove-flow {
         input {
             uses node-flow;
+            uses tr:transaction-aware;            
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
     rpc update-flow {
         input {
-            uses node-flow;
+            uses flow-update;
+            uses tr:transaction-aware;            
+        }
+        output {
+            uses tr:transaction-aware;
         }
     }
 
@@ -66,16 +90,18 @@ module sal-flow {
     notification flow-removed {
         uses node-flow;
     }
-
-    augment "/inv:nodes/inv:node" {
-        ext:augment-identifier "flow-capable-node";
-        container flow-tables {
-            list table {
-                key "id";
-                leaf "id" {
-                    type inet:uri;
-                }
-            }
-        }
+    
+    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