Fixed Group and meter id bugs

[controller.git] / opendaylight / md-sal / forwardingrules-manager / src / main / java / org / opendaylight / controller / forwardingrulesmanager / consumer / impl / MeterConsumerImpl.java

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java
index aa9d572d79724b27031b3aaa31193ec6d9d2577c..42d0897fb11ae85182f6a87e83f3015e191f716c 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/MeterConsumerImpl.java
@@ -242,6 +242,8 @@ public class MeterConsumerImpl implements IForwardingRulesManager {
         if (null != meterKey && validateMeter(meterUpdateDataObject, FRMUtil.operation.UPDATE).isSuccess()) {                UpdateMeterInputBuilder updateMeterInputBuilder = new UpdateMeterInputBuilder();
             updateMeterBuilder = new UpdatedMeterBuilder();
             updateMeterBuilder.fieldsFrom(meterUpdateDataObject);
+            updateMeterBuilder.setMeterId(new MeterId(meterUpdateDataObject.getId()));
+            
             updateMeterInputBuilder.setUpdatedMeter(updateMeterBuilder.build());
             meterService.updateMeter(updateMeterInputBuilder.build());
         } else {
@@ -267,7 +269,7 @@ public class MeterConsumerImpl implements IForwardingRulesManager {
             meterBuilder.setNode(meterRemoveDataObject.getNode());
             meterBuilder.setFlags(meterRemoveDataObject.getFlags());
             meterBuilder.setMeterBandHeaders(meterRemoveDataObject.getMeterBandHeaders());
-            meterBuilder.setMeterId(meterRemoveDataObject.getMeterId());
+            meterBuilder.setMeterId(new MeterId(meterRemoveDataObject.getId()));
             meterBuilder.setNode(meterRemoveDataObject.getNode());        
             meterService.removeMeter(meterBuilder.build());
         } else {