Bug 5540 - MeterConvertor

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / MeterService.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/MeterService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/MeterService.java
index 73cf63f4ec0b3f0daa924f3b87aeb059b69b5233..94009f06710c4896d483b640e9f21fa801028515 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/MeterService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/MeterService.java
@@ -7,10 +7,13 @@
  */
 package org.opendaylight.openflowplugin.impl.services;
 
+import java.util.Optional;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
 import org.opendaylight.openflowplugin.api.openflow.device.Xid;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.MeterConvertor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
@@ -24,8 +27,12 @@ final class MeterService<I extends Meter, O extends DataObject> extends Abstract
 
     @Override
     protected OfHeader buildRequest(final Xid xid, final I input) {
-        final MeterModInputBuilder ofMeterModInput = MeterConvertor.toMeterModInput(input, getVersion());
-        ofMeterModInput.setXid(xid.getValue());
-        return ofMeterModInput.build();
+        final VersionConvertorData data = new VersionConvertorData(getVersion());
+        final Optional<MeterModInputBuilder> ofMeterModInput = ConvertorManager.getInstance().convert(input, data);
+        final MeterModInputBuilder meterModInputBuilder = ofMeterModInput
+                .orElse(MeterConvertor.defaultResult(getVersion()));
+
+        meterModInputBuilder.setXid(xid.getValue());
+        return meterModInputBuilder.build();
     }
-}
+}
\ No newline at end of file