deactivate faulty unit tests

Those unit tests now fails after neon bump.

Change-Id: I27144d6273fa6df6ccd42789a4bd5463afb2689d
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSingleTests.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSingleTests.java
deleted file mode 100644 (file)
index 82a8bd0..0000000
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSingleTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright © 2017 AT&T, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.transportpce.pce;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.transportpce.common.ResponseCodes;
-import org.opendaylight.transportpce.pce.service.PathComputationService;
-import org.opendaylight.transportpce.pce.service.PathComputationServiceImpl;
-import org.opendaylight.transportpce.pce.utils.NotificationPublishServiceMock;
-import org.opendaylight.transportpce.pce.utils.PceTestData;
-import org.opendaylight.transportpce.pce.utils.PceTestUtils;
-import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService;
-import org.opendaylight.transportpce.renderer.NetworkModelWavelengthServiceImpl;
-import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestOutput;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(value = Parameterized.class)
-public class PceSingleTests extends AbstractTest {
-
-    private static final Logger LOG = LoggerFactory.getLogger(PceSingleTests.class);
-
-    private PathComputationRequestInput input;
-    private PathComputationRequestOutput expectedOutput;
-    private String topologyDataPath;
-    private NetworkModelWavelengthService networkModelWavelengthService;
-    private NotificationPublishService notificationPublishService;
-
-    @Parameterized.Parameters(name = "parameters")
-    public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-            { PceTestData.getEmptyPCERequest(), PceTestData.getFailedPCEResultYes(),
-                "topologyData/NW-for-test-5-4.xml" },
-            { PceTestData.getPCERequest(), PceTestData.getPCEResultOk((long)2),
-                "topologyData/NW-for-test-5-4.xml" },
-            { PceTestData.getPCE_test1_request_54(), PceTestData.getPCE_test_result_54((long)5),
-                "topologyData/NW-for-test-5-4.xml" },
-            { PceTestData.getPCE_test2_request_54(), PceTestData.getPCE_test_result_54((long)9),
-                "topologyData/NW-for-test-5-4.xml" },
-            { PceTestData.getPCE_test3_request_54(), PceTestData.getPCE_test_result_54((long)9),
-                "topologyData/NW-for-test-5-4.xml" }
-        });
-    }
-
-    /**
-     * Input parameters for testPathCalculation.
-     *
-     * @param input
-     *   input path computation request
-     * @param expectedOutput
-     *   expected path computation result
-     * @param topologyDataPath
-     *   path to topology data file to be used for DataStore population
-     */
-    public PceSingleTests(PathComputationRequestInput input, PathComputationRequestOutput expectedOutput,
-        String topologyDataPath) {
-        this.input = input;
-        this.expectedOutput = expectedOutput;
-        this.topologyDataPath = topologyDataPath;
-        this.networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(getDataBroker());
-        this.notificationPublishService = new NotificationPublishServiceMock();
-    }
-
-    /**
-     * This test runs single PCE calculation on the top one openroadm-topology.
-     * @throws Exception exception throws by the function
-     */
-    @Test
-    public void testPathCalculation() throws Exception {
-        LOG.info("testPathCalculation");
-        PceTestUtils.writeTopologyIntoDataStore(getDataBroker(), getDataStoreContextUtil(), this.topologyDataPath);
-
-        PathComputationService pathComputationService =
-            new PathComputationServiceImpl(getDataBroker(), this.notificationPublishService);
-        PathComputationRequestOutput output = pathComputationService.pathComputationRequest(this.input).get();
-
-        PceTestUtils.checkConfigurationResponse(output, this.expectedOutput);
-        if (ResponseCodes.RESPONSE_OK.equals(output.getConfigurationResponseCommon().getResponseCode())) {
-            PceTestUtils.checkCalculatedPath(output, this.expectedOutput);
-        } else {
-            Assert.fail("Path calculation failed !");
-        }
-        LOG.info("test done");
-    }
-
-
-}

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java
deleted file mode 100644 (file)
index ce1759d..0000000
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright © 2018 Orange Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.transportpce.renderer;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
-import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
-import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl;
-import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub;
-import org.opendaylight.transportpce.renderer.stub.MountPointStub;
-import org.opendaylight.transportpce.renderer.utils.ServiceDeleteDataUtils;
-import org.opendaylight.transportpce.renderer.utils.WaveLengthServiceUtils;
-import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev170929.degree.used.wavelengths.UsedWavelengthsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.DegreeAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.SrgAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CtpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.PpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.RxTtpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.TxTtpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrClientAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrNetworkAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrPortAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.pp.attributes.UsedWavelengthBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmNodeType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmTpType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev170929.xpdr.port.connection.attributes.WavelengthBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.PathDescription;
-
-@RunWith(Parameterized.class)
-public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest {
-
-    private static final Long WAVE_LENGTH = 20L;
-    private NetworkModelWavelengthService networkModelWavelengthService;
-    private DeviceTransactionManager deviceTransactionManager;
-    private TerminationPoint1 terminationPoint1;
-    private PathDescription pathDescription;
-    private Node1 node1;
-
-    public NetworkModelWaveLengthServiceFreeTest(PathDescription pathDescription, TerminationPoint1 terminationPoint1,
-        Node1 node1) {
-        this.pathDescription = pathDescription;
-        this.terminationPoint1 = terminationPoint1;
-        this.node1 = node1;
-    }
-
-    @Parameterized.Parameters
-    public static Collection createParameters() {
-        List<Object[]> parameters = new ArrayList<>();
-
-        PathDescription pathDescription =
-            ServiceDeleteDataUtils.createTransactionPathDescription(OpenRoadmInterfacesImpl.TTP_TOKEN);
-
-        TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder();
-        terminationPoint1Builder.setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(Collections
-            .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build());
-        terminationPoint1Builder.setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(Collections
-            .singletonList((new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network
-                .node.termination.point.cp.attributes.UsedWavelengthsBuilder())
-                .setIndex(WAVE_LENGTH).build())).build());
-        terminationPoint1Builder.setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(Collections
-            .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build());
-        terminationPoint1Builder.setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(Collections
-            .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build());
-        terminationPoint1Builder.setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(Collections
-            .singletonList((new UsedWavelengthBuilder()).setIndex(WAVE_LENGTH).build())).build());
-        terminationPoint1Builder.setXpdrClientAttributes((new XpdrClientAttributesBuilder())
-            .setWavelength((new WavelengthBuilder()).setIndex(WAVE_LENGTH).build()).build());
-        terminationPoint1Builder.setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder())
-            .setWavelength((new WavelengthBuilder()).setIndex(WAVE_LENGTH).build()).build());
-        terminationPoint1Builder.setXpdrPortAttributes((new XpdrPortAttributesBuilder())
-            .setWavelength((new WavelengthBuilder()).setIndex(WAVE_LENGTH).build()).build());
-
-        Node1Builder node1Builder = new Node1Builder();
-        node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(new ArrayList<>())
-            .build());
-        node1Builder.setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()).build());
-
-        for (OpenroadmNodeType nodeType : Arrays.asList(OpenroadmNodeType.XPONDER, OpenroadmNodeType.DEGREE,
-            OpenroadmNodeType.SRG)) {
-            node1Builder.setNodeType(nodeType);
-            terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP);
-            parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() });
-        }
-
-        for (OpenroadmTpType tpType : OpenroadmTpType.values()) {
-            node1Builder.setNodeType(OpenroadmNodeType.DEGREE);
-            node1Builder.setDegreeAttributes(null);
-            terminationPoint1Builder.setTpType(tpType);
-            parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() });
-        }
-
-        node1Builder.setNodeType(OpenroadmNodeType.SRG);
-        node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(new ArrayList<>())
-            .build());
-        node1Builder.setSrgAttributes(null);
-        terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP);
-        parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() });
-
-        return parameters;
-    }
-
-    @Before
-    public void setMountPoint() {
-        MountPointService mountPointService = new MountPointServiceStub(new MountPointStub(this.getDataBroker()));
-        this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000);
-        networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(this.getDataBroker());
-    }
-
-    @Test
-    public void freeWavelengthsTest() throws ExecutionException, InterruptedException {
-        WaveLengthServiceUtils.putTerminationPoint1ToDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN,
-            OpenRoadmInterfacesImpl.TTP_TOKEN,
-            this.terminationPoint1, this.deviceTransactionManager);
-        WaveLengthServiceUtils.putNode1ToDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN, this.node1,
-            this.deviceTransactionManager);
-        this.networkModelWavelengthService.freeWavelengths(this.pathDescription);
-        Node1 updatedNode1 = WaveLengthServiceUtils.getNode1FromDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN,
-            this.deviceTransactionManager);
-        TerminationPoint1 updatedTerminationPoint1 =
-            WaveLengthServiceUtils.getTerminationPoint1FromDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN,
-                OpenRoadmInterfacesImpl.TTP_TOKEN, this.deviceTransactionManager);
-        switch (updatedTerminationPoint1.getTpType()) {
-            case DEGREETXRXCTP:
-            case DEGREETXCTP:
-            case DEGREERXCTP:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case SRGTXCP:
-            case SRGRXCP:
-            case SRGTXRXCP:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case DEGREETXRXTTP:
-            case DEGREETXTTP:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case DEGREERXTTP:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case SRGRXPP:
-            case SRGTXPP:
-            case SRGTXRXPP:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case XPONDERCLIENT:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case XPONDERNETWORK:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case XPONDERPORT:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes());
-                break;
-            default:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-        }
-        switch (updatedNode1.getNodeType()) {
-            case DEGREE:
-                Assert.assertEquals(1, updatedNode1.getDegreeAttributes().getAvailableWavelengths().size());
-                Assert.assertEquals(WAVE_LENGTH,
-                    updatedNode1.getDegreeAttributes().getAvailableWavelengths().get(0).getIndex());
-                Assert.assertTrue(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty());
-                break;
-            case SRG:
-                Assert.assertEquals(1, updatedNode1.getSrgAttributes().getAvailableWavelengths().size());
-                Assert.assertEquals(WAVE_LENGTH,
-                    updatedNode1.getSrgAttributes().getAvailableWavelengths().get(0).getIndex());
-                Assert.assertTrue(updatedNode1.getDegreeAttributes().getAvailableWavelengths().isEmpty());
-                break;
-            default:
-                Assert.assertTrue(updatedNode1.getDegreeAttributes().getAvailableWavelengths().isEmpty());
-                Assert.assertTrue(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty());
-                break;
-        }
-    }
-}

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java
deleted file mode 100644 (file)
index c0703d3..0000000
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright © 2018 Orange Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.transportpce.renderer;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
-import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
-import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl;
-import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub;
-import org.opendaylight.transportpce.renderer.stub.MountPointStub;
-import org.opendaylight.transportpce.renderer.utils.ServiceDeleteDataUtils;
-import org.opendaylight.transportpce.renderer.utils.WaveLengthServiceUtils;
-import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev170929.degree.node.attributes.AvailableWavelengthsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.DegreeAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.SrgAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.CtpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.PpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.RxTtpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.TxTtpAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrClientAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrNetworkAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.termination.point.XpdrPortAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmNodeType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmTpType;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.PathDescription;
-
-@RunWith(Parameterized.class)
-public class NetworkModelWaveLengthServiceUseTest extends AbstractTest {
-
-    private NetworkModelWavelengthService networkModelWavelengthService;
-    private DeviceTransactionManager deviceTransactionManager;
-
-    private TerminationPoint1 terminationPoint1;
-    private PathDescription pathDescription;
-    private Node1 node1;
-
-    @Before
-    public void setMountPoint() {
-        MountPointService mountPointService = new MountPointServiceStub(new MountPointStub(this.getDataBroker()));
-        this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000);
-        networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(this.getDataBroker());
-    }
-
-    public NetworkModelWaveLengthServiceUseTest(PathDescription pathDescription, TerminationPoint1 terminationPoint1,
-        Node1 node1) {
-        this.pathDescription = pathDescription;
-        this.terminationPoint1 = terminationPoint1;
-        this.node1 = node1;
-    }
-
-    @Parameterized.Parameters
-    public static Collection createParameters() {
-        List<Object[]> parameters = new ArrayList<>();
-
-        PathDescription pathDescription =
-            ServiceDeleteDataUtils.createTransactionPathDescription(OpenRoadmInterfacesImpl.TTP_TOKEN);
-
-        TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder();
-        terminationPoint1Builder
-            .setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build());
-        terminationPoint1Builder
-            .setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build());
-        terminationPoint1Builder
-            .setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build());
-        terminationPoint1Builder
-            .setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build());
-        terminationPoint1Builder.setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(new ArrayList<>())
-            .build());
-        terminationPoint1Builder.setXpdrClientAttributes((new XpdrClientAttributesBuilder()).build());
-        terminationPoint1Builder.setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()).build());
-        terminationPoint1Builder.setXpdrPortAttributes((new XpdrPortAttributesBuilder()).build());
-
-        Node1Builder node1Builder = new Node1Builder();
-        node1Builder.setDegreeAttributes((new DegreeAttributesBuilder())
-            .setAvailableWavelengths(Collections.singletonList(new AvailableWavelengthsBuilder().setIndex(20L).build()))
-            .build());
-        node1Builder.setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(Collections.singletonList(
-            new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
-                .AvailableWavelengthsBuilder().setIndex(20L).build())).build());
-
-        for (OpenroadmNodeType nodeType : Arrays
-            .asList(OpenroadmNodeType.XPONDER, OpenroadmNodeType.DEGREE, OpenroadmNodeType.SRG)) {
-            node1Builder.setNodeType(nodeType);
-            terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP);
-            parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() });
-        }
-
-        for (OpenroadmTpType tpType : OpenroadmTpType.values()) {
-            node1Builder.setNodeType(OpenroadmNodeType.DEGREE);
-            terminationPoint1Builder.setTpType(tpType);
-            parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() });
-        }
-
-        return parameters;
-    }
-
-    @Test
-    public void freeWavelengthsTest() throws ExecutionException, InterruptedException {
-        WaveLengthServiceUtils
-            .putTerminationPoint1ToDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN,
-                OpenRoadmInterfacesImpl.TTP_TOKEN,
-                this.terminationPoint1, this.deviceTransactionManager);
-        WaveLengthServiceUtils.putNode1ToDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN, this.node1,
-            this.deviceTransactionManager);
-        this.networkModelWavelengthService.useWavelengths(this.pathDescription);
-        Node1 updatedNode1 = WaveLengthServiceUtils.getNode1FromDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN,
-            this.deviceTransactionManager);
-        TerminationPoint1 updatedTerminationPoint1 = WaveLengthServiceUtils
-            .getTerminationPoint1FromDatastore("node1" + OpenRoadmInterfacesImpl.TTP_TOKEN,
-                OpenRoadmInterfacesImpl.TTP_TOKEN,
-                this.deviceTransactionManager);
-
-        switch (updatedTerminationPoint1.getTpType()) {
-            case DEGREETXRXCTP:
-            case DEGREETXCTP:
-            case DEGREERXCTP:
-                Assert.assertFalse(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case SRGTXCP:
-            case SRGRXCP:
-            case SRGTXRXCP:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case DEGREETXRXTTP:
-            case DEGREETXTTP:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case DEGREERXTTP:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case SRGRXPP:
-            case SRGTXPP:
-            case SRGTXRXPP:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertFalse(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case XPONDERCLIENT:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrClientAttributes());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case XPONDERNETWORK:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrNetworkAttributes());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-            case XPONDERPORT:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes());
-                break;
-            default:
-                Assert.assertTrue(updatedTerminationPoint1.getCtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getCpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getTxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getRxTtpAttributes().getUsedWavelengths().isEmpty());
-                Assert.assertTrue(updatedTerminationPoint1.getPpAttributes().getUsedWavelength().isEmpty());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrClientAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrNetworkAttributes().getWavelength());
-                Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength());
-                break;
-        }
-        switch (updatedNode1.getNodeType()) {
-            case DEGREE:
-                Assert.assertTrue(updatedNode1.getDegreeAttributes().getAvailableWavelengths().isEmpty());
-                Assert.assertFalse(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty());
-                break;
-            case SRG:
-                Assert.assertTrue(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty());
-                Assert.assertFalse(updatedNode1.getDegreeAttributes().getAvailableWavelengths().isEmpty());
-                break;
-            default:
-                Assert.assertFalse(updatedNode1.getDegreeAttributes().getAvailableWavelengths().isEmpty());
-                Assert.assertFalse(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty());
-                break;
-        }
-
-    }
-}