Bug 5540 - MeterStatsResponseConvertor, MeterConfigStatsResponseConvertor

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / MeterStatsResponseConvertorTest.java

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 8bc4c258942900991fc7ec119a512a159ea0dd95..16b9871ad339adc2a7f91bd42a8dfca04df26d1a 100644 (file)
--- 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,33 +9,22 @@
 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;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import org.junit.Test;
-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.statistics.meter.band.stats.BandStat;
 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.MeterStatsKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.MeterStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.meter.stats.MeterBandStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.meter.stats.MeterBandStatsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.MeterConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.MeterConfigBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.meter.config.Bands;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.meter.config.BandsBuilder;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
-/**
- * Created by Martin Bobak mbobak@cisco.com on 9/18/14.
- */
 public class MeterStatsResponseConvertorTest {
-
-    private static final MeterStatsResponseConvertor METER_STATS_RESPONSE_CONVERTOR = new MeterStatsResponseConvertor();
     private static final int PRESET_COUNT = 7;
 
 
@@ -67,30 +56,14 @@ public class MeterStatsResponseConvertorTest {
         return allMeterStats;
     }
 
-    private final List<MeterConfig> createMeterConfigList(){
-        List<MeterConfig> meterConfigs = new ArrayList<>();
-        MeterConfigBuilder meterConfigBuilder = new MeterConfigBuilder();
-        for (int i = 0; i < PRESET_COUNT; i++) {
-            meterConfigBuilder.setMeterId(new MeterId((long) i));
-            List<Bands> bandses = new ArrayList<>();
-            for (int j = 0; j < PRESET_COUNT; j++){
-                BandsBuilder bandsBuilder = new BandsBuilder();
-                bandsBuilder.setMeterBand(new MockMeterBandBuilder());
-                bandses.add(bandsBuilder.build());
-            }
-            meterConfigBuilder.setBands(bandses);
-            meterConfigBuilder.setFlags(new MeterFlags(true, false, true, false));
-            meterConfigs.add(meterConfigBuilder.build());
-        }
-        return meterConfigs;
-    }
     @Test
     /**
-     * Test of basic mapping functionality of {@link MeterStatsResponseConvertor#toSALMeterStatsList(java.util.List)}
+     * Test of basic mapping functionality of {@link MeterStatsResponseConvertor#convert(java.util.List)}
      */
     public void testToSALMeterStatsList() {
 
-        List<MeterStats> meterStatsList = METER_STATS_RESPONSE_CONVERTOR.toSALMeterStatsList(createMeterStatsLit());
+        Optional<List<MeterStats>> meterStatsListOptional = ConvertorManager.getInstance().convert(createMeterStatsLit());
+        List<MeterStats> meterStatsList = meterStatsListOptional.orElse(Collections.emptyList());
         assertEquals(PRESET_COUNT, meterStatsList.size());
 
         int cnt = 0;
@@ -115,33 +88,4 @@ public class MeterStatsResponseConvertorTest {
             cnt++;
         }
     }
-
-    @Test
-    /**
-     * Test of basic mapping functionality of {@link MeterStatsResponseConvertor#toSALMeterStatsList(java.util.List)}
-     */
-    public void testToSALMeterConfigList() {
-        List<MeterConfigStats> meterConfigs = METER_STATS_RESPONSE_CONVERTOR.toSALMeterConfigList(createMeterConfigList());
-        assertEquals(PRESET_COUNT, meterConfigs.size());
-        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++;
-        }
-    }
-
-
-    private final class MockMeterBandBuilder implements org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.MeterBand {
-
-        @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
-            return MockMeterBandBuilder.class;
-        }
-    }
-
-}
+}
\ No newline at end of file