Fixed build breakages due to changes in group and meter type models.

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

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 1c027a8b90340d5137bdc7fc5a693439e1ae5f90..2691ab46eb7d8f585c540f191357321155b5ecee 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
@@ -8,7 +8,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.
 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.group.types.rev131018.GroupId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes.GroupType;
+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.desc.stats.reply.GroupDescStats;
@@ -104,7 +104,7 @@ public class GroupStatsResponseConvertor {
         
         salGroupDescStats.setBuckets(toSALBucketsDesc(groupDesc.getBucketsList()));
         salGroupDescStats.setGroupId(new GroupId(groupDesc.getGroupId()));
-        salGroupDescStats.setGroupType(GroupType.forValue(groupDesc.getType().getIntValue()));
+        salGroupDescStats.setGroupType(GroupTypes.forValue(groupDesc.getType().getIntValue()));
         
         return salGroupDescStats.build();
     }

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 c059e0d89a9f07be700f8e2f10d0723b1f66a04c..ff10303635fc55c2d15aea749513824075bb58d9 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
@@ -6,6 +6,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.MeterId;
+
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.DropBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.DscpRemarkBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.ExperimenterBuilder;

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java
index 63ef29ab70436d34d9dc5bc9326860a14e54070e..c2fff5e9a5ea7f5cb19f65a0f939f71be642248b 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java
@@ -14,6 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInputBuilder;
 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;
 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;
@@ -34,7 +35,7 @@ public class GroupConvertorTest {
         addGroupBuilder.setGroupId(new GroupId(10L));
 
         addGroupBuilder
-                .setGroupType(org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes.GroupType.GroupAll);
+                .setGroupType(GroupTypes.GroupAll);
         List<Bucket> bucketList = new ArrayList<Bucket>();
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> actionsList = new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action>();
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> actionsList1 = new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action>();

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java
index 5d08a19eeac56ff0f1df27504fcc5fa67bb9635c..11797a23d448331d6d90f4f1c04542283008e090 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertorTest.java
@@ -8,7 +8,8 @@ import junit.framework.Assert;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterFlags.Flags;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.Drop;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.DropBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.DscpRemark;
@@ -28,135 +29,127 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.Bands;
 
-
 public class MeterConvertorTest {
 
-
-
-@Test
-public void testMeterModCommandConvertorwithAllParameters()
-{
-
-       /// DROP Band
-       MeterBandHeaderBuilder meterBandHeaderBuilder = new MeterBandHeaderBuilder();
-       MeterBandTypesBuilder meterBandTypesB = new MeterBandTypesBuilder();
-
-       org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType.Flags bandFlag = new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType.Flags(true, false, false);
-       meterBandTypesB.setFlags(bandFlag);//_ofpmbtDrop
-       DropBuilder drop = new DropBuilder();
-       drop.setBurstSize(10L);
-       drop.setRate(20L);
-       Drop drp = drop.build();
-       meterBandHeaderBuilder.setBandType(drp);
-       meterBandHeaderBuilder.setMeterBandTypes(meterBandTypesB.build());
-
-
-
-       MeterBandHeader meterBH = meterBandHeaderBuilder.build();
-
-       //DSCP Mark
-       MeterBandHeaderBuilder meterBandHeaderBuilder1 = new MeterBandHeaderBuilder();
-       MeterBandTypesBuilder meterBandTypesB1 = new MeterBandTypesBuilder();
-       org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType.Flags bandFlag1 = new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType.Flags(false, true, false);
-
-       meterBandTypesB1.setFlags(bandFlag1);
-       DscpRemarkBuilder dscp = new DscpRemarkBuilder();
-       dscp.setBurstSize(11L);
-       dscp.setRate(21L);
-       dscp.setPercLevel((short)1);
-       DscpRemark dscpRemark = dscp.build();
-       meterBandHeaderBuilder1.setBandType(dscpRemark);
-       meterBandHeaderBuilder1.setMeterBandTypes(meterBandTypesB1.build());
-
-       MeterBandHeader meterBH1 = meterBandHeaderBuilder1.build();
-
-       //Experimental
-
-               MeterBandHeaderBuilder meterBandHeaderBuilder2 = new MeterBandHeaderBuilder();
-               MeterBandTypesBuilder meterBandTypesB2 = new MeterBandTypesBuilder();
-               org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType.Flags bandFlag2 = new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType.Flags(false,false, true);
-               meterBandTypesB2.setFlags(bandFlag2);
-
-               ExperimenterBuilder exp = new ExperimenterBuilder();
-               exp.setBurstSize(12L);
-               exp.setRate(22L);
-               exp.setExperimenter(23L);
-               Experimenter experimenter = exp.build();
-               meterBandHeaderBuilder2.setBandType(experimenter);
-               meterBandHeaderBuilder2.setMeterBandTypes(meterBandTypesB2.build());
-               MeterBandHeader meterBH2 = meterBandHeaderBuilder2.build();
-
-
-       List<MeterBandHeader> meterBandList = new ArrayList<MeterBandHeader>();
-       meterBandList.add(0,meterBH);
-       meterBandList.add(1,meterBH1);
-       meterBandList.add(2,meterBH2);
-
-       //Constructing List of Bands
-       MeterBandHeadersBuilder meterBandHeadersBuilder = new MeterBandHeadersBuilder();
-       meterBandHeadersBuilder.setMeterBandHeader(meterBandList);
-
-       MeterBandHeaders meterBandHeaders =meterBandHeadersBuilder.build();
-
-
-       AddMeterInputBuilder addMeterFromSAL = new AddMeterInputBuilder();
-
-
-       addMeterFromSAL.setMeterBandHeaders(meterBandHeaders); //MeterBands added to the meter command.
-Long temp = 10L;
-
-        //NodeKey key = new NodeKey(new NodeId("24"));
-     //InstanceIdentifier<Node> path = InstanceIdentifier.builder().node(Nodes.class).node(Node.class, key).toInstance();
-
-       addMeterFromSAL.setMeterId(new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId(10L));
-
-
-               Flags flagV = new Flags(true, true, true,true);
-               addMeterFromSAL.setFlags(flagV);
-
-       AddMeterInput meterInputCommand = addMeterFromSAL.build();
+    @Test
+    public void testMeterModCommandConvertorwithAllParameters() {
+
+        // / DROP Band
+        MeterBandHeaderBuilder meterBandHeaderBuilder = new MeterBandHeaderBuilder();
+        MeterBandTypesBuilder meterBandTypesB = new MeterBandTypesBuilder();
+
+        MeterBandType bandFlag = new MeterBandType(true, false, false);
+        meterBandTypesB.setFlags(bandFlag);// _ofpmbtDrop
+        DropBuilder drop = new DropBuilder();
+        drop.setBurstSize(10L);
+        drop.setRate(20L);
+        Drop drp = drop.build();
+        meterBandHeaderBuilder.setBandType(drp);
+        meterBandHeaderBuilder.setMeterBandTypes(meterBandTypesB.build());
+
+        MeterBandHeader meterBH = meterBandHeaderBuilder.build();
+
+        // DSCP Mark
+        MeterBandHeaderBuilder meterBandHeaderBuilder1 = new MeterBandHeaderBuilder();
+        MeterBandTypesBuilder meterBandTypesB1 = new MeterBandTypesBuilder();
+        MeterBandType bandFlag1 = new MeterBandType(false, true, false);
+
+        meterBandTypesB1.setFlags(bandFlag1);
+        DscpRemarkBuilder dscp = new DscpRemarkBuilder();
+        dscp.setBurstSize(11L);
+        dscp.setRate(21L);
+        dscp.setPercLevel((short) 1);
+        DscpRemark dscpRemark = dscp.build();
+        meterBandHeaderBuilder1.setBandType(dscpRemark);
+        meterBandHeaderBuilder1.setMeterBandTypes(meterBandTypesB1.build());
+
+        MeterBandHeader meterBH1 = meterBandHeaderBuilder1.build();
+
+        // Experimental
+
+        MeterBandHeaderBuilder meterBandHeaderBuilder2 = new MeterBandHeaderBuilder();
+        MeterBandTypesBuilder meterBandTypesB2 = new MeterBandTypesBuilder();
+        MeterBandType bandFlag2 = new MeterBandType(false, false, true);
+        meterBandTypesB2.setFlags(bandFlag2);
+
+        ExperimenterBuilder exp = new ExperimenterBuilder();
+        exp.setBurstSize(12L);
+        exp.setRate(22L);
+        exp.setExperimenter(23L);
+        Experimenter experimenter = exp.build();
+        meterBandHeaderBuilder2.setBandType(experimenter);
+        meterBandHeaderBuilder2.setMeterBandTypes(meterBandTypesB2.build());
+        MeterBandHeader meterBH2 = meterBandHeaderBuilder2.build();
+
+        List<MeterBandHeader> meterBandList = new ArrayList<MeterBandHeader>();
+        meterBandList.add(0, meterBH);
+        meterBandList.add(1, meterBH1);
+        meterBandList.add(2, meterBH2);
+
+        // Constructing List of Bands
+        MeterBandHeadersBuilder meterBandHeadersBuilder = new MeterBandHeadersBuilder();
+        meterBandHeadersBuilder.setMeterBandHeader(meterBandList);
+
+        MeterBandHeaders meterBandHeaders = meterBandHeadersBuilder.build();
+
+        AddMeterInputBuilder addMeterFromSAL = new AddMeterInputBuilder();
+
+        addMeterFromSAL.setMeterBandHeaders(meterBandHeaders); // MeterBands
+                                                               // added to the
+                                                               // meter command.
+        Long temp = 10L;
+
+        // NodeKey key = new NodeKey(new NodeId("24"));
+        // InstanceIdentifier<Node> path =
+        // InstanceIdentifier.builder().node(Nodes.class).node(Node.class,
+        // key).toInstance();
+
+        addMeterFromSAL
+                .setMeterId(new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId(10L));
+        MeterFlags flagV = new MeterFlags(true, true, true, true);
+        addMeterFromSAL.setFlags(flagV);
+
+        AddMeterInput meterInputCommand = addMeterFromSAL.build();
         MeterModInput outMeterModInput = MeterConvertor.toMeterModInput(meterInputCommand, (short) 0X4);
 
-
-
-
-        Assert.assertEquals(MeterModCommand.OFPMCADD, outMeterModInput.getCommand());
-       Assert.assertTrue(outMeterModInput.getFlags().isOFPMFBURST());
-       Assert.assertEquals(temp,outMeterModInput.getMeterId().getValue());
-       //BandInformation starts here:
-
-             List<Bands> bands =  outMeterModInput.getBands();
-                       for (Bands currentBand : bands) {
-                   MeterBand meterBand = currentBand.getMeterBand();
-                       if(meterBand instanceof MeterBandDrop){
-
-                                       Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType.OFPMBTDROP, ((MeterBandDrop) meterBand).getType());
-                                       Assert.assertEquals((long)20,(long)((MeterBandDrop) meterBand).getBurstSize());
-                                       Assert.assertEquals((long)10, (long)((MeterBandDrop) meterBand).getRate());
-
-                       }
-                       if(meterBand instanceof MeterBandDscpRemark)
-                       {
-                               Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType.OFPMBTDSCPREMARK, ((MeterBandDscpRemark) meterBand).getType());
-                               Assert.assertEquals((long)11,(long)((MeterBandDscpRemark) meterBand).getBurstSize());
-                               Assert.assertEquals((long)21, (long)((MeterBandDscpRemark) meterBand).getRate());
-                               Assert.assertEquals((short)1, (short)((MeterBandDscpRemark) meterBand).getPrecLevel());
-
-                       }
-                       if(meterBand instanceof MeterBandExperimenter)
-                       {
-                               Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType.OFPMBTEXPERIMENTER, ((MeterBandExperimenter) meterBand).getType());
-                               Assert.assertEquals((long)12,(long)((MeterBandExperimenter) meterBand).getBurstSize());
-                               Assert.assertEquals((long)22, (long)((MeterBandExperimenter) meterBand).getRate());
-                               Assert.assertEquals((long)23, (long)((MeterBandExperimenter) meterBand).getExperimenter());
-
-                       }
-
-                   }
-
-
-}
-
-
+        Assert.assertEquals(MeterModCommand.OFPMCADD, outMeterModInput.getCommand());
+        Assert.assertTrue(outMeterModInput.getFlags().isOFPMFBURST());
+        Assert.assertEquals(temp, outMeterModInput.getMeterId().getValue());
+        // BandInformation starts here:
+
+        List<Bands> bands = outMeterModInput.getBands();
+        for (Bands currentBand : bands) {
+            MeterBand meterBand = currentBand.getMeterBand();
+            if (meterBand instanceof MeterBandDrop) {
+
+                Assert.assertEquals(
+                        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType.OFPMBTDROP,
+                        ((MeterBandDrop) meterBand).getType());
+                Assert.assertEquals((long) 20, (long) ((MeterBandDrop) meterBand).getBurstSize());
+                Assert.assertEquals((long) 10, (long) ((MeterBandDrop) meterBand).getRate());
+
+            }
+            if (meterBand instanceof MeterBandDscpRemark) {
+                Assert.assertEquals(
+                        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType.OFPMBTDSCPREMARK,
+                        ((MeterBandDscpRemark) meterBand).getType());
+                Assert.assertEquals((long) 11, (long) ((MeterBandDscpRemark) meterBand).getBurstSize());
+                Assert.assertEquals((long) 21, (long) ((MeterBandDscpRemark) meterBand).getRate());
+                Assert.assertEquals((short) 1, (short) ((MeterBandDscpRemark) meterBand).getPrecLevel());
+
+            }
+            if (meterBand instanceof MeterBandExperimenter) {
+                Assert.assertEquals(
+                        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType.OFPMBTEXPERIMENTER,
+                        ((MeterBandExperimenter) meterBand).getType());
+                Assert.assertEquals((long) 12, (long) ((MeterBandExperimenter) meterBand).getBurstSize());
+                Assert.assertEquals((long) 22, (long) ((MeterBandExperimenter) meterBand).getRate());
+                Assert.assertEquals((long) 23, (long) ((MeterBandExperimenter) meterBand).getExperimenter());
+
+            }
+
+        }
+
+    }
 
 }