X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fforwardingrules-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fforwardingrulesmanager%2Fconsumer%2Fimpl%2FMeterConsumerImpl.java;fp=opendaylight%2Fmd-sal%2Fforwardingrules-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fforwardingrulesmanager%2Fconsumer%2Fimpl%2FMeterConsumerImpl.java;h=42d0897fb11ae85182f6a87e83f3015e191f716c;hp=aa9d572d79724b27031b3aaa31193ec6d9d2577c;hb=18d8f268c059c3ec15672a3359ef667460c874dc;hpb=d245dda0d7f6e14891af8a3a8f44d20939e00ee4 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 aa9d572d79..42d0897fb1 100644 --- 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 {