From 01496e26615d33be24a427e0f4d12a161acbe064 Mon Sep 17 00:00:00 2001 From: manuedelf Date: Tue, 15 Sep 2020 16:31:11 +0200 Subject: [PATCH] Migrate to Al and reactivate some Junit tests - Use of BindingDOMCodecServices in DataStoreContext - remove @Ignore decorator and fix unit tests when needed This commit reintroduces the import of mdsal.binding.dom.codec.impl .BindingCodecContext in common/src/main/[..]/DataStoreContextImpl.java. This dependency was preventing karaf from starting up correctly and was removed previously in commit 243c08d8b7ad90b0cbaec76a33a639d6fa96f5c8 Since DataStoreContext is no more used outside of the test scope, common/src/main/[..]/DataStoreContext.java and friends have been moved into test-common before reintroducing this import. They are now only used in test scope / build time. This way, the karaf start-up problem is avoided. JIRA: TRNSPRTPCE-305 Change-Id: I246a9d58879be047c470f8a683993bc81d3a54a3 Signed-off-by: guillaume.lambert --- common/pom.xml | 1 - .../crossconnect/CrossConnectImpl121Test.java | 2 +- .../common/mapping/MappingUtilsImplTest.java | 4 +- .../common/mapping/PortMappingImplTest.java | 2 - .../mapping/PortMappingVersion121Test.java | 2 - .../common/test/TransportPCETest.java | 2 - .../olm/service/OlmPowerServiceImplTest.java | 5 - .../pce/PceSendingPceRPCsTest.java | 19 +- .../constraints/PceConstraintsCalcTest.java | 4 +- .../pce/gnpy/GnpyUtilitiesImplTest.java | 24 ++- .../ServiceDataStoreOperationsImplTest.java | 10 +- .../pce/graph/PceGraphEdgeTest.java | 2 - .../transportpce/pce/graph/PceGraphTest.java | 2 - .../transportpce/pce/utils/JsonUtil.java | 26 ++- .../service/RendererServiceWrapperTest.java | 2 +- tapi/pom.xml | 7 +- .../tapi/topology/TapiTopologyImplTest.java | 163 ++++++++++-------- .../tapi/utils/TopologyDataUtils.java | 3 +- .../test/DataStoreContextImpl.java | 139 ++++----------- .../transportpce/test/DeviceWrapper.java | 5 +- 20 files changed, 188 insertions(+), 236 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index c40b83ea8..5bf506c6b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -80,5 +80,4 @@ test - diff --git a/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121Test.java b/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121Test.java index 6aefb288b..ceed11266 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121Test.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121Test.java @@ -76,7 +76,7 @@ public class CrossConnectImpl121Test { Mockito.when(rwTransactionMock.commit()).thenReturn(FluentFutures.immediateNullFluentFuture()); deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointServiceMock, 3000); crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager); - Optional res = crossConnectImpl121.postCrossConnect("deviceId", 100L, "srcTp", "destTp"); + Optional res = crossConnectImpl121.postCrossConnect("deviceId", 100L, "srcTp", "destTp"); Assert.assertEquals(res.get(), "srcTp-destTp-100"); } diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java index 878b5c93e..398575c1b 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertNull; import java.util.concurrent.ExecutionException; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; @@ -29,13 +28,12 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmappi import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -@Ignore public class MappingUtilsImplTest { private DataBroker dataBroker = null; @Before - public void setUp() throws Exception { + public void setUp() { DataStoreContext dataStoreContext = new DataStoreContextImpl(); dataBroker = dataStoreContext.getDataBroker(); } diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java index 0853b6b93..f6c4bce5b 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java @@ -20,7 +20,6 @@ import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEV import java.util.concurrent.ExecutionException; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; @@ -38,7 +37,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmappi import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -@Ignore public class PortMappingImplTest { DataBroker dataBroker = null; diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java index cba2e6ef2..865e49a50 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java @@ -27,7 +27,6 @@ import java.util.Random; import java.util.concurrent.ExecutionException; import org.eclipse.jdt.annotation.NonNull; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; @@ -97,7 +96,6 @@ import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Ignore public class PortMappingVersion121Test { private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion121Test.class); diff --git a/common/src/test/java/org/opendaylight/transportpce/common/test/TransportPCETest.java b/common/src/test/java/org/opendaylight/transportpce/common/test/TransportPCETest.java index ee2f9e7a8..b6b837a4d 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/test/TransportPCETest.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/test/TransportPCETest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.transportpce.common.test; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,7 +15,6 @@ public class TransportPCETest { private static final Logger LOG = LoggerFactory.getLogger(TransportPCETest.class); - @Ignore @Test public void test() { LOG.info("test"); diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java index c4b7c254a..73842a31c 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java @@ -195,7 +195,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { Assert.assertEquals("Failed", output.getResult()); } - @Ignore @Test public void testCalculateSpanlossBase3() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); @@ -220,7 +219,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { } - @Ignore @Test public void testCalculateSpanlossBase4() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); @@ -241,7 +239,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { } - @Ignore @Test public void testCalculateSpanlossBase5() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); @@ -288,7 +285,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { Assert.assertEquals(null, output); } - @Ignore @Test public void testServicePowerReset() { ServicePowerResetInput input = OlmPowerServiceRpcImplUtil.getServicePowerResetInput(); @@ -296,7 +292,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { Assert.assertEquals(null, output); } - @Ignore @Test public void testServicePowerTurndownSuccessResult() { ServicePowerTurndownInput servicePowerTurndownInput = OlmPowerServiceRpcImplUtil.getServicePowerTurndownInput(); 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 82afbdb13..35356fee8 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java @@ -12,7 +12,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.opendaylight.mdsal.binding.api.DataBroker; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.pce.gnpy.ConnectToGnpyServer; @@ -20,16 +23,18 @@ import org.opendaylight.transportpce.pce.gnpy.JerseyServer; import org.opendaylight.transportpce.pce.utils.PceTestData; import org.opendaylight.transportpce.pce.utils.PceTestUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.transportpce.test.DataStoreContext; +import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; @Ignore -//@RunWith(MockitoJUnitRunner.class) +@RunWith(MockitoJUnitRunner.class) public class PceSendingPceRPCsTest extends AbstractTest { private PceSendingPceRPCs pceSendingPceRPCs; private NetworkTransactionImpl networkTransaction; - private DataStoreContext dataStoreContext = this.getDataStoreContextUtil(); - private DataBroker dataBroker = this.getDataBroker(); + @Mock + private YangParserFactory yangParserFactory; + @Mock + private BindingDOMCodecServices bindingDOMCodecServices; private JerseyServer jerseyServer = new JerseyServer(); @@ -37,8 +42,8 @@ public class PceSendingPceRPCsTest extends AbstractTest { public void setUp() { networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())); PceTestUtils.writeNetworkInDataStore(this.getDataBroker()); - pceSendingPceRPCs = - new PceSendingPceRPCs(PceTestData.getPCE_test1_request_54(), networkTransaction, null); + pceSendingPceRPCs = new PceSendingPceRPCs(PceTestData.getPCE_test1_request_54(), + networkTransaction, bindingDOMCodecServices); } @Test 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 44b271604..8adffb2ce 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 @@ -19,13 +19,11 @@ import org.opendaylight.transportpce.pce.utils.PceTestData; import org.opendaylight.transportpce.pce.utils.PceTestUtils; import org.opendaylight.transportpce.pce.utils.TransactionUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.transportpce.test.DataStoreContext; @Ignore public class PceConstraintsCalcTest extends AbstractTest { - private static PceConstraintsCalc pceConstraintsCalc = null; + private static PceConstraintsCalc pceConstraintsCalc; private static NetworkTransactionService networkTransactionService = null; - private DataStoreContext dataStoreContext = this.getDataStoreContextUtil(); private DataBroker dataBroker = this.getDataBroker(); @Before 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 bab81ffd3..1fa9b6664 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 @@ -42,6 +42,9 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZ; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ztoa.direction.ZToA; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ztoa.direction.ZToABuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ztoa.direction.ZToAKey; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.pce.resource.Resource; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.pce.resource.ResourceBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.pce.resource.resource.resource.TerminationPoint; @@ -76,13 +79,13 @@ public class GnpyUtilitiesImplTest extends AbstractTest { networkReader = new JsonReader(gnpyNetwork); Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); - saveOpenRoadmNetwork(networks.getNetwork().get(0), NetworkUtils.UNDERLAY_NETWORK_ID); + saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.UNDERLAY_NETWORK_ID); // load openroadm-topology Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json"); topoReader = new JsonReader(gnpyTopo); networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); - saveOpenRoadmNetwork(networks.getNetwork().get(0), NetworkUtils.OVERLAY_NETWORK_ID); + saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.OVERLAY_NETWORK_ID); } catch (FileNotFoundException | InterruptedException | ExecutionException e) { LOG.error("Cannot init test ", e); fail("Cannot init test "); @@ -126,7 +129,8 @@ public class GnpyUtilitiesImplTest extends AbstractTest { @Test public void askNewPathFromGnpyNullResultTest() throws Exception { gnpyUtilitiesImpl = new GnpyUtilitiesImpl(networkTransaction, - PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"), null); + PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"), + JsonUtil.getInstance().getBindingDOMCodecServices()); assertNull("No hard constraints should be available", gnpyUtilitiesImpl.askNewPathFromGnpy(null)); } @@ -134,7 +138,8 @@ public class GnpyUtilitiesImplTest extends AbstractTest { @Test public void askNewPathFromGnpyTest() throws Exception { gnpyUtilitiesImpl = new GnpyUtilitiesImpl(networkTransaction, - PceTestData.getGnpyPCERequest("XPONDER-3", "XPONDER-4"), null); + PceTestData.getGnpyPCERequest("XPONDER-3", "XPONDER-4"), + JsonUtil.getInstance().getBindingDOMCodecServices()); PceConstraintsCalc constraints = new PceConstraintsCalc(PceTestData.getPCE_simpletopology_test1_request(), networkTransaction); PceConstraints pceHardConstraints = constraints.getPceHardConstraints(); @@ -151,7 +156,8 @@ public class GnpyUtilitiesImplTest extends AbstractTest { ZToADirectionBuilder ztoADirectionBldr = buildZtoA(); gnpyUtilitiesImpl = new GnpyUtilitiesImpl(networkTransaction, - PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"), null); + PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"), + JsonUtil.getInstance().getBindingDOMCodecServices()); PceConstraintsCalc constraints = new PceConstraintsCalc(PceTestData.getPCE_simpletopology_test1_request(), networkTransaction); PceConstraints pceHardConstraints = constraints.getPceHardConstraints(); @@ -177,9 +183,15 @@ public class GnpyUtilitiesImplTest extends AbstractTest { } private ZToADirectionBuilder buildZtoA() { + ZToAKey clientKey = new ZToAKey("key"); + TerminationPoint stp = new TerminationPointBuilder() + .setTpId("tpName").setTpNodeId("xname") + .build(); + Resource clientResource = new ResourceBuilder().setResource(stp).build(); + ZToA firstResource = new ZToABuilder().setId("tpName").withKey(clientKey).setResource(clientResource).build(); return new ZToADirectionBuilder() .setRate(Uint32.valueOf(100)) - .setZToA(Map.of()) + .setZToA(Map.of(firstResource.key(),firstResource)) .setZToAWavelengthNumber(Uint32.valueOf(0)); } diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImplTest.java index 64a5c7283..2275bba0f 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImplTest.java @@ -12,20 +12,18 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; +import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; @Ignore public class ServiceDataStoreOperationsImplTest extends AbstractTest { - ServiceDataStoreOperationsImpl serviceDataStoreOperations; - NetworkTransactionImpl networkTransaction = Mockito.mock(NetworkTransactionImpl.class); - OrgOpenroadmDevice orgOpenroadmDevice = Mockito.mock(OrgOpenroadmDevice.class); + private ServiceDataStoreOperationsImpl serviceDataStoreOperations; + private BindingDOMCodecServices bindingDOMCodecServices = Mockito.mock(BindingDOMCodecServices.class); @Before public void setUp() throws GnpyException { - serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(null); + serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(bindingDOMCodecServices); } @Test diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java index cf82d0ae0..097644acd 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.pce.graph; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.opendaylight.transportpce.pce.networkanalyzer.PceLink; import org.opendaylight.transportpce.pce.networkanalyzer.PceOpticalNode; @@ -21,7 +20,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; -@Ignore public class PceGraphEdgeTest { private Link link = 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 ea8cb4a4f..3776e404f 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 @@ -12,7 +12,6 @@ import java.util.Map; import java.util.Optional; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.transportpce.pce.networkanalyzer.PceLink; @@ -31,7 +30,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; -@Ignore public class PceGraphTest { private Link link = null; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java index 9ac12d85b..f53a3ad97 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.ServiceLoader; import org.opendaylight.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; +import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier; import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,9 +36,8 @@ public final class JsonUtil { private static final Logger LOG = LoggerFactory.getLogger(JsonUtil.class); private static JsonUtil instance; - private SchemaContext schemaCtx; - - private BindingNormalizedNodeSerializer codecRegistry; + private EffectiveModelContext schemaCtx; + private BindingDOMCodecServices bindingDOMCodecServices; private JsonUtil() { List moduleInfos = new LinkedList<>(); @@ -48,13 +47,8 @@ public final class JsonUtil { } /* Create the schema context for loaded models */ this.schemaCtx = BindingRuntimeHelpers.createEffectiveModel(moduleInfos); - if (schemaCtx == null) { - throw new IllegalStateException("Failed to load schema context"); - } - // Create the binding binding normalized node codec registry - BindingRuntimeContext bindingContext = - BindingRuntimeHelpers.createRuntimeContext(); - this.codecRegistry = new BindingCodecContext(bindingContext); + BindingRuntimeContext bindingContext = BindingRuntimeHelpers.createRuntimeContext(); + bindingDOMCodecServices = new BindingCodecContext(bindingContext); } public static JsonUtil getInstance() { @@ -71,8 +65,8 @@ public final class JsonUtil { JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx), schemaCtx);) { jsonParser.parse(reader); YangInstanceIdentifier yangId = YangInstanceIdentifier.of(pathQname); - if (codecRegistry.fromNormalizedNode(yangId, result.getResult()) != null) { - return codecRegistry.fromNormalizedNode(yangId, result.getResult()).getValue(); + if (bindingDOMCodecServices.fromNormalizedNode(yangId, result.getResult()) != null) { + return bindingDOMCodecServices.fromNormalizedNode(yangId, result.getResult()).getValue(); } else { return null; } @@ -82,4 +76,8 @@ public final class JsonUtil { } } + + public BindingDOMCodecServices getBindingDOMCodecServices() { + return bindingDOMCodecServices; + } } diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java index bf7b952e2..0debec86f 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java @@ -37,13 +37,13 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.Service import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteInput; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceDeleteInputBuilder; +@Ignore /** * Test RendererServiceWrapper class. * * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange * */ -@Ignore public class RendererServiceWrapperTest extends AbstractTest { @Mock private RendererServiceOperations rendererServiceOperationsMock; diff --git a/tapi/pom.xml b/tapi/pom.xml index 611fa86e8..704cd185d 100644 --- a/tapi/pom.xml +++ b/tapi/pom.xml @@ -107,7 +107,12 @@ Author: Martial Coulibaly on behalf of Orange mockito-core test - + + com.google.code.findbugs + jsr305 + 3.0.2 + test + 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 3fdad4da7..42255eb68 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 @@ -19,6 +19,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.CountDownLatch; @@ -26,15 +27,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.tapi.utils.TopologyDataUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.transportpce.test.DataStoreContext; -import org.opendaylight.transportpce.test.DataStoreContextImpl; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.AdministrativeState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.CapacityUnit; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.ForwardingDirection; @@ -46,6 +45,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Port import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationDirection; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E; @@ -60,6 +60,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.ge import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.NodeRuleGroup; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePoint; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.Rule; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -74,25 +75,23 @@ public class TapiTopologyImplTest extends AbstractTest { private static ListeningExecutorService executorService; private static CountDownLatch endSignal; private static final int NUM_THREADS = 3; - private static DataStoreContext dataStoreContextUtil; - @BeforeClass - public static void setUp() throws InterruptedException { + @Before + public void setUp() throws InterruptedException { executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS)); endSignal = new CountDownLatch(1); - dataStoreContextUtil = new DataStoreContextImpl(); - TopologyDataUtils.writeTopologyFromFileToDatastore(dataStoreContextUtil, + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), TopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); - TopologyDataUtils.writeTopologyFromFileToDatastore(dataStoreContextUtil, + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), TopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); - TopologyDataUtils.writePortmappingFromFileToDatastore(dataStoreContextUtil); + TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil()); LOG.info("setup done"); } @Test public void getTopologyDetailsForOpenroadmTopologyWhenSuccessful() throws ExecutionException, InterruptedException { GetTopologyDetailsInput input = TopologyDataUtils.buildGetTopologyDetailsInput(NetworkUtils.OVERLAY_NETWORK_ID); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(dataStoreContextUtil.getDataBroker()); + TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker()); ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); result.addListener(new Runnable() { @Override @@ -106,24 +105,29 @@ public class TapiTopologyImplTest extends AbstractTest { Topology topology = rpcResult.getResult().getTopology(); assertNotNull("Topology should not be null", topology); assertEquals("Nodes list size should be 1", 1, topology.getNode().size()); + List topologyNodeList = new ArrayList<>(topology.nonnullNode().values()); + List nodeList = new ArrayList<>(topologyNodeList); + List nameList = new ArrayList<>(nodeList.get(0).nonnullName().values()); assertEquals("Node name should be TAPI Ethernet Node", - "TAPI Ethernet Node", topology.getNode().get(0).getName().get(0).getValue()); + "TAPI Ethernet Node", nameList.get(0).getValue()); Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes("Ethernet Topology".getBytes()).toString()); Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes("TAPI Ethernet Node".getBytes()).toString()); assertEquals("incorrect topology uuid", topoUuid, topology.getUuid()); - assertEquals("incorrect node uuid", nodeUuid, topology.getNode().get(0).getUuid()); + assertEquals("incorrect node uuid", nodeUuid, topologyNodeList.get(0).getUuid()); Uuid onep1Uuid = new Uuid(UUID.nameUUIDFromBytes("OwnedNodeEdgePoint 0".getBytes()).toString()); Uuid onep2Uuid = new Uuid(UUID.nameUUIDFromBytes("OwnedNodeEdgePoint 1".getBytes()).toString()); + List edgePointList = new ArrayList<>(topologyNodeList.get(0) + .nonnullOwnedNodeEdgePoint().values()); assertEquals("incorrect uuid for nep1", - onep1Uuid, topology.getNode().get(0).getOwnedNodeEdgePoint().get(1).getUuid()); + onep1Uuid, edgePointList.get(1).getUuid()); assertEquals("incorrect uuid for nep1", - onep2Uuid, topology.getNode().get(0).getOwnedNodeEdgePoint().get(0).getUuid()); + onep2Uuid, edgePointList.get(0).getUuid()); } @Test public void getTopologyDetailsForOtnTopologyWhenSuccessful() throws ExecutionException, InterruptedException { GetTopologyDetailsInput input = TopologyDataUtils.buildGetTopologyDetailsInput(NetworkUtils.OTN_NETWORK_ID); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(dataStoreContextUtil.getDataBroker()); + TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker()); ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); result.addListener(new Runnable() { @Override @@ -142,9 +146,9 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("incorrect topology uuid", topoUuid, topology.getUuid()); assertEquals("topology name should be T0 - Multi-layer topology", "T0 - Multi-layer topology", - topology.getName().get(0).getValue()); + topology.nonnullName().values().stream().findFirst().get().getValue()); - List nodes = topology.getNode().values().stream() + List nodes = topology.nonnullNode().values().stream() .sorted((n1,n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) @@ -160,7 +164,7 @@ public class TapiTopologyImplTest extends AbstractTest { .toString()); checkOtsiNode(nodes.get(3), node4Uuid, true); - List links = topology.getLink().values().stream() + List links = topology.nonnullLink().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); checkTransitionalLink(links.get(0), topoUuid, node1Uuid, node3Uuid, "DSR+XPDR1-NETWORK1", @@ -176,12 +180,12 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); assertEquals("value-name should be 'dsr/odu node name'", - "dsr/odu node name", node.getName().get(0).getValueName()); + "dsr/odu node name", node.nonnullName().values().stream().findFirst().get().getValueName()); assertEquals("dsr node should manage 2 protocol layers : dsr and odu", 2, node.getLayerProtocolName().size()); assertThat("dsr node should manage 2 protocol layers : dsr and odu", node.getLayerProtocolName(), hasItems(LayerProtocolName.DSR, LayerProtocolName.ODU)); - List neps = node.getOwnedNodeEdgePoint().values().stream() + List neps = node.nonnullOwnedNodeEdgePoint().values().stream() .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); if (isSwitch) { @@ -194,7 +198,7 @@ public class TapiTopologyImplTest extends AbstractTest { Uuid networkNepUuid = new Uuid( UUID.nameUUIDFromBytes("DSR+XPDR2-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); checkNepNetworkODU4(nep2, networkNepUuid, "XPDR2-NETWORK1", "NodeEdgePoint_N1"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForSwitchDSR(nrgList, client4NepUuid, networkNepUuid, nodeUuid); @@ -209,7 +213,7 @@ public class TapiTopologyImplTest extends AbstractTest { Uuid networkNepUuid = new Uuid( UUID.nameUUIDFromBytes("DSR+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); checkNepNetworkODU4(nep2, networkNepUuid, "XPDR1-NETWORK1", "NodeEdgePoint_N1"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForMuxDSR(nrgList, client4NepUuid, networkNepUuid, nodeUuid); @@ -223,12 +227,12 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); assertEquals("value-name should be 'dsr/odu node name'", - "otsi node name", node.getName().get(0).getValueName()); + "otsi node name", node.nonnullName().values().stream().findFirst().get().getValueName()); assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", 1, node.getLayerProtocolName().size()); assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", LayerProtocolName.PHOTONICMEDIA, node.getLayerProtocolName().get(0)); - List neps = node.getOwnedNodeEdgePoint().values().stream() + List neps = node.nonnullOwnedNodeEdgePoint().values().stream() .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); if (isSwitch) { @@ -241,7 +245,7 @@ public class TapiTopologyImplTest extends AbstractTest { Uuid enepUuid = new Uuid( UUID.nameUUIDFromBytes("eOTSi+XPDR2-NETWORK2".getBytes(Charset.forName("UTF-8"))).toString()); checkNepOtsiNode(nep2, enepUuid, "XPDR2-NETWORK2", "eNodeEdgePoint_2"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForSwitchOTSi(nrgList, enepUuid, inepUuid, nodeUuid); @@ -255,7 +259,7 @@ public class TapiTopologyImplTest extends AbstractTest { Uuid inepUuid = new Uuid( UUID.nameUUIDFromBytes("iOTSi+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); checkNepOtsiNode(nep2, inepUuid, "XPDR1-NETWORK1", "iNodeEdgePoint_1"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForMuxOTSi(nrgList, enepUuid, inepUuid, nodeUuid); @@ -264,10 +268,12 @@ public class TapiTopologyImplTest extends AbstractTest { private void checkNepClient10G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); + Name name = nameList.get(0); assertEquals("value of client nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, name.getValue()); assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, name.getValueName()); assertEquals("Client nep should support 2 kind of cep", 2, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("client nep should support 2 kind of cep", @@ -279,10 +285,12 @@ public class TapiTopologyImplTest extends AbstractTest { private void checkNepNetworkODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); + Name name = nameList.get(0); assertEquals("value of network nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, name.getValue()); assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, name.getValueName()); assertEquals("Network nep should support 1 kind of cep", 1, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("network nep should support 1 kind of cep", @@ -299,30 +307,32 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("each node-rule-group should contain 2 NEP for muxponder DSR", 2, nodeRuleGroup.getNodeEdgePoint().size()); } + List nodeEdgePointList = new ArrayList<>(nrgList.get(0).nonnullNodeEdgePoint().values()); assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeUuid(), nodeUuid); + nodeEdgePointList.get(0).getNodeUuid(), nodeUuid); assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 2 should contain a single rule", 1, nrgList.get(1).getRule().size()); + nodeEdgePointList.get(1).getNodeUuid(), nodeUuid); + List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); + assertEquals("node-rule-group nb 2 should contain a single rule", 1, rule.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(1).getRule().get(0).getLocalId()); + "forward", rule.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(1).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(1).getRule().get(0).getRuleType()); + RuleType.FORWARDING, rule.get(0).getRuleType()); } private void checkNodeRuleGroupForSwitchDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) { assertEquals("Switch-DSR should contain a single node rule group", 1, nrgList.size()); assertEquals("Switch-DSR node-rule-group should contain 8 NEP", 8, nrgList.get(0).getNodeEdgePoint().size()); - List nrg = nrgList.get(0).getNodeEdgePoint().values().stream() + List nrg = nrgList.get(0).nonnullNodeEdgePoint().values().stream() .sorted((nrg1, nrg2) -> nrg1.getNodeEdgePointUuid().getValue() .compareTo(nrg2.getNodeEdgePointUuid().getValue())) .collect(Collectors.toList()); @@ -334,36 +344,40 @@ public class TapiTopologyImplTest extends AbstractTest { nodeUuid, nrg.get(1).getNodeUuid()); assertEquals("any item of the node-rule-group should have the same nodeUuid", nodeUuid, nrg.get(5).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); + @Nullable + List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); + assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); + "forward", ruleList.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); + RuleType.FORWARDING, ruleList.get(0).getRuleType()); } private void checkNodeRuleGroupForMuxOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, Uuid nodeUuid) { assertEquals("Mux-OTSi should contain a single node rule group", 1, nrgList.size()); - assertEquals("Mux-OTSi node-rule-group should contain 2 NEP", 2, nrgList.get(0).getNodeEdgePoint().size()); + List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); + assertEquals("Mux-OTSi node-rule-group should contain 2 NEP", 2, nodeEdgePointList.size()); assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", - nrgList.get(0).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", - nrgList.get(0).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(0).getNodeUuid()); + nodeUuid, nodeEdgePointList.get(0).getNodeUuid()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(1).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); + nodeUuid, nodeEdgePointList.get(1).getNodeUuid()); + List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); + assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); + "forward", ruleList.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); + RuleType.FORWARDING, ruleList.get(0).getRuleType()); } private void checkNodeRuleGroupForSwitchOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, @@ -373,31 +387,35 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("each node-rule-group should contain 2 NEP for Switch-OTSi", 2, nodeRuleGroup.getNodeEdgePoint().size()); } + List nodeEdgePointList1 = new ArrayList<>(nrgList.get(3).nonnullNodeEdgePoint().values()); assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList1.get(0).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList1.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); + List nodeEdgePointList0 = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(0).getNodeUuid()); + nodeUuid, nodeEdgePointList0.get(0).getNodeUuid()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(1).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); + nodeUuid, nodeEdgePointList0.get(1).getNodeUuid()); + List ruleList0 = new ArrayList<>(nrgList.get(0).nonnullRule().values()); + assertEquals("node-rule-group should contain a single rule", 1, ruleList0.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); + "forward", ruleList0.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, ruleList0.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); + RuleType.FORWARDING, ruleList0.get(0).getRuleType()); } private void checkNepClient100G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); assertEquals("value of client nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, nameList.get(0).getValue()); assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, nameList.get(0).getValueName()); assertEquals("Client nep should support 2 kind of cep", 2, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("client nep should support 2 kind of cep", @@ -409,10 +427,11 @@ public class TapiTopologyImplTest extends AbstractTest { private void checkNepOtsiNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); assertEquals("value of OTSi nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, nameList.get(0).getValue()); assertEquals("value-name of OTSi nep should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, nameList.get(0).getValueName()); assertEquals("OTSi nep should support 2 kind of cep", 2, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("OTSi nep should support 2 kind of cep", @@ -457,23 +476,25 @@ public class TapiTopologyImplTest extends AbstractTest { hasItems(LayerProtocolName.ODU.getName(), LayerProtocolName.PHOTONICMEDIA.getName())); assertEquals("transitional link should be BIDIRECTIONAL", ForwardingDirection.BIDIRECTIONAL, link.getDirection()); + List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); assertEquals("topology uuid should be the same for the two termination point of the link", - topoUuid, link.getNodeEdgePoint().get(0).getTopologyUuid()); + topoUuid, nodeEdgePointList.get(0).getTopologyUuid()); assertEquals("topology uuid should be the same for the two termination point of the link", - topoUuid, link.getNodeEdgePoint().get(1).getTopologyUuid()); + topoUuid, nodeEdgePointList.get(1).getTopologyUuid()); assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(0).getNodeUuid().getValue(), + nodeEdgePointList.get(0).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(1).getNodeUuid().getValue(), + nodeEdgePointList.get(1).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); Uuid nep1Uuid = new Uuid(UUID.nameUUIDFromBytes(tp1.getBytes(Charset.forName("UTF-8"))).toString()); Uuid nep2Uuid = new Uuid(UUID.nameUUIDFromBytes(tp2.getBytes(Charset.forName("UTF-8"))).toString()); assertThat("transitional links should terminate on " + tp1 + " and " + tp2 + " neps", - link.getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); } } diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java index dbc82005c..fac97ffd9 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java @@ -70,7 +70,8 @@ public final class TopologyDataUtils { } else { LOG.error("xml file {} not found at {}", topoFile.getName(), topoFile.getAbsolutePath()); } - writeTransaction(dataStoreContextUtil.getDataBroker(), ii, networks.getNetwork().get(0)); + writeTransaction(dataStoreContextUtil.getDataBroker(), ii, + networks.nonnullNetwork().values().stream().findFirst().get()); LOG.info("extraction from {} stored with success in datastore", topoFile.getName()); } diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java index 0ae99c5eb..42719c8b3 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java @@ -7,123 +7,110 @@ */ package org.opendaylight.transportpce.test; -import com.google.common.collect.ClassToInstanceMap; -import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.ServiceLoader; import java.util.concurrent.Executors; -import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.NotificationService; -import org.opendaylight.mdsal.binding.dom.adapter.AdapterContext; -import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter; -import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationPublishServiceAdapter; -import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationServiceAdapter; +import org.opendaylight.mdsal.binding.dom.adapter.BindingAdapterFactory; import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; +import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; +import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; -import org.opendaylight.mdsal.dom.api.DOMSchemaService; -import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension; import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter; import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker; +import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService; import org.opendaylight.mdsal.dom.spi.store.DOMStore; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.util.ListenerRegistry; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory; import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class DataStoreContextImpl implements DataStoreContext { - private static final Logger LOG = LoggerFactory.getLogger(DataStoreContextImpl.class); - private final Map datastores; - private final SchemaContextHolder mockedSchemaContext; private final DOMNotificationRouter domNotificationRouter; private final DOMDataBroker domDataBroker; private final DataBroker dataBroker; private final NotificationService notificationService; private final NotificationPublishService notificationPublishService; + private EffectiveModelContext schemaCtx; + private BindingDOMCodecServices bindingDOMCodecServices; + private BindingAdapterFactory adapterFactory ; public DataStoreContextImpl() { - this.mockedSchemaContext = new SchemaContextHolder(); - this.datastores = createDatastores(); - this.domNotificationRouter = DOMNotificationRouter.create(16); - this.domDataBroker = createDOMDataBroker(); - this.dataBroker = createDataBroker(); - this.notificationService = createNotificationService(); - this.notificationPublishService = createNotificationPublishService(); - this.mockedSchemaContext.listeners.streamListeners() - .forEach(l -> l.onModelContextUpdated(this.mockedSchemaContext.schemaContext)); + List moduleInfos = new LinkedList<>(); + ServiceLoader yangProviderLoader = ServiceLoader.load(YangModelBindingProvider.class); + for (YangModelBindingProvider yangModelBindingProvider : yangProviderLoader) { + moduleInfos.add(yangModelBindingProvider.getModuleInfo()); + } + schemaCtx = BindingRuntimeHelpers.createEffectiveModel(moduleInfos); + bindingDOMCodecServices = new BindingCodecContext(BindingRuntimeHelpers.createRuntimeContext()); + adapterFactory = new BindingAdapterFactory(new ConstantAdapterContext(bindingDOMCodecServices)); + domNotificationRouter = DOMNotificationRouter.create(16); + datastores = createDatastores(); + domDataBroker = createDOMDataBroker(); + dataBroker = createDataBroker(); + notificationService = createNotificationService(); + notificationPublishService = createNotificationPublishService(); } @Override public DataBroker getDataBroker() { - return this.dataBroker; + return dataBroker; } @Override public DOMDataBroker getDOMDataBroker() { - return this.domDataBroker; + return domDataBroker; } @Override public NotificationService createNotificationService() { - return new BindingDOMNotificationServiceAdapter(this.mockedSchemaContext.adapterContext, - this.domNotificationRouter); + return adapterFactory.createNotificationService(domNotificationRouter); } @Override public NotificationPublishService createNotificationPublishService() { - return new BindingDOMNotificationPublishServiceAdapter(this.mockedSchemaContext.adapterContext, - this.domNotificationRouter); + return adapterFactory.createNotificationPublishService(domNotificationRouter); } @Override public EffectiveModelContext getSchemaContext() { - return this.mockedSchemaContext.schemaContext; + return schemaCtx; } @Override public BindingNormalizedNodeSerializer getBindingToNormalizedNodeCodec() { - return this.mockedSchemaContext.adapterContext.currentSerializer(); + return bindingDOMCodecServices; } @Override public NotificationService getNotificationService() { - return this.notificationService; + return notificationService; } @Override public NotificationPublishService getNotificationPublishService() { - return this.notificationPublishService; + return notificationPublishService; } private DOMDataBroker createDOMDataBroker() { - return new SerializedDOMDataBroker(this.datastores, + return new SerializedDOMDataBroker(datastores, MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor())); } - private ListeningExecutorService getDataTreeChangeListenerExecutor() { - return MoreExecutors.newDirectExecutorService(); - } - private DataBroker createDataBroker() { - return new BindingDOMDataBrokerAdapter(this.mockedSchemaContext.adapterContext, getDOMDataBroker()); + return adapterFactory.createDataBroker(getDOMDataBroker()); } private Map createDatastores() { @@ -133,68 +120,14 @@ public class DataStoreContextImpl implements DataStoreContext { } private DOMStore createConfigurationDatastore() { - final InMemoryDOMDataStore store = new InMemoryDOMDataStore("CFG", getDataTreeChangeListenerExecutor()); - this.mockedSchemaContext.registerSchemaContextListener(store); - return store; + return InMemoryDOMDataStoreFactory.create("CFG", + FixedDOMSchemaService.of(bindingDOMCodecServices.getRuntimeContext())); } private DOMStore createOperationalDatastore() { - final InMemoryDOMDataStore store = new InMemoryDOMDataStore("OPER", getDataTreeChangeListenerExecutor()); - this.mockedSchemaContext.registerSchemaContextListener(store); - return store; + return InMemoryDOMDataStoreFactory.create("OPER", + FixedDOMSchemaService.of(bindingDOMCodecServices.getRuntimeContext())); } - private static final class SchemaContextHolder implements DOMSchemaService, EffectiveModelContextProvider { - - private final EffectiveModelContext schemaContext; - private final ListenerRegistry listeners; - private final AdapterContext adapterContext; - - private SchemaContextHolder() { - List moduleInfos = loadModuleInfos(); - this.schemaContext = BindingRuntimeHelpers.createEffectiveModel(moduleInfos); - this.listeners = ListenerRegistry.create(); - this.adapterContext = new ConstantAdapterContext(); - } - - @Override - public EffectiveModelContext getGlobalContext() { - return this.schemaContext; - } - - /** - * Loads all {@link YangModelBindingProvider} on the classpath. - * - * @return list of known {@link YangModuleInfo} - */ - private List loadModuleInfos() { - List moduleInfos = new LinkedList<>(); - ServiceLoader yangProviderLoader = - ServiceLoader.load(YangModelBindingProvider.class); - for (YangModelBindingProvider yangModelBindingProvider : yangProviderLoader) { - moduleInfos.add(yangModelBindingProvider.getModuleInfo()); - LOG.debug("Adding [{}] module into known modules", yangModelBindingProvider.getModuleInfo()); - } - return moduleInfos; - } - - @Override - public ListenerRegistration registerSchemaContextListener( - EffectiveModelContextListener listener) { - return this.listeners.register(listener); - } - - @Override - public @NonNull EffectiveModelContext getEffectiveModelContext() { - return this.schemaContext; - } - - @Override - public @NonNull ClassToInstanceMap getExtensions() { - return ImmutableClassToInstanceMap.of(); - } - - - } } diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java index b7c8081bd..3cfd96a59 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java @@ -23,7 +23,6 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; -import org.opendaylight.transportpce.test.converter.DataObjectConverter; import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -117,14 +116,14 @@ public final class DeviceWrapper { Preconditions.checkArgument(initialData != null && !initialData.isEmpty(), "Initial data cannot be null or empty"); DataStoreContext dsContext = new DataStoreContextImpl(); - DataObjectConverter xmlConverter = XMLDataObjectConverter.createWithDataStoreUtil(dsContext); + XMLDataObjectConverter xmlConverter = XMLDataObjectConverter.createWithDataStoreUtil(dsContext); for (Entry entryData : initialData) { insertDataIntoDS(xmlConverter, entryData.getValue(), entryData.getKey(), dsContext.getDOMDataBroker()); } return new DeviceWrapper(key, dsContext.getDataBroker(), dsContext.getDOMDataBroker()); } - private static void insertDataIntoDS(DataObjectConverter xmlConverter, InputStream xmlDataInputStream, + private static void insertDataIntoDS(XMLDataObjectConverter xmlConverter, InputStream xmlDataInputStream, QName dataQName, DOMDataBroker domDataBroker) { Optional> initialDataNormalizedNodes = xmlConverter.transformIntoNormalizedNode(xmlDataInputStream); -- 2.36.6