Fixed minor issue in decoding instruction from flow statistics response
[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / MeterConvertor.java
index d770d9a12b822bab9ff86a00cd927245d33d87e8..72b1b20c5e262f1e2f08782b4fca89dcedd8322c 100644 (file)
@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2014 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * 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;
 
 /****
@@ -10,6 +19,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.meter.update.UpdatedMeter;
 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.DscpRemark;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.type.band.type.Experimenter;
@@ -22,9 +32,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.MeterBand;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDropBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDscpRemarkBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDropCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDscpRemarkCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenterCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.drop._case.MeterBandDropBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.dscp.remark._case.MeterBandDscpRemarkBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.experimenter._case.MeterBandExperimenterBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.Bands;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.BandsBuilder;
 import org.slf4j.Logger;
@@ -45,25 +58,25 @@ public final class MeterConvertor {
      *            Data source
      * @return MeterModInput required by OF Library
      */
-    public static MeterModInput toMeterModInput(
+    public static MeterModInputBuilder toMeterModInput(
             org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter source, short version) {
 
         MeterModInputBuilder meterModInputBuilder = new MeterModInputBuilder();
-
-        List<Bands> bands = new ArrayList<Bands>();
-        MeterFlags flags = null;
-        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput)
+        List<Bands> bands = new ArrayList<Bands>();       
+        
+        if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput) {
             meterModInputBuilder.setCommand(MeterModCommand.OFPMCADD);
-        else if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterInput)
+        } else if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterInput) {
             meterModInputBuilder.setCommand(MeterModCommand.OFPMCDELETE);
-        else if (source instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterInput)
+        } else if (source instanceof UpdatedMeter) {
             meterModInputBuilder.setCommand(MeterModCommand.OFPMCMODIFY);
+        }
 
         meterModInputBuilder.setMeterId(new MeterId(source.getMeterId().getValue()));
 
