Added container and flow name details as in AD-SAL

Signed-off-by: Prasanna Huddar <prasanna.huddar@ericsson.com>
Change-Id: I0350a78b59ba8068c642483cab5217c79ec71a71

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
index 634c8dbd723832378ee7d62230c3d29628cdc5e9..9688e75c625497638898f21b108651b3d2e882ab 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/flow-types.yang
@@ -178,6 +178,15 @@ module opendaylight-flow-types {
         }
     }
 
         }
     }
 

+    typedef flow-mod-flags {
+        type bits {
+            bit CHECK_OVERLAP;
+            bit RESET_COUNTS;
+            bit NO_PKT_COUNTS;
+            bit NO_BYT_COUNTS;
+        }
+    }
+    

     grouping flow {
         container match {
             uses match:match;
     grouping flow {
         container match {
             uses match:match;


@@ -204,6 +213,38 @@ module opendaylight-flow-types {
         leaf cookie {
             type uint64;
         }
         leaf cookie {
             type uint64;
         }

+        
+        leaf container-name {
+            type string; 
+        }
+        
+        leaf cookie_mask {
+            type uint8;
+        }
+        
+        leaf table_id {
+            type uint64;
+        }
+        
+        leaf buffer_id {
+            type uint32;
+        }
+        
+        leaf out_port {
+            type uint64;
+        }
+        
+        leaf out_group {
+            type uint32;
+        }
+        
+        leaf flags{
+            type flow-mod-flags;
+        }
+        
+        leaf flow-name{
+            type string;
+        }

     }
 
     grouping flow-statistics {
     }
 
     grouping flow-statistics {

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
index eee233f3d6dd6f86fbff7b164f4639d28b17b7a5..def1bd8c5f030951e5ee88115521b83a99280124 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
@@ -6,7 +6,7 @@ module opendaylight-group-types {
     import ietf-yang-types {prefix yang;}
     import opendaylight-flow-types {prefix flow-types;}
 
     import ietf-yang-types {prefix yang;}
     import opendaylight-flow-types {prefix flow-types;}
 

-    revision "2013-09-18" {
+    revision "2013-10-18" {

         description "Initial revision of group service";
     }
 
         description "Initial revision of group service";
     }
 


@@ -33,6 +33,14 @@ module opendaylight-group-types {
             type group-ref;
         }
         
             type group-ref;
         }
         

+        leaf group-name {
+            type string;
+        }
+        
+        leaf container-name {
+            type string; 
+        }
+        

         container buckets {
             list bucket {
                 key "order";
         container buckets {
             list bucket {
                 key "order";

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
index af7c4dff531998dc150976f7c527e2258975e21f..0df6b52b0bb0faa46fa5319d457e5a275eb3c0df 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
@@ -128,8 +128,16 @@ module opendaylight-port-types {
                 leaf mask {
                     type uint32;
                     description "Bitmap of OFPPC-* flags to be changed";
                 leaf mask {
                     type uint32;
                     description "Bitmap of OFPPC-* flags to be changed";

-                }       
-            }
+                }      
+                
+                leaf container-name {
+                    type string; 
+                }
+            
+                leaf port-name {
+                    type string; 
+                }                
+            }            

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