MD-SAL Statistics Manager- types and capabilities in group-features model is bitmap...

Change-Id: I71cdc43f2919a8950052aa7334a135c79fb5b748
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>

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 97ca8b3c71491063d21ac4284b62e537c3b56dd6..25e8e7aa577968ffc20fccaac459c1e958f4d586 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
@@ -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 c207db0478c9696ae68c28b00566b42085e4244b..bbbb5c856646cf273445f47e84e8a1a5e46df844 100644 (file)
--- 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());