-        if (source.getFlags() != null) {
-            meterModInputBuilder.setFlags(flags = new MeterFlags(source.getFlags().isMeterBurst(), source.getFlags()
-                    .isMeterKbps(), source.getFlags().isMeterPktps(), source.getFlags().isMeterStats()));
+        if (null != source.getFlags()) {
+            meterModInputBuilder.setFlags(new MeterFlags(source.getFlags().isMeterBurst(), source.getFlags()
+                .isMeterKbps(), source.getFlags().isMeterPktps(), source.getFlags().isMeterStats()));
         } else {
 
             /*
@@ -74,17 +87,17 @@ public final class MeterConvertor {
              * seconds.
              */
 
-            meterModInputBuilder.setFlags(flags = new MeterFlags(false, false, true, false));
+            meterModInputBuilder.setFlags(new MeterFlags(false, false, true, false));
         }
         if (source.getMeterBandHeaders() != null) {
             getBandsFromSAL(source.getMeterBandHeaders(), bands);
+            meterModInputBuilder.setBands(bands);
         } else {
             logger.error("For this meter Id" + source.getMeterId().getValue() + ",no associated band data found!");
         }
-
-        meterModInputBuilder.setBands(bands);
+        
         meterModInputBuilder.setVersion(version);
-        return meterModInputBuilder.build();
+        return meterModInputBuilder;
     }
 
     private static void getBandsFromSAL(MeterBandHeaders meterBandHeaders, List<Bands> bands) {
@@ -98,21 +111,21 @@ public final class MeterConvertor {
             meterBandHeader = bandHeadersIterator.next();
             MeterBand meterBandItem = null;
             // The band types :drop,DSCP_Remark or experimenter.
-            if (null != meterBandHeader.getMeterBandTypes() && null != meterBandHeader.getMeterBandTypes().getFlags()) {
+            if (null != meterBandHeader.getMeterBandTypes() && 
+                    null != meterBandHeader.getMeterBandTypes().getFlags()) {
 
                 if (meterBandHeader.getMeterBandTypes().getFlags().isOfpmbtDrop()) {
                     if (meterBandHeader.getBandType() != null) {
+                        MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
                         MeterBandDropBuilder meterBandDropBuilder = new MeterBandDropBuilder();
                         meterBandDropBuilder.setType(MeterBandType.OFPMBTDROP);
-
                         Drop drop = (Drop) meterBandHeader.getBandType();
-
-                        meterBandDropBuilder.setBurstSize(drop.getRate());
-                        meterBandDropBuilder.setRate(drop.getBurstSize());
-                        meterBandItem = meterBandDropBuilder.build();
+                        meterBandDropBuilder.setBurstSize(drop.getDropRate());
+                        meterBandDropBuilder.setRate(drop.getDropBurstSize());
+                        dropCaseBuilder.setMeterBandDrop(meterBandDropBuilder.build());
+                        meterBandItem = dropCaseBuilder.build();
                         bandsB = new BandsBuilder();
-                        bandsB.setMeterBand(meterBandItem).build();
-
+                        bandsB.setMeterBand(meterBandItem);
                         bands.add(bandsB.build()); // Bands list
 
                     } else {
@@ -120,18 +133,17 @@ public final class MeterConvertor {
                     }
                 } else if (meterBandHeader.getMeterBandTypes().getFlags().isOfpmbtDscpRemark()) {
                     if (meterBandHeader.getBandType() != null) {
+                        MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
                         MeterBandDscpRemarkBuilder meterBandDscpRemarkBuilder = new MeterBandDscpRemarkBuilder();
                         meterBandDscpRemarkBuilder.setType(MeterBandType.OFPMBTDSCPREMARK);
-
                         DscpRemark dscpRemark = (DscpRemark) meterBandHeader.getBandType();
-
-                        meterBandDscpRemarkBuilder.setBurstSize(dscpRemark.getBurstSize());
-                        meterBandDscpRemarkBuilder.setRate(dscpRemark.getRate());
+                        meterBandDscpRemarkBuilder.setBurstSize(dscpRemark.getDscpRemarkBurstSize());
+                        meterBandDscpRemarkBuilder.setRate(dscpRemark.getDscpRemarkRate());
                         meterBandDscpRemarkBuilder.setPrecLevel(dscpRemark.getPercLevel());
-                        meterBandItem = meterBandDscpRemarkBuilder.build();
+                        dscpCaseBuilder.setMeterBandDscpRemark(meterBandDscpRemarkBuilder.build());
+                        meterBandItem = dscpCaseBuilder.build();
                         bandsB = new BandsBuilder();
-                        bandsB.setMeterBand(meterBandItem).build();
-
+                        bandsB.setMeterBand(meterBandItem);
                         bands.add(bandsB.build()); // Bands list
 
                     } else {
@@ -139,16 +151,17 @@ public final class MeterConvertor {
                     }
                 } else if (meterBandHeader.getMeterBandTypes().getFlags().isOfpmbtExperimenter()) {
                     if (meterBandHeader.getBandType() != null) {
+                        MeterBandExperimenterCaseBuilder experimenterCaseBuilder = new MeterBandExperimenterCaseBuilder();
                         MeterBandExperimenterBuilder meterBandExperimenterBuilder = new MeterBandExperimenterBuilder();
                         meterBandExperimenterBuilder.setType(MeterBandType.OFPMBTEXPERIMENTER);
                         Experimenter experimenter = (Experimenter) meterBandHeader.getBandType();
-                        meterBandExperimenterBuilder.setBurstSize(experimenter.getBurstSize());
-                        meterBandExperimenterBuilder.setRate(experimenter.getRate());
+                        meterBandExperimenterBuilder.setBurstSize(experimenter.getExperimenterBurstSize());
+                        meterBandExperimenterBuilder.setRate(experimenter.getExperimenterRate());
                         meterBandExperimenterBuilder.setExperimenter(experimenter.getExperimenter());
-                        meterBandItem = meterBandExperimenterBuilder.build();
+                        experimenterCaseBuilder.setMeterBandExperimenter(meterBandExperimenterBuilder.build());
+                        meterBandItem = experimenterCaseBuilder.build();
                         bandsB = new BandsBuilder();
-                        bandsB.setMeterBand(meterBandItem).build();
-
+                        bandsB.setMeterBand(meterBandItem);
                         bands.add(bandsB.build()); // Bands list
 
                     } else {