MD-SAL Statistics Manager - Did the code changes that is needed to work with commit...

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

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
index 63715594273c2a6b6e4e0ed79c29092b8102ba99..1f11e9d583cf660082c32201d6ee8dce5f387b93 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.concurrent.Future;
 
 import org.opendaylight.controller.sal.common.util.Rpcs;
+import org.opendaylight.openflowjava.protocol.api.util.BinContent;
 import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.FlowConvertor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.GroupConvertor;
@@ -505,7 +506,7 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
 
         // Create multipart request body for fetch all the group stats
         MultipartRequestGroupBuilder mprGroupBuild = new MultipartRequestGroupBuilder();
-        mprGroupBuild.setGroupId((long) Group.OFPGALL.getIntValue());
+        mprGroupBuild.setGroupId(BinContent.intToUnsignedLong(Group.OFPGALL.getIntValue()));
 
         //Set request body to main multipart request
         mprInput.setMultipartRequestBody(mprGroupBuild.build());
@@ -653,7 +654,7 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
 
         // Create multipart request body for fetch all the meter stats
         MultipartRequestMeterConfigBuilder mprMeterConfigBuild = new MultipartRequestMeterConfigBuilder();
-        mprMeterConfigBuild.setMeterId((long) Meter.OFPMALL.getIntValue());
+        mprMeterConfigBuild.setMeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue()));
 
         //Set request body to main multipart request
         mprInput.setMultipartRequestBody(mprMeterConfigBuild.build());
@@ -690,7 +691,7 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
 
         // Create multipart request body for fetch all the meter stats
         MultipartRequestMeterBuilder mprMeterBuild = new MultipartRequestMeterBuilder();
-        mprMeterBuild.setMeterId((long) Meter.OFPMALL.getIntValue());
+        mprMeterBuild.setMeterId(BinContent.intToUnsignedLong(Meter.OFPMALL.getIntValue()));
 
         //Set request body to main multipart request
         mprInput.setMultipartRequestBody(mprMeterBuild.build());

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
index d827ff8bd93cae98e6f68f3632d51804ef181c92..df5ddc421bc5c44e07ea6351b40d66c1c2ed7f71 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
@@ -426,7 +426,6 @@ public final class ActionConvertor {
             List<ActionsList> actionList) {
 
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> bucketActions = new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action>();
-
         for (ActionsList actionDesc : actionList) {
 
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action = actionDesc

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertor.java
index 4b68c70879749f3d497fcf71ce4e33bcfb77e4e3..978a5842ee4e82b052dff2a3f7189d63fcc5feee 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertor.java
@@ -7,19 +7,25 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter64;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.BucketId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.BucketBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.BucketKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStatsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStatsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.Buckets;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.BucketsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.DurationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.buckets.BucketCounter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.buckets.BucketCounterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.buckets.BucketCounterKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStatsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStatsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.desc.GroupDesc;
 
 /**
@@ -57,9 +63,10 @@ public class GroupStatsResponseConvertor {
         time.setNanosecond(new Counter32(groupStats.getDurationNsec()));
         
         salGroupStats.setDuration(time.build());
-        salGroupStats.setGroupId(groupStats.getGroupId().intValue());
+        salGroupStats.setGroupId(new GroupId(groupStats.getGroupId()));
         salGroupStats.setPacketCount(new Counter64(groupStats.getPacketCount()));
         salGroupStats.setRefCount(new Counter32(groupStats.getRefCount()));
+        salGroupStats.setKey(new GroupStatsKey(salGroupStats.getGroupId()));
         
         return salGroupStats.build();
     }
@@ -70,11 +77,15 @@ public class GroupStatsResponseConvertor {
         BucketsBuilder salBuckets  = new BucketsBuilder();
         
         List<BucketCounter> allBucketStats = new ArrayList<BucketCounter>();
-        
+        int bucketKey = 0;
         for( org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.group.stats.BucketStats bucketStat : bucketStats){
             BucketCounterBuilder bucketCounter = new BucketCounterBuilder();
             bucketCounter.setByteCount(new Counter64(bucketStat.getByteCount()));
             bucketCounter.setPacketCount(new Counter64(bucketStat.getPacketCount()));
+            BucketId bucketId = new BucketId((long)bucketKey);
+            bucketCounter.setKey(new BucketCounterKey(bucketId));
+            bucketCounter.setBucketId(bucketId);
+            bucketKey++;
             allBucketStats.add(bucketCounter.build());
         }
         salBuckets.setBucketCounter(allBucketStats);
@@ -105,6 +116,7 @@ public class GroupStatsResponseConvertor {
         salGroupDescStats.setBuckets(toSALBucketsDesc(groupDesc.getBucketsList()));
         salGroupDescStats.setGroupId(new GroupId(groupDesc.getGroupId()));
         salGroupDescStats.setGroupType(GroupTypes.forValue(groupDesc.getType().getIntValue()));
+        salGroupDescStats.setKey(new GroupDescStatsKey(salGroupDescStats.getGroupId()));
         
         return salGroupDescStats.build();
     }
@@ -115,22 +127,30 @@ public class GroupStatsResponseConvertor {
         org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.BucketsBuilder salBucketsDesc  = 
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.BucketsBuilder();
         List<Bucket> allBuckets = new ArrayList<Bucket>();
-        
+        int bucketKey = 0;
         for( org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.buckets.BucketsList bucketDetails : bucketDescStats){
             BucketBuilder bucketDesc = new BucketBuilder();
             List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> convertedSalActions = 
                     ActionConvertor.toSALBucketActions (bucketDetails.getActionsList());
             
             List<Action> actions = new ArrayList<Action>(); 
+            int actionKey = 0;
             for (org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action : convertedSalActions){
-                ActionBuilder warppedAction = new ActionBuilder();
-                warppedAction.setAction(action);
-                actions.add(warppedAction.build());
+                ActionBuilder wrappedAction = new ActionBuilder();
+                wrappedAction.setAction(action);
+                wrappedAction.setKey(new ActionKey(actionKey));
+                wrappedAction.setOrder(actionKey);
+                actions.add(wrappedAction.build());
+                actionKey++;
             }
             bucketDesc.setAction(actions);
             bucketDesc.setWeight(bucketDetails.getWeight());
             bucketDesc.setWatchPort(bucketDetails.getWatchPort().getValue());
             bucketDesc.setWatchGroup(bucketDetails.getWatchGroup());
+            BucketId bucketId = new BucketId((long)bucketKey);
+            bucketDesc.setBucketId(bucketId);
+            bucketDesc.setKey(new BucketKey(bucketId));
+            bucketKey++;
             allBuckets.add(bucketDesc.build());
         }
         salBucketsDesc.setBucket(allBuckets);

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java
index ff10303635fc55c2d15aea749513824075bb58d9..8fba43529be31f62e42239ffa1ffbbf9c9ca3181 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertor.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter32;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter64;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.BandId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.DropBuilder;
@@ -13,14 +14,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.MeterBandHeadersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStatsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStatsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeaderBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeaderKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.DurationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.MeterBandStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.meter.band.stats.BandStat;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.meter.band.stats.BandStatBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.meter.band.stats.BandStatKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStatsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStatsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDrop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDscpRemark;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenter;
@@ -65,8 +70,9 @@ public class MeterStatsResponseConvertor {
         salMeterStats.setDuration(time.build());
         
         salMeterStats.setFlowCount(new Counter32(meterStats.getFlowCount()));
-        salMeterStats.setMeterId(meterStats.getMeterId().intValue());
+        salMeterStats.setMeterId(new MeterId(meterStats.getMeterId()));
         salMeterStats.setPacketInCount(new Counter64(meterStats.getPacketInCount()));
+        salMeterStats.setKey(new MeterStatsKey(salMeterStats.getMeterId()));
         
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol
         .rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter
@@ -74,12 +80,17 @@ public class MeterStatsResponseConvertor {
         
         MeterBandStatsBuilder meterBandStatsBuilder = new MeterBandStatsBuilder();
         List<BandStat> listAllBandStats = new ArrayList<BandStat>();
+        int bandKey=0;
         for(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol
                 .rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter
                 .meter.stats.MeterBandStats meterBandStats : allMeterBandStats){
             BandStatBuilder bandStatBuilder = new BandStatBuilder(); 
             bandStatBuilder.setByteBandCount(new Counter64(meterBandStats.getByteBandCount()));
             bandStatBuilder.setPacketBandCount(new Counter64(meterBandStats.getPacketBandCount()));
+            BandId bandId = new BandId((long) bandKey);
+            bandStatBuilder.setKey(new BandStatKey(bandId));
+            bandStatBuilder.setBandId(bandId);
+            bandKey++;
             listAllBandStats.add(bandStatBuilder.build());
         }
         meterBandStatsBuilder.setBandStat(listAllBandStats);
@@ -98,14 +109,14 @@ public class MeterStatsResponseConvertor {
         for( org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config.MeterConfig meterConfig : allMeterConfigs){
             MeterConfigStatsBuilder meterConfigStatsBuilder = new MeterConfigStatsBuilder();
             meterConfigStatsBuilder.setMeterId(new MeterId(meterConfig.getMeterId()));
-            //TODO: Set flag should be bitmap and not once enum value.
-            //Need to discuss with openflowjava team.
-            //meterConfigStatsBuilder.setFlags(value);
+            meterConfigStatsBuilder.setKey(new MeterConfigStatsKey(meterConfigStatsBuilder.getMeterId()));
             
             MeterBandHeadersBuilder meterBandHeadersBuilder = new MeterBandHeadersBuilder();
             List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config.meter.config.Bands> bands = meterConfig.getBands();
             
             List<MeterBandHeader> listBandHeaders = new ArrayList<MeterBandHeader>();
+            
+            int bandKey=0;
             for(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config.meter.config.Bands band : bands){
                 MeterBandHeaderBuilder meterBandHeaderBuilder = new MeterBandHeaderBuilder();
                 if(band.getMeterBand() instanceof MeterBandDrop){
@@ -117,6 +128,9 @@ public class MeterStatsResponseConvertor {
                     
                     meterBandHeaderBuilder.setBurstSize(dropBand.getBurstSize());
                     meterBandHeaderBuilder.setRate(dropBand.getRate());
+                    BandId bandId = new BandId((long)bandKey);
+                    meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId));
+                    meterBandHeaderBuilder.setBandId(bandId);
                     listBandHeaders.add(meterBandHeaderBuilder.build());
                 }else if (band.getMeterBand() instanceof MeterBandDscpRemark){
                     MeterBandDscpRemark dscpRemarkBand = (MeterBandDscpRemark)band.getMeterBand();
@@ -127,6 +141,9 @@ public class MeterStatsResponseConvertor {
                     
                     meterBandHeaderBuilder.setBurstSize(dscpRemarkBand.getBurstSize());
                     meterBandHeaderBuilder.setRate(dscpRemarkBand.getRate());
+                    BandId bandId = new BandId((long)bandKey);
+                    meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId));
+                    meterBandHeaderBuilder.setBandId(bandId);
                     listBandHeaders.add(meterBandHeaderBuilder.build());
                     
                 }else if (band.getMeterBand() instanceof MeterBandExperimenter){
@@ -138,9 +155,13 @@ public class MeterStatsResponseConvertor {
                     
                     meterBandHeaderBuilder.setBurstSize(experimenterBand.getBurstSize());
                     meterBandHeaderBuilder.setRate(experimenterBand.getRate());
+                    BandId bandId = new BandId((long)bandKey);
+                    meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId));
+                    meterBandHeaderBuilder.setBandId(bandId);
                     listBandHeaders.add(meterBandHeaderBuilder.build());
                     
                 }
+                bandKey++;
             }
             meterBandHeadersBuilder.setMeterBandHeader(listBandHeaders);
             meterConfigStatsBuilder.setMeterBandHeaders(meterBandHeadersBuilder.build());

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java
index a9f60cd5fe00d925dcc730594a6e6a0145a36df8..fea1af3181c2c95b52c0eabaf5093ad57ee5e3a8 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslator.java
@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
 import org.opendaylight.openflowplugin.openflow.md.core.IMDMessageTranslator;
 import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.GroupStatsResponseConvertor;
@@ -16,9 +15,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupDescStatsUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupFeaturesUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupStatisticsUpdatedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupFeatures;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupFeaturesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.group.features.GroupFeaturesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Chaining;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.ChainingChecks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupAll;
@@ -30,14 +26,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.SelectLiveness;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.SelectWeight;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterConfigStatsUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterFeaturesUpdatedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdatedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterFeatures;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterFeaturesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.MeterFeaturesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBand;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandDrop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandDscpRemark;
@@ -241,39 +232,6 @@ public class MultipartReplyTranslator implements IMDMessageTranslator<OfHeader,
         return listDataObject;
     }
     
-    private void augmentGroupFeaturesToNode(GroupFeaturesUpdatedBuilder message){
-        GroupFeaturesBuilder groupFeatures = new GroupFeaturesBuilder();
-        groupFeatures.setActions(message.getActions());
-        groupFeatures.setGroupCapabilitiesSupported(message.getGroupCapabilitiesSupported());
-        groupFeatures.setGroupTypesSupported(message.getGroupTypesSupported());
-        groupFeatures.setMaxGroups(message.getMaxGroups());
-
-        final NodeBuilder nodeData = new NodeBuilder(); 
-        nodeData.setKey(new NodeKey(message.getId()));
-        
-        NodeGroupFeaturesBuilder nodeGroupFeatures= new NodeGroupFeaturesBuilder();
-        nodeGroupFeatures.setGroupFeatures(groupFeatures.build());
-        //Update augmented data
-        nodeData.addAugmentation(NodeGroupFeatures.class, nodeGroupFeatures.build());
-    }
-
-    private void augmentMeterFeaturesToNode(MeterFeaturesUpdatedBuilder message){
-        MeterFeaturesBuilder meterFeature = new MeterFeaturesBuilder();
-        meterFeature.setMeterBandSupported(message.getMeterBandSupported());
-        meterFeature.setMeterCapabilitiesSupported(message.getMeterCapabilitiesSupported());
-        meterFeature.setMaxBands(message.getMaxBands());
-        meterFeature.setMaxColor(message.getMaxColor());
-        meterFeature.setMaxMeter(message.getMaxMeter());
-        
-        final NodeBuilder nodeData = new NodeBuilder(); 
-        nodeData.setKey(new NodeKey(message.getId()));
-        
-        NodeMeterFeaturesBuilder nodeMeterFeatures= new NodeMeterFeaturesBuilder();
-        nodeMeterFeatures.setMeterFeatures(meterFeature.build());
-        //Update augmented data
-        nodeData.addAugmentation(NodeMeterFeatures.class, nodeMeterFeatures.build());
-    }
-    
     private NodeId nodeIdFromDatapathId(BigInteger datapathId) {
         String current = datapathId.toString();
         return new NodeId("openflow:" + current);

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
index 9c3aa93432981a3269faca36d31605bcef0f4dab..b24e34261887abc67150157f2ef14f0c7d5b81cc 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
@@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.config.rev131024.Grou
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.config.rev131024.groups.Group;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.config.rev131024.groups.GroupBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.config.rev131024.groups.GroupKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.BucketId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.BucketsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket;
@@ -83,7 +84,7 @@ public class OpenflowpluginGroupTestCommandProvider implements CommandProvider {
         GroupKey key = new GroupKey(id, new NodeRef(new NodeRef(nodeToInstanceId(testNode))));
         GroupBuilder group = new GroupBuilder();
         BucketBuilder bucket = new BucketBuilder();
-        bucket.setOrder(12);
+        bucket.setBucketId(new BucketId((long) 12));
         group.setKey(key);
         group.setInstall(false);       
         group.setId(id);