From 7638770ff950fd0e62e625e778bda3007a021a23 Mon Sep 17 00:00:00 2001 From: Martin Bobak Date: Thu, 30 Oct 2014 13:50:05 +0100 Subject: [PATCH] Bug 2065 - Unset fields in MeterStatsResponseConvertor - this commit needs this one to be merged https://git.opendaylight.org/gerrit/12381 Change-Id: Idb01266d87c45d9894b513b6299d9c1da07a5615 Signed-off-by: Martin Bobak --- .../md/core/sal/convertor/MeterConvertor.java | 2 +- .../MeterStatsResponseConvertor.java | 104 ++++++++++-------- .../sal/convertor/MeterConvertorTest.java | 6 +- .../MeterStatsResponseConvertorTest.java | 7 ++ .../MultipartReplyTranslatorFifthTest.java | 44 ++++---- ...penflowpluginMeterTestCommandProvider.java | 4 +- 6 files changed, 91 insertions(+), 76 deletions(-) diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java index 03422120b1..9acb72451f 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterConvertor.java @@ -141,7 +141,7 @@ public final class MeterConvertor { DscpRemark dscpRemark = (DscpRemark) meterBandHeader.getBandType(); meterBandDscpRemarkBuilder.setBurstSize(dscpRemark.getDscpRemarkBurstSize()); meterBandDscpRemarkBuilder.setRate(dscpRemark.getDscpRemarkRate()); - meterBandDscpRemarkBuilder.setPrecLevel(dscpRemark.getPercLevel()); + meterBandDscpRemarkBuilder.setPrecLevel(dscpRemark.getPrecLevel()); dscpCaseBuilder.setMeterBandDscpRemark(meterBandDscpRemarkBuilder.build()); meterBandItem = dscpCaseBuilder.build(); bandsB = new BandsBuilder(); 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 b9ca4995dc..a8cffd9376 100644 --- 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 @@ -10,11 +10,11 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor; import java.util.ArrayList; 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.MeterBandType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterFlags; 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; @@ -48,56 +48,58 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 /** * Class is an utility class for converting group related statistics messages coming from switch to MD-SAL * messages. - * @author avishnoi@in.ibm.com * + * @author avishnoi@in.ibm.com */ public class MeterStatsResponseConvertor { /** * Method converts list of OF Meter Stats to SAL Meter Stats. + * * @param allMeterStats * @return List of MeterStats */ public List toSALMeterStatsList( List allMeterStats){ + .multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.MeterStats> allMeterStats) { List convertedSALMeters = new ArrayList(); - for(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply. - multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.MeterStats meter: allMeterStats){ + for (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply. + multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.MeterStats meter : allMeterStats) { convertedSALMeters.add(toSALMeterStats(meter)); } return convertedSALMeters; - + } - + /** - * Method convert MeterStats message from library to MD SAL defined MeterStats + * Method convert MeterStats message from library to MD SAL defined MeterStats + * * @param meterStats MeterStats from library * @return MeterStats -- MeterStats defined in MD-SAL */ public MeterStats toSALMeterStats(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply - .multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.MeterStats meterStats){ - + .multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.MeterStats meterStats) { + MeterStatsBuilder salMeterStats = new MeterStatsBuilder(); salMeterStats.setByteInCount(new Counter64(meterStats.getByteInCount())); - + DurationBuilder time = new DurationBuilder(); time.setSecond(new Counter32(meterStats.getDurationSec())); time.setNanosecond(new Counter32(meterStats.getDurationNsec())); salMeterStats.setDuration(time.build()); - + salMeterStats.setFlowCount(new Counter32(meterStats.getFlowCount())); salMeterStats.setMeterId(new MeterId(meterStats.getMeterId().getValue())); salMeterStats.setPacketInCount(new Counter64(meterStats.getPacketInCount())); salMeterStats.setKey(new MeterStatsKey(salMeterStats.getMeterId())); - + List allMeterBandStats = meterStats.getMeterBandStats(); - + MeterBandStatsBuilder meterBandStatsBuilder = new MeterBandStatsBuilder(); List listAllBandStats = new ArrayList(); int bandKey = 0; - for(MeterBandStats meterBandStats : allMeterBandStats){ - BandStatBuilder bandStatBuilder = new BandStatBuilder(); + for (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); @@ -110,86 +112,92 @@ public class MeterStatsResponseConvertor { salMeterStats.setMeterBandStats(meterBandStatsBuilder.build()); return salMeterStats.build(); } - + /** - * Method convert list of OF Meter config Stats to SAL Meter Config stats + * Method convert list of OF Meter config Stats to SAL Meter Config stats + * * @param allMeterConfigs * @return list of MeterConfigStats */ - public List toSALMeterConfigList(List allMeterConfigs){ - + public List toSALMeterConfigList(List allMeterConfigs) { + List listMeterConfigStats = new ArrayList(); - for( MeterConfig meterConfig : allMeterConfigs){ + for (MeterConfig meterConfig : allMeterConfigs) { MeterConfigStatsBuilder meterConfigStatsBuilder = new MeterConfigStatsBuilder(); meterConfigStatsBuilder.setMeterId(new MeterId(meterConfig.getMeterId().getValue())); meterConfigStatsBuilder.setKey(new MeterConfigStatsKey(meterConfigStatsBuilder.getMeterId())); - + MeterBandHeadersBuilder meterBandHeadersBuilder = new MeterBandHeadersBuilder(); List bands = meterConfig.getBands(); - + + MeterFlags meterFlags = new MeterFlags(meterConfig.getFlags().isOFPMFBURST(), + meterConfig.getFlags().isOFPMFKBPS(), + meterConfig.getFlags().isOFPMFPKTPS(), + meterConfig.getFlags().isOFPMFSTATS()); + meterConfigStatsBuilder.setFlags(meterFlags); List listBandHeaders = new ArrayList(); - int bandKey=0; - for(Bands band : bands){ + int bandKey = 0; + for (Bands band : bands) { MeterBandHeaderBuilder meterBandHeaderBuilder = new MeterBandHeaderBuilder(); - if(band.getMeterBand() instanceof MeterBandDropCase){ - MeterBandDropCase dropCaseBand = (MeterBandDropCase)band.getMeterBand(); + if (band.getMeterBand() instanceof MeterBandDropCase) { + MeterBandDropCase dropCaseBand = (MeterBandDropCase) band.getMeterBand(); MeterBandDrop dropBand = dropCaseBand.getMeterBandDrop(); DropBuilder dropBuilder = new DropBuilder(); dropBuilder.setDropBurstSize(dropBand.getBurstSize()); dropBuilder.setDropRate(dropBand.getRate()); meterBandHeaderBuilder.setBandType(dropBuilder.build()); - + meterBandHeaderBuilder.setBandBurstSize(dropBand.getBurstSize()); meterBandHeaderBuilder.setBandRate(dropBand.getRate()); - BandId bandId = new BandId((long)bandKey); + BandId bandId = new BandId((long) bandKey); meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId)); meterBandHeaderBuilder.setBandId(bandId); - + MeterBandTypesBuilder meterBandTypesBuilder = new MeterBandTypesBuilder(); - meterBandTypesBuilder.setFlags(new MeterBandType(true,false,false)); + meterBandTypesBuilder.setFlags(new MeterBandType(true, false, false)); meterBandHeaderBuilder.setMeterBandTypes(meterBandTypesBuilder.build()); - + listBandHeaders.add(meterBandHeaderBuilder.build()); - }else if (band.getMeterBand() instanceof MeterBandDscpRemarkCase){ - MeterBandDscpRemarkCase dscpRemarkCaseBand = (MeterBandDscpRemarkCase)band.getMeterBand(); + } else if (band.getMeterBand() instanceof MeterBandDscpRemarkCase) { + MeterBandDscpRemarkCase dscpRemarkCaseBand = (MeterBandDscpRemarkCase) band.getMeterBand(); MeterBandDscpRemark dscpRemarkBand = dscpRemarkCaseBand.getMeterBandDscpRemark(); DscpRemarkBuilder dscpRemarkBuilder = new DscpRemarkBuilder(); dscpRemarkBuilder.setDscpRemarkBurstSize(dscpRemarkBand.getBurstSize()); dscpRemarkBuilder.setDscpRemarkRate(dscpRemarkBand.getRate()); + dscpRemarkBuilder.setPrecLevel(dscpRemarkBand.getPrecLevel()); meterBandHeaderBuilder.setBandType(dscpRemarkBuilder.build()); - + meterBandHeaderBuilder.setBandBurstSize(dscpRemarkBand.getBurstSize()); meterBandHeaderBuilder.setBandRate(dscpRemarkBand.getRate()); - BandId bandId = new BandId((long)bandKey); + BandId bandId = new BandId((long) bandKey); meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId)); meterBandHeaderBuilder.setBandId(bandId); - + MeterBandTypesBuilder meterBandTypesBuilder = new MeterBandTypesBuilder(); - meterBandTypesBuilder.setFlags(new MeterBandType(false,true,false)); + meterBandTypesBuilder.setFlags(new MeterBandType(false, true, false)); meterBandHeaderBuilder.setMeterBandTypes(meterBandTypesBuilder.build()); - listBandHeaders.add(meterBandHeaderBuilder.build()); - - }else if (band.getMeterBand() instanceof MeterBandExperimenterCase){ - MeterBandExperimenterCase experimenterCaseBand = (MeterBandExperimenterCase)band.getMeterBand(); + + } else if (band.getMeterBand() instanceof MeterBandExperimenterCase) { + MeterBandExperimenterCase experimenterCaseBand = (MeterBandExperimenterCase) band.getMeterBand(); MeterBandExperimenter experimenterBand = experimenterCaseBand.getMeterBandExperimenter(); ExperimenterBuilder experimenterBuilder = new ExperimenterBuilder(); experimenterBuilder.setExperimenterBurstSize(experimenterBand.getBurstSize()); experimenterBuilder.setExperimenterRate(experimenterBand.getRate()); meterBandHeaderBuilder.setBandType(experimenterBuilder.build()); - + meterBandHeaderBuilder.setBandBurstSize(experimenterBand.getBurstSize()); meterBandHeaderBuilder.setBandRate(experimenterBand.getRate()); - BandId bandId = new BandId((long)bandKey); + BandId bandId = new BandId((long) bandKey); meterBandHeaderBuilder.setKey(new MeterBandHeaderKey(bandId)); meterBandHeaderBuilder.setBandId(bandId); - + MeterBandTypesBuilder meterBandTypesBuilder = new MeterBandTypesBuilder(); - meterBandTypesBuilder.setFlags(new MeterBandType(false,false,true)); + meterBandTypesBuilder.setFlags(new MeterBandType(false, false, true)); meterBandHeaderBuilder.setMeterBandTypes(meterBandTypesBuilder.build()); listBandHeaders.add(meterBandHeaderBuilder.build()); - + } bandKey++; } @@ -197,7 +205,7 @@ public class MeterStatsResponseConvertor { meterConfigStatsBuilder.setMeterBandHeaders(meterBandHeadersBuilder.build()); listMeterConfigStats.add(meterConfigStatsBuilder.build()); } - + return listMeterConfigStats; } } 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 fc2ab5d42f..bde8a475c7 100644 --- 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 @@ -78,7 +78,7 @@ public class MeterConvertorTest { DscpRemarkBuilder dscp = new DscpRemarkBuilder(); dscp.setDscpRemarkBurstSize(DSCP_REMARK_BURST_SIZE); dscp.setDscpRemarkRate(DSCP_REMARK_RATE); - dscp.setPercLevel(DSCP_PERC_LEVEL); + dscp.setPrecLevel(DSCP_PERC_LEVEL); DscpRemark dscpRemark = dscp.build(); meterBandHeaderBuilder1.setBandType(dscpRemark); meterBandHeaderBuilder1.setMeterBandTypes(meterBandTypesB1.build()); @@ -210,7 +210,7 @@ public class MeterConvertorTest { dscp.setDscpRemarkBurstSize(DSCP_REMARK_BURST_SIZE); dscp.setDscpRemarkRate(DSCP_REMARK_RATE); - dscp.setPercLevel(DSCP_PERC_LEVEL); + dscp.setPrecLevel(DSCP_PERC_LEVEL); DscpRemark dscpRemark = dscp.build(); meterBandHeaderBuilder1.setBandType(dscpRemark); meterBandHeaderBuilder1.setMeterBandTypes(meterBandTypesB1.build()); @@ -358,7 +358,7 @@ public class MeterConvertorTest { DscpRemarkBuilder dscp = new DscpRemarkBuilder(); dscp.setDscpRemarkBurstSize(11L); dscp.setDscpRemarkRate(21L); - dscp.setPercLevel((short) 1); + dscp.setPrecLevel((short) 1); DscpRemark dscpRemark = dscp.build(); meterBandHeaderBuilder1.setBandType(dscpRemark); meterBandHeaderBuilder1.setMeterBandTypes(meterBandTypesB1.build()); diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertorTest.java index babb373cb3..87ca2ad815 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/MeterStatsResponseConvertorTest.java @@ -9,6 +9,8 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.math.BigInteger; import java.util.ArrayList; @@ -125,6 +127,11 @@ public class MeterStatsResponseConvertorTest { int cnt = 0; for (MeterConfigStats meterConfigStats: meterConfigs){ assertEquals(new Long(cnt), meterConfigStats.getMeterId().getValue()); + assertTrue(meterConfigStats.getFlags().isMeterBurst()); + assertFalse(meterConfigStats.getFlags().isMeterKbps()); + assertTrue(meterConfigStats.getFlags().isMeterPktps()); + assertFalse(meterConfigStats.getFlags().isMeterStats()); + cnt++; } } diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java index 6c52f52998..d625aa38e1 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java @@ -13,15 +13,14 @@ import static org.mockito.Mockito.when; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; -import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor; +import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterConfigStatsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdated; @@ -56,14 +55,17 @@ import org.opendaylight.yangtools.yang.binding.DataObject; /** * @author michal.polkorab - * */ public class MultipartReplyTranslatorFifthTest { - @Mock SwitchConnectionDistinguisher cookie; - @Mock SessionContext sc; - @Mock ConnectionConductor conductor; - @Mock GetFeaturesOutput features; + @Mock + SwitchConnectionDistinguisher cookie; + @Mock + SessionContext sc; + @Mock + ConnectionConductor conductor; + @Mock + GetFeaturesOutput features; MultipartReplyTranslator translator = new MultipartReplyTranslator(); @@ -98,7 +100,7 @@ public class MultipartReplyTranslatorFifthTest { caseBuilder.setMultipartReplyMeter(meterBuilder.build()); mpBuilder.setMultipartReplyBody(caseBuilder.build()); MultipartReplyMessage message = mpBuilder.build(); - + List list = translator.translate(cookie, sc, message); Assert.assertEquals("Wrong list size", 1, list.size()); @@ -156,7 +158,7 @@ public class MultipartReplyTranslatorFifthTest { caseBuilder.setMultipartReplyMeter(meterBuilder.build()); mpBuilder.setMultipartReplyBody(caseBuilder.build()); MultipartReplyMessage message = mpBuilder.build(); - + List list = translator.translate(cookie, sc, message); Assert.assertEquals("Wrong list size", 1, list.size()); @@ -166,7 +168,7 @@ public class MultipartReplyTranslatorFifthTest { Assert.assertEquals("Wrong transaction-id", 123, statUpdate.getTransactionId().getValue().intValue()); Assert.assertEquals("Wrong group stats size", 2, statUpdate.getMeterStats().size()); org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply - .MeterStats stat = statUpdate.getMeterStats().get(0); + .MeterStats stat = statUpdate.getMeterStats().get(0); Assert.assertEquals("Wrong meter-id", 15, stat.getMeterId().getValue().intValue()); Assert.assertEquals("Wrong flow count", 16, stat.getFlowCount().getValue().intValue()); Assert.assertEquals("Wrong packet in count", 17, stat.getPacketInCount().getValue().intValue()); @@ -215,7 +217,7 @@ public class MultipartReplyTranslatorFifthTest { caseBuilder.setMultipartReplyMeterConfig(meterBuilder.build()); mpBuilder.setMultipartReplyBody(caseBuilder.build()); MultipartReplyMessage message = mpBuilder.build(); - + List list = translator.translate(cookie, sc, message); Assert.assertEquals("Wrong list size", 1, list.size()); @@ -276,7 +278,7 @@ public class MultipartReplyTranslatorFifthTest { caseBuilder.setMultipartReplyMeterConfig(meterBuilder.build()); mpBuilder.setMultipartReplyBody(caseBuilder.build()); MultipartReplyMessage message = mpBuilder.build(); - + List list = translator.translate(cookie, sc, message); Assert.assertEquals("Wrong list size", 1, list.size()); @@ -286,11 +288,10 @@ public class MultipartReplyTranslatorFifthTest { Assert.assertEquals("Wrong transaction-id", 123, statUpdate.getTransactionId().getValue().intValue()); Assert.assertEquals("Wrong meter config stats size", 2, statUpdate.getMeterConfigStats().size()); MeterConfigStats stat = statUpdate.getMeterConfigStats().get(0); - // TODO: fix implementation - add flags creation -// Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterBurst()); -// Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterPktps()); -// Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterKbps()); -// Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterStats()); + Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterBurst()); + Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterPktps()); + Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterKbps()); + Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterStats()); Assert.assertEquals("Wrong meter-id", 20, stat.getMeterId().getValue().intValue()); Assert.assertEquals("Wrong bands size", 2, stat.getMeterBandHeaders().getMeterBandHeader().size()); MeterBandHeader header = stat.getMeterBandHeaders().getMeterBandHeader().get(0); @@ -310,11 +311,10 @@ public class MultipartReplyTranslatorFifthTest { Assert.assertEquals("Wrong flag", true, header.getMeterBandTypes().getFlags().isOfpmbtDscpRemark()); Assert.assertEquals("Wrong flag", false, header.getMeterBandTypes().getFlags().isOfpmbtExperimenter()); stat = statUpdate.getMeterConfigStats().get(1); - // TODO: fix implementation - add flags creation -// Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterBurst()); -// Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterPktps()); -// Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterKbps()); -// Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterStats()); + Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterBurst()); + Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterPktps()); + Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterKbps()); + Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterStats()); Assert.assertEquals("Wrong meter-id", 26, stat.getMeterId().getValue().intValue()); Assert.assertEquals("Wrong bands size", 0, stat.getMeterBandHeaders().getMeterBandHeader().size()); } diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java index 7323546728..7624d31894 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java @@ -141,7 +141,7 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider { bandHeader.setBandBurstSize((long) 444); DscpRemarkBuilder dscpRemark = new DscpRemarkBuilder(); dscpRemark.setDscpRemarkBurstSize((long) 5); - dscpRemark.setPercLevel((short) 1); + dscpRemark.setPrecLevel((short) 1); dscpRemark.setDscpRemarkRate((long) 12); bandHeader.setBandType(dscpRemark.build()); MeterBandTypesBuilder bandTypes = new MeterBandTypesBuilder(); @@ -180,7 +180,7 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider { bandHeader.setBandBurstSize((long) 444); DscpRemarkBuilder dscpRemark = new DscpRemarkBuilder(); dscpRemark.setDscpRemarkBurstSize((long) 5); - dscpRemark.setPercLevel((short) 1); + dscpRemark.setPrecLevel((short) 1); dscpRemark.setDscpRemarkRate((long) 12); bandHeader.setBandType(dscpRemark.build()); MeterBandTypesBuilder bandTypes = new MeterBandTypesBuilder(); -- 2.36.6