From d753f1a9338baeb3aee2d745ddf7541c4be33530 Mon Sep 17 00:00:00 2001
From: Anil Vishnoi <avishnoi@in.ibm.com>
Date: Sat, 23 Nov 2013 20:39:07 +0530
Subject: [PATCH] MD-SAL Statistics Manager- types and capabilities in
 group-features model is bitmap, so changed to bitmap from enum

Change-Id: I71cdc43f2919a8950052aa7334a135c79fb5b748
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
---
 .../src/main/yang/group-types.yang            | 35 ++++++++++++++-----
 .../manager/StatisticsUpdateCommiter.java     |  2 +-
 2 files changed, 27 insertions(+), 10 deletions(-)

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 97ca8b3c71..25e8e7aa57 100644
--- 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
@@ -18,13 +18,23 @@ module opendaylight-group-types {
         leaf group-type {
             type enumeration {
                 enum group-all;
-                enum group_select;
-                enum group_indirect;
-                enum group_ff;
+                enum group-select;
+                enum group-indirect;
+                enum group-ff;
             }
         }
     }
     
+    typedef group-capabilities { 
+        	type enumeration {
+                enum select-weight;
+                enum select-liveness;
+                enum chaining;
+                enum chaining-checks;
+            }   
+        }
+    
+    
     grouping group {
         
         uses group-types;
@@ -119,14 +129,21 @@ module opendaylight-group-types {
     }
 
     grouping group-features {
-        uses group-types;
+        leaf types {
+            type bits {
+            	bit group-all;
+            	bit group-select;
+            	bit group-indirect;
+            	bit group-ff;
+            }
+        }
             
         leaf capabilities { 
-        	type enumeration {
-                enum select-weight;
-                enum select-liveness;
-                enum chaining;
-                enum chaining-checks;
+        	type bits {
+                bit select-weight;
+                bit select-liveness;
+                bit chaining;
+                bit chaining-checks;
             }   
         }
 
diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
index c207db0478..bbbb5c8566 100644
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
@@ -232,7 +232,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         GroupFeaturesBuilder groupFeatures = new GroupFeaturesBuilder();
         groupFeatures.setActions(notification.getActions());
         groupFeatures.setCapabilities(notification.getCapabilities());
-        groupFeatures.setGroupType(notification.getGroupType());
+        groupFeatures.setTypes(notification.getTypes());
         groupFeatures.setMaxGroups(notification.getMaxGroups());
         cache.get(notification.getId()).setGroupFeatures(groupFeatures.build());
         
-- 
2.36.6