Merge "BUG-4117: add support of Old Notif. for Flow Statistics"

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / MeterConvertor.java

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 03422120b1d6b17ff24032a2d51aa9e1b3eb5757..41a10aaf29ffaf1af3b79efd0c30f910e3cca911 100644 (file)
--- 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
@@ -4,9 +4,8 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor: usha.m.s@ericsson.com
  */
+
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 
 /****
@@ -25,8 +24,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.Experimenter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.MeterBandHeaders;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeader;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdMeterBand;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdMeterBandBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdMeterBand;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdMeterBandBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterFlags;
@@ -46,8 +45,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class MeterConvertor {
-    private static final Logger logger = LoggerFactory.getLogger(MeterConvertor.class);
-    private static final String PREFIX_SEPARATOR = "/";
+    private static final Logger LOG = LoggerFactory.getLogger(MeterConvertor.class);
 
     private MeterConvertor() {
 
@@ -55,9 +53,8 @@ public final class MeterConvertor {
 
     // Get all the data for the meter from the Yang/SAL-Layer
     /**
-     * @param version
-     * @param Yang
-     *            Data source
+     * @param version of version
+     * @param source Data source
      * @return MeterModInput required by OF Library
      */
     public static MeterModInputBuilder toMeterModInput(
@@ -95,7 +92,7 @@ public final class MeterConvertor {
             getBandsFromSAL(source.getMeterBandHeaders(), bands);
             meterModInputBuilder.setBands(bands);
         } else {
-            logger.error("For this meter Id" + source.getMeterId().getValue() + ",no associated band data found!");
+            LOG.error("For this meter Id" + source.getMeterId().getValue() + ",no associated band data found!");
         }
 
         meterModInputBuilder.setVersion(version);
@@ -128,10 +125,10 @@ public final class MeterConvertor {
                         meterBandItem = dropCaseBuilder.build();
                         bandsB = new BandsBuilder();
                         bandsB.setMeterBand(meterBandItem);
-                        bands.add(bandsB.build()); // Bands list
-
+                        // Bands list
+                        bands.add(bandsB.build());
                     } else {
-                        logger.error("BandType: " + MeterBandType.OFPMBTDROP + "No Band Data found");
+                        logBandTypeMissing(MeterBandType.OFPMBTDROP);
                     }
                 } else if (meterBandHeader.getMeterBandTypes().getFlags().isOfpmbtDscpRemark()) {
                     if (meterBandHeader.getBandType() != null) {
@@ -141,15 +138,15 @@ 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();
                         bandsB.setMeterBand(meterBandItem);
-                        bands.add(bandsB.build()); // Bands list
-
+                        // Bands list
+                        bands.add(bandsB.build());
                     } else {
-                        logger.error("BandType: " + MeterBandType.OFPMBTDSCPREMARK + "No Band Data found");
+                        logBandTypeMissing(MeterBandType.OFPMBTDSCPREMARK);
                     }
                 } else if (meterBandHeader.getMeterBandTypes().getFlags().isOfpmbtExperimenter()) {
                     if (meterBandHeader.getBandType() != null) {
@@ -167,18 +164,22 @@ public final class MeterConvertor {
                         meterBandItem = experimenterCaseBuilder.build();
                         bandsB = new BandsBuilder();
                         bandsB.setMeterBand(meterBandItem);
-                        bands.add(bandsB.build()); // Bands list
-
+                        // Bands list
+                        bands.add(bandsB.build());
                     } else {
-                        logger.error("BandType: " + MeterBandType.OFPMBTEXPERIMENTER + "No Band Data found");
+                        logBandTypeMissing(MeterBandType.OFPMBTEXPERIMENTER);
                     }
                 }
 
             } else {
-                logger.error("Invalid meter band data found.");
+                LOG.error("Invalid meter band data found.");
             }
         }
 
     }
 
+    private static void logBandTypeMissing(final MeterBandType meterBandType) {
+        LOG.error("BandType: {} No Band Data found", meterBandType);
+    }
+
 }