Update to MD-SAL APIs

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

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
similarity index 50%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-config.yang
rename to opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
index f13e5d36c9cdf316889792438f664c16460c42c8..da8e914fe753f369364f0ab1e1b51011db9041ac 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
@@ -1,14 +1,23 @@
-module sal-flow-config {
+module flow-management {

     namespace "urn:opendaylight:flow:config";
     prefix flow-cfg;
 
     namespace "urn:opendaylight:flow:config";
     prefix flow-cfg;
 

-    import sal-flow {prefix flow;}
+    import yang-ext {prefix ext;}
+    import opendaylight-inventory {prefix inv;}
+    import opendaylight-flow-types {prefix flow;}

 
     revision "2013-08-19" {
         description "Initial revision of flow service";
     }
 
 
 
     revision "2013-08-19" {
         description "Initial revision of flow service";
     }
 
 

+    grouping flow-entry {
+        leaf node {
+            type inv:node-ref;
+        }
+        uses flow:flow;
+    }
+

     container flows {
         list flow {
             key "id";
     container flows {
         list flow {
             key "id";


@@ -16,11 +25,7 @@ module sal-flow-config {
             leaf id {
                 type string;
             }
             leaf id {
                 type string;
             }

-            uses flow:node-flow;
-            /**
-                container match;
-            
-            **/
+            uses flow:flow-entry;

         }
     }
 }
\ No newline at end of file
         }
     }
 }
\ No newline at end of file