X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsal%2FSalRegistrationManagerTest.java;h=a1df985628363f5e6fae9c932b9f849d619e50da;hb=6e1e20dd97e1c7605cb5c8e619ace7dbb80f4781;hp=120107b547a497acf1392c50d58219ff9b039cf5;hpb=70c266f1eef0a823f29c4ad119a1e8f7e6164507;p=openflowplugin.git diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/SalRegistrationManagerTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/SalRegistrationManagerTest.java index 120107b547..a1df985628 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/SalRegistrationManagerTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/SalRegistrationManagerTest.java @@ -10,6 +10,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; + import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListeningExecutorService; import java.math.BigInteger; @@ -36,6 +37,8 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDist import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDispatchService; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SwitchSessionKeyOF; import org.opendaylight.openflowplugin.openflow.md.core.role.OfEntityManager; +import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager; +import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContextOFImpl; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutput; @@ -101,9 +104,10 @@ public class SalRegistrationManagerTest { Mockito.when(features.getVersion()).thenReturn((short) 1); context.setFeatures(features); context.setNotificationEnqueuer(notificationEnqueuer); + final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager(); - OfEntityManager entManager = new OfEntityManager(entityOwnershipService,getConfig()); - mdSwitchOF13 = new ModelDrivenSwitchImpl(null, null, context); + OfEntityManager entManager = new OfEntityManager(entityOwnershipService,getConfig()); + mdSwitchOF13 = new ModelDrivenSwitchImpl(null, null, context, convertorManager); registration = new AbstractModelDrivenSwitchRegistration(mdSwitchOF13) { @Override protected void removeRegistration() { @@ -119,7 +123,7 @@ public class SalRegistrationManagerTest { messageDispatchService.flowMod(Matchers.any(FlowModInput.class), Matchers.any(SwitchConnectionDistinguisher.class))).thenReturn(Futures.immediateFuture(result)); - salRegistrationManager = new SalRegistrationManager(); + salRegistrationManager = new SalRegistrationManager(convertorManager); salRegistrationManager.setPublishService(notificationProviderService); salRegistrationManager.setDataService(dataBroker); salRegistrationManager.setRpcProviderRegistry(rpcProviderRegistry);