From 3c91c568583701ee0012a212bb9ded3bfbab3bbf Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 9 Feb 2023 17:44:28 +0100 Subject: [PATCH] Turn NetworkTransactionImpl into a component This is a simple component, which is using RequestProcessor internally, split both out of blueprint. Also, adapt UT consequently to remove usage of RequestProcessor. Change-Id: I0f953793f2319bd8a639c17dcb3cd0a548a032c6 Signed-off-by: Robert Varga Co-authored-by: Gilles Thouenon --- .../network/NetworkTransactionImpl.java | 29 ++++++++++--------- .../OSGI-INF/blueprint/common-blueprint.xml | 10 ------- .../common/catalog/CatalogUtilsTest.java | 4 +-- .../tpce/module/TransportPCEImpl.java | 3 +- .../impl/NbiNotificationsImplTest.java | 4 +-- .../impl/NbiNotificationsProviderTest.java | 4 +-- .../producer/PublisherTest.java | 4 +-- .../networkmodel/util/TpceNetworkTest.java | 3 +- .../pce/PcePathDescriptionTests.java | 3 +- .../pce/PceSendingPceRPCsTest.java | 3 +- .../constraints/PceConstraintsCalcTest.java | 3 +- .../pce/gnpy/GnpyUtilitiesImplTest.java | 3 +- .../transportpce/pce/graph/PceGraphTest.java | 6 ++-- .../pce/impl/PceProviderTest.java | 5 +--- .../pce/impl/PceServiceRPCImplTest.java | 3 +- .../networkanalyzer/PceCalculationTest.java | 11 ++++--- .../tapi/listeners/TapiPceListenerImpl.java | 3 +- .../listeners/TapiRendererListenerImpl.java | 3 +- .../TapiConnectivityImplTest.java | 4 +-- .../tapi/provider/TapiProviderTest.java | 4 +-- .../ConvertORTopoToFullTapiTopoTest.java | 4 +-- .../topology/ConvertORTopoToTapiTopoTest.java | 4 +-- .../tapi/topology/TapiTopologyImplTest.java | 4 +-- 23 files changed, 42 insertions(+), 82 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java index 3f39eb110..42132c96e 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionImpl.java @@ -10,25 +10,28 @@ package org.opendaylight.transportpce.common.network; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; +import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; +@Component +public final class NetworkTransactionImpl implements NetworkTransactionService { + private final RequestProcessor requestProcessor; -public class NetworkTransactionImpl implements NetworkTransactionService { - - RequestProcessor requestProcessor; - - public NetworkTransactionImpl(RequestProcessor requestProcessor) { - this.requestProcessor = requestProcessor; - + @Activate + public NetworkTransactionImpl(@Reference DataBroker dataBroker) { + this.requestProcessor = new RequestProcessor(dataBroker); } - public ListenableFuture> - read(LogicalDatastoreType store, InstanceIdentifier path) { + public ListenableFuture> read(LogicalDatastoreType store, + InstanceIdentifier path) { return requestProcessor.read(store, path); } @@ -62,10 +65,10 @@ public class NetworkTransactionImpl implements NetworkTransactionService { } /* - * (non-Javadoc) - * - * @see org.opendaylight.transportpce.common.network.NetworkTransactionService#getDataBroker() - */ + * (non-Javadoc) + * + * @see org.opendaylight.transportpce.common.network.NetworkTransactionService#getDataBroker() + */ @Override public DataBroker getDataBroker() { return requestProcessor.getDataBroker(); diff --git a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml index 29657ee8e..c30db4214 100644 --- a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml +++ b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml @@ -52,14 +52,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - - - - - - - @@ -87,8 +79,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - diff --git a/common/src/test/java/org/opendaylight/transportpce/common/catalog/CatalogUtilsTest.java b/common/src/test/java/org/opendaylight/transportpce/common/catalog/CatalogUtilsTest.java index 2df102b1b..d7421e8e9 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/catalog/CatalogUtilsTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/catalog/CatalogUtilsTest.java @@ -26,7 +26,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.transportpce.test.converter.DataObjectConverter; import org.opendaylight.transportpce.test.converter.JSONDataObjectConverter; @@ -71,8 +70,7 @@ public class CatalogUtilsTest extends AbstractTest { @Test public void catalogPrimitivesTest() { - RequestProcessor reqProc = new RequestProcessor(getDataBroker()); - NetworkTransactionService netTransServ = new NetworkTransactionImpl(reqProc); + NetworkTransactionService netTransServ = new NetworkTransactionImpl(getDataBroker()); CatalogUtils catalogUtils = new CatalogUtils(netTransServ); assertEquals("Checking retrieval of Operational Mode from Node Type ADD", CatalogConstant.MWWRCORE, diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java index 233b723f8..a888672b2 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java @@ -134,8 +134,7 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP LOG.info("Initializing transaction providers ..."); deviceTransactionManager = new DeviceTransactionManagerImpl(lightyServices.getBindingMountPointService(), MAX_DURATION_TO_SUBMIT_TRANSACTION); - RequestProcessor requestProcessor = new RequestProcessor(lightyServices.getBindingDataBroker()); - networkTransaction = new NetworkTransactionImpl(requestProcessor); + networkTransaction = new NetworkTransactionImpl(lightyServices.getBindingDataBroker()); LOG.info("Creating network-model beans ..."); R2RLinkDiscovery linkDiscoveryImpl = new R2RLinkDiscovery(lightyServices.getBindingDataBroker(), diff --git a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsImplTest.java b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsImplTest.java index bc025c5d0..f9a762403 100644 --- a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsImplTest.java +++ b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsImplTest.java @@ -17,7 +17,6 @@ import org.junit.Test; import org.opendaylight.transportpce.common.converter.JsonStringConverter; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.nbinotifications.utils.NotificationServiceDataUtils; import org.opendaylight.transportpce.nbinotifications.utils.TopicManager; import org.opendaylight.transportpce.test.AbstractTest; @@ -43,8 +42,7 @@ public class NbiNotificationsImplTest extends AbstractTest { @Before public void setUp() throws ExecutionException, InterruptedException { topicManager = TopicManager.getInstance(); - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); JsonStringConverter converter = new JsonStringConverter<>( getDataStoreContextUtil().getBindingDOMCodecServices()); JsonStringConverter converterAlarm = new JsonStringConverter<>( diff --git a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java index 93827286f..81704db36 100644 --- a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java +++ b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/impl/NbiNotificationsProviderTest.java @@ -20,7 +20,6 @@ import org.opendaylight.mdsal.binding.api.NotificationService; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.nbinotifications.listener.NbiNotificationsListenerImpl; import org.opendaylight.transportpce.test.AbstractTest; @@ -41,8 +40,7 @@ public class NbiNotificationsProviderTest extends AbstractTest { @Test public void initTest() { - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); NbiNotificationsProvider provider = new NbiNotificationsProvider( Arrays.asList("topic1", "topic2"), Arrays.asList("topic1", "topic2"), "localhost:8080", "localhost:8080", rpcProviderRegistry, notificationService, diff --git a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/producer/PublisherTest.java b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/producer/PublisherTest.java index 507fb9e04..063b1d54d 100644 --- a/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/producer/PublisherTest.java +++ b/nbinotifications/src/test/java/org/opendaylight/transportpce/nbinotifications/producer/PublisherTest.java @@ -24,7 +24,6 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.transportpce.common.converter.JsonStringConverter; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.nbinotifications.impl.NbiNotificationsImpl; import org.opendaylight.transportpce.nbinotifications.serialization.ConfigConstants; import org.opendaylight.transportpce.nbinotifications.serialization.NotificationAlarmServiceSerializer; @@ -80,8 +79,7 @@ public class PublisherTest extends AbstractTest { publisherAlarm = new Publisher<>("test", mockAlarmProducer); publisherTapiService = new Publisher<>("test", mockTapiProducer); MockitoAnnotations.openMocks(this); - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); topicManager.setTapiConverter(converterTapiService); NotificationServiceDataUtils.createTapiContext(networkTransactionService); nbiNotificationsImpl = new NbiNotificationsImpl(converterService, converterAlarm, converterTapiService, diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java index a7c26139d..667997583 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java @@ -15,7 +15,6 @@ import java.util.concurrent.ExecutionException; import org.junit.Test; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.NetworkTypes1; import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.NetworkTypes1Builder; @@ -30,7 +29,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class TpceNetworkTest extends AbstractTest { - TpceNetwork tpceNetwork = new TpceNetwork(new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))); + TpceNetwork tpceNetwork = new TpceNetwork(new NetworkTransactionImpl(getDataBroker())); @Test public void createLayerClliTest() throws InterruptedException, ExecutionException { diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java index 95a2d0d26..3d7cfd9c9 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java @@ -19,7 +19,6 @@ import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.transportpce.pce.constraints.PceConstraintsCalc; import org.opendaylight.transportpce.pce.networkanalyzer.MapUtils; @@ -93,7 +92,7 @@ public class PcePathDescriptionTests extends AbstractTest { public void mapUtil() { PceConstraints pceConstraintsCalc = new PceConstraintsCalc( PceTestData.getPCERequest(), - new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))) + new NetworkTransactionImpl(getDataBroker())) .getPceHardConstraints(); MapUtils.mapDiversityConstraints(List.of(node), List.of(link), pceConstraintsCalc); MapUtils.getSupLink(link); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java index 047341ac4..863113094 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java @@ -21,7 +21,6 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.gnpy.JerseyServer; import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumer; import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumerImpl; @@ -55,7 +54,7 @@ public class PceSendingPceRPCsTest extends AbstractTest { @Before public void setUp() { this.dataBroker = getNewDataBroker(); - networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.dataBroker)); + networkTransaction = new NetworkTransactionImpl(this.dataBroker); PceTestUtils.writeNetworkInDataStore(this.dataBroker); gnpyConsumer = new GnpyConsumerImpl("http://localhost:9998", "mylogin", "mypassword", getDataStoreContextUtil().getBindingDOMCodecServices()); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java index 543996d77..a3b994c05 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.utils.PceTestData; import org.opendaylight.transportpce.pce.utils.PceTestUtils; import org.opendaylight.transportpce.pce.utils.TransactionUtils; @@ -29,7 +28,7 @@ public class PceConstraintsCalcTest extends AbstractTest { // networkTransactionService = Mockito.mock(NetworkTransactionService.class); PceTestUtils.writeNetworkIntoDataStore(dataBroker, getDataStoreContextUtil(), TransactionUtils.getNetworkForSpanLoss()); - networkTransactionService = new NetworkTransactionImpl(new RequestProcessor(dataBroker)); + networkTransactionService = new NetworkTransactionImpl(dataBroker); } @Test diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java index 4c94f0628..e6bc8d7c3 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java @@ -32,7 +32,6 @@ import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.transportpce.pce.constraints.PceConstraintsCalc; import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumer; @@ -72,7 +71,7 @@ public class GnpyUtilitiesImplTest extends AbstractTest { private GnpyConsumer gnpyConsumer; public GnpyUtilitiesImplTest() throws IOException { - networkTransaction = new NetworkTransactionImpl(new RequestProcessor(getDataBroker())); + networkTransaction = new NetworkTransactionImpl(getDataBroker()); JsonReader networkReader = null; JsonReader topoReader = null; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java index 8c5ec2162..4804eedca 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java @@ -41,7 +41,6 @@ import org.opendaylight.transportpce.common.mapping.PortMappingVersion221; import org.opendaylight.transportpce.common.mapping.PortMappingVersion710; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.transportpce.pce.networkanalyzer.PceCalculation; import org.opendaylight.transportpce.pce.networkanalyzer.PceLink; @@ -126,7 +125,6 @@ public class PceGraphTest extends AbstractTest { private PortMappingVersion221 portMappingVersion22; private PortMappingVersion121 portMappingVersion121; private PortMapping portMapping; - private RequestProcessor reqProc; private NetworkTransactionService netTransServ; // Test of integration for PceGraph @@ -229,8 +227,8 @@ public class PceGraphTest extends AbstractTest { // init PceHardContraints pceHardConstraints = new PceConstraints(); this.rc = new PceResult(); - this.reqProc = new RequestProcessor(dataBroker); - this.netTransServ = new NetworkTransactionImpl(reqProc); + this.netTransServ = new NetworkTransactionImpl(dataBroker); + LOG.info("The value of the mapping is {}", portMapping); } diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java index e840111ca..c3d573542 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceProviderTest.java @@ -17,7 +17,6 @@ import org.mockito.Mockito; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.service.PathComputationService; import org.opendaylight.transportpce.pce.service.PathComputationServiceImpl; import org.opendaylight.transportpce.pce.utils.NotificationPublishServiceMock; @@ -31,7 +30,6 @@ public class PceProviderTest extends AbstractTest { private PathComputationService pathComputationService; private NotificationPublishService notificationPublishService; private NetworkTransactionImpl networkTransaction; - private RequestProcessor requestProcessor; private ObjectRegistration rpcRegistration; private PceProvider pceProvider; @@ -39,8 +37,7 @@ public class PceProviderTest extends AbstractTest { public void setUp() { rpcService = Mockito.mock(RpcProviderService.class); notificationPublishService = new NotificationPublishServiceMock(); - requestProcessor = Mockito.mock(RequestProcessor.class); - networkTransaction = new NetworkTransactionImpl(requestProcessor); + networkTransaction = new NetworkTransactionImpl(getDataBroker()); pathComputationService = new PathComputationServiceImpl(networkTransaction, notificationPublishService, null, null); pceProvider = new PceProvider(rpcService, pathComputationService); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java index 7cb93031d..0ea9d95d8 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java @@ -17,7 +17,6 @@ import org.mockito.Mock; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.service.PathComputationService; import org.opendaylight.transportpce.pce.service.PathComputationServiceImpl; import org.opendaylight.transportpce.pce.utils.NotificationPublishServiceMock; @@ -42,7 +41,7 @@ public class PceServiceRPCImplTest extends AbstractTest { PceTestUtils.writeNetworkIntoDataStore(getDataBroker(), getDataStoreContextUtil(), TransactionUtils.getNetworkForSpanLoss()); notificationPublishService = new NotificationPublishServiceMock(); - networkTransaction = new NetworkTransactionImpl(new RequestProcessor(getDataBroker())); + networkTransaction = new NetworkTransactionImpl(getDataBroker()); pathComputationService = new PathComputationServiceImpl(networkTransaction, notificationPublishService, null, portMapping); pceServiceRPC = new PceServiceRPCImpl(pathComputationService); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java index b1a87bab1..6e5997818 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java @@ -20,7 +20,6 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.constraints.PceConstraintsCalc; import org.opendaylight.transportpce.pce.utils.PceTestData; import org.opendaylight.transportpce.pce.utils.PceTestUtils; @@ -54,7 +53,7 @@ public class PceCalculationTest extends AbstractTest { PceTestUtils.writeNetworkIntoDataStore(getDataBroker(), getDataStoreContextUtil(), TransactionUtils.getNetworkForSpanLoss()); pceConstraintsCalc = new PceConstraintsCalc(PceTestData.getPCERequest(), - new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))); + new NetworkTransactionImpl(getDataBroker())); mapping = new MappingBuilder().setLogicalConnectionPoint("logicalConnectionPoint").setPortQual("xpdr-client") .build(); NodeInfo info = new NodeInfoBuilder().setNodeType(NodeTypes.Xpdr).build(); @@ -67,7 +66,7 @@ public class PceCalculationTest extends AbstractTest { public void testPceCalculationValues() { pceCalculation = new PceCalculation( PceTestData.getPCERequest(), - new NetworkTransactionImpl(new RequestProcessor(getDataBroker())), + new NetworkTransactionImpl(getDataBroker()), pceConstraintsCalc.getPceHardConstraints(), pceConstraintsCalc.getPceSoftConstraints(), pceResult, @@ -84,7 +83,7 @@ public class PceCalculationTest extends AbstractTest { public void testPceCalculationValues2() { pceCalculation = new PceCalculation( PceTestData.getPathComputationRequestInputWithCoRoutingOrGeneral(), - new NetworkTransactionImpl(new RequestProcessor(getDataBroker())), + new NetworkTransactionImpl(getDataBroker()), pceConstraintsCalc.getPceHardConstraints(), pceConstraintsCalc.getPceSoftConstraints(), pceResult, portMapping); @@ -100,10 +99,10 @@ public class PceCalculationTest extends AbstractTest { public void testPceCalculationValues42() { PathComputationRequestInput input = PceTestData.getPathComputationRequestInputWithCoRoutingOrGeneral2(); pceConstraintsCalc = new PceConstraintsCalc(input, - new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))); + new NetworkTransactionImpl(getDataBroker())); pceCalculation = new PceCalculation( PceTestData.getPCE_test3_request_54(), - new NetworkTransactionImpl(new RequestProcessor(getDataBroker())), + new NetworkTransactionImpl(getDataBroker()), pceConstraintsCalc.getPceHardConstraints(), pceConstraintsCalc.getPceSoftConstraints(), pceResult, portMapping); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiPceListenerImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiPceListenerImpl.java index 959b8d6b0..7672f5a93 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiPceListenerImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiPceListenerImpl.java @@ -22,7 +22,6 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.tapi.TapiStringConstants; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.ServicePathRpcResult; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.TransportpcePceListener; @@ -103,7 +102,7 @@ public class TapiPceListenerImpl implements TransportpcePceListener { public TapiPceListenerImpl(DataBroker dataBroker) { this.connectionFullMap = new HashMap<>(); this.dataBroker = dataBroker; - this.networkTransactionService = new NetworkTransactionImpl(new RequestProcessor(this.dataBroker)); + this.networkTransactionService = new NetworkTransactionImpl(this.dataBroker); this.topConnRdmRdm = null; this.topConnXpdrXpdrPhtn = null; this.topConnXpdrXpdrOdu = null; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java index 0080c77c1..327f0f433 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiRendererListenerImpl.java @@ -22,7 +22,6 @@ import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.RendererRpcResultSp; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererListener; import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.PublishTapiNotificationService; @@ -65,7 +64,7 @@ public class TapiRendererListenerImpl implements TransportpceRendererListener { public TapiRendererListenerImpl(DataBroker dataBroker, NotificationPublishService notificationPublishService) { this.dataBroker = dataBroker; - this.networkTransactionService = new NetworkTransactionImpl(new RequestProcessor(this.dataBroker)); + this.networkTransactionService = new NetworkTransactionImpl(this.dataBroker); this.notificationPublishService = notificationPublishService; } diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImplTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImplTest.java index 66b134825..c01c1e153 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImplTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImplTest.java @@ -27,7 +27,6 @@ import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.service.PathComputationService; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerImpl; @@ -117,8 +116,7 @@ public class TapiConnectivityImplTest extends AbstractTest { MockitoAnnotations.openMocks(this); - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); tapilink = new TapiLink(networkTransactionService); serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(getDataStoreContextUtil().getDataBroker()); tapiContext = new TapiContext(networkTransactionService); diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java index 90877fb3e..c571f2af2 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/provider/TapiProviderTest.java @@ -20,7 +20,6 @@ import org.mockito.MockitoAnnotations; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; import org.opendaylight.transportpce.tapi.impl.TapiProvider; import org.opendaylight.transportpce.tapi.listeners.TapiNetworkModelListenerImpl; @@ -86,8 +85,7 @@ public class TapiProviderTest extends AbstractTest { @BeforeClass public static void setUp() { - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); } @Test diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java index bf6919992..dca654dfc 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java @@ -37,7 +37,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.tapi.TapiStringConstants; import org.opendaylight.transportpce.tapi.utils.TapiLink; import org.opendaylight.transportpce.tapi.utils.TapiTopologyDataUtils; @@ -196,8 +195,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest { topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER.getBytes( Charset.forName("UTF-8"))).toString()); - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); tapiLink = new TapiLink(networkTransactionService); LOG.info("TEST SETUP READY"); } diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java index d04e4b38e..ed2e52638 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java @@ -35,7 +35,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.tapi.TapiStringConstants; import org.opendaylight.transportpce.tapi.utils.TapiLink; import org.opendaylight.transportpce.tapi.utils.TapiTopologyDataUtils; @@ -162,8 +161,7 @@ public class ConvertORTopoToTapiTopoTest extends AbstractTest { topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_MULTILAYER.getBytes( Charset.forName("UTF-8"))).toString()); - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); tapiLink = new TapiLink(networkTransactionService); LOG.info("TEST SETUP READY"); } diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java index 8e615cb4b..a78040dc0 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java @@ -32,7 +32,6 @@ import org.junit.Test; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.NetworkTransactionService; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl; import org.opendaylight.transportpce.tapi.TapiStringConstants; @@ -105,8 +104,7 @@ public class TapiTopologyImplTest extends AbstractTest { TapiTopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil(), TapiTopologyDataUtils.PORTMAPPING_FILE); - networkTransactionService = new NetworkTransactionImpl( - new RequestProcessor(getDataStoreContextUtil().getDataBroker())); + networkTransactionService = new NetworkTransactionImpl(getDataBroker()); tapiLink = new TapiLink(networkTransactionService); serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(getDataStoreContextUtil().getDataBroker()); tapiContext = new TapiContext(networkTransactionService); -- 2.36.6