Clean JUnit tests 50/99950/2
authorGilles Thouenon <gilles.thouenon@orange.com>
Thu, 3 Mar 2022 16:23:21 +0000 (17:23 +0100)
committerGilles Thouenon <gilles.thouenon@orange.com>
Fri, 4 Mar 2022 07:56:15 +0000 (08:56 +0100)
- remove useless properties
- remove useless intermediate variables
- remove useless private methods

JIRA: TRNSPRTPCE-642
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Icd0ec3e423a26d6f60fc9d3626d3b82d7e5ea240

38 files changed:
common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121Test.java
common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java
common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImplTest.java
common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java
common/src/test/java/org/opendaylight/transportpce/common/mapping/SortPort121ByNameTest.java
common/src/test/java/org/opendaylight/transportpce/common/mapping/SortPort221ByNameTest.java
common/src/test/java/org/opendaylight/transportpce/common/service/ServiceTypeTest.java
common/src/test/java/org/opendaylight/transportpce/common/test/TransportPCETest.java [deleted file]
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/JsonUtil.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java
olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/utils/JsonUtil.java
pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java
pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestData.java
pce/src/test/java/org/opendaylight/transportpce/pce/utils/TransactionUtils.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/CreateOtsOmsDataUtils.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDeleteDataUtils.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java
servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/ModelMappingUtilsTest.java
servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java
servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/MockedNotificationServiceWrapper.java
servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ModelMappingUtils.java
tapi/src/test/java/org/opendaylight/transportpce/tapi/connectivity/TapiConnectivityImplTest.java
tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java

index 7f0dbd9ee3e9e8570e442633c9ea1ce2226282a3..09fe8e4bfca6365b15ca2930292ca51ee74d49eb 100644 (file)
@@ -30,8 +30,6 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
 import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPorts;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPortsBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnections;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey;
@@ -99,13 +97,8 @@ public class CrossConnectImpl121Test {
 
         Mockito.when(deviceTransactionManager.getDeviceTransaction("deviceId"))
             .thenReturn(CompletableFuture.completedFuture(Optional.of(mock(DeviceTransaction.class))));
-        boolean res = crossConnectImpl121
-                .setPowerLevel("deviceId", OpticalControlMode.Power, new BigDecimal(100), "1");
+        crossConnectImpl121.setPowerLevel("deviceId", OpticalControlMode.Power, new BigDecimal(100), "1");
 
         Assert.assertTrue("set Level should be true", true);
     }
-
-    private ConnectionPorts getConnectionPorts(String c1, String p1) {
-        return new ConnectionPortsBuilder().setCircuitPackName(c1).setPortName(p1).build();
-    }
 }
index 26ddd41091f69ad45a2c7ca43164055a7e22735a..e2a3c55b78a8619f358ab785868ba0ca12c2d350 100644 (file)
@@ -29,11 +29,7 @@ import org.opendaylight.transportpce.common.device.DeviceTransaction;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
 import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesKey;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPorts;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPortsBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.OrgOpenroadmDevice;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnections;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey;
@@ -103,15 +99,13 @@ public class CrossConnectImpl221Test {
 
         Mockito.when(deviceTransactionManager.getDeviceTransaction("deviceId"))
             .thenReturn(CompletableFuture.completedFuture(Optional.of(mock(DeviceTransaction.class))));
-        boolean res = crossConnectImpl221
-                .setPowerLevel("deviceId", OpticalControlMode.GainLoss, new BigDecimal(100), "1");
+        crossConnectImpl221.setPowerLevel("deviceId", OpticalControlMode.GainLoss, new BigDecimal(100), "1");
 
         Assert.assertTrue("set Level should be true", true);
     }
 
     @Test(expected = NullPointerException.class)
     public void postOtnCrossConnect() {
-        NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey("nodeId")).setNodeId("nodeId");
         Nodes nodes = Mockito.mock(Nodes.class);
         Mockito.when(nodes.getNodeId()).thenReturn("nodeId");
         Mockito.when(deviceTransactionManager.getDeviceTransaction(any()))
@@ -119,9 +113,4 @@ public class CrossConnectImpl221Test {
         Optional<String> res = crossConnectImpl221.postOtnCrossConnect(List.of("src1", "src2"), nodes);
         Assert.assertTrue("Optional value should have a value", res.isPresent());
     }
-
-
-    private ConnectionPorts getConnectionPorts(String c1, String p1) {
-        return new ConnectionPortsBuilder().setCircuitPackName(c1).setPortName(p1).build();
-    }
 }
index aac25829e0d342e4084ce34240fbea3c4151c7c1..7d6bb2a965e510ac8bdda569c40387ad69ff8906 100644 (file)
@@ -104,7 +104,8 @@ public class CrossConnectImplTest {
         when(mappingUtils.getOpenRoadmVersion(any())).thenReturn(devV121);
         when(crossConnectImpl121.setPowerLevel(any(), any(), any(), any()))
                 .thenReturn(true);
-        res = crossConnectImpl.setPowerLevel("100", "srcTp", new BigDecimal(100), "power");
+        //FIXME: this part of the test needs to be reviewed
+        crossConnectImpl.setPowerLevel("100", "srcTp", new BigDecimal(100), "power");
         Assert.assertTrue(true);
     }
 }
index e412397b2f16cef96429ad6a632fc7715b48e882..4cf80a18156798fde5df83e563c595551e7c9967 100644 (file)
@@ -76,8 +76,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.open
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.port.Interfaces;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.port.InterfacesBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.port.PartnerPortBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpenROADMOpticalMultiplex;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpticalTransport;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.Protocols1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.LldpBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.PortConfig;
@@ -121,10 +119,6 @@ public class PortMappingVersion121Test {
         Ports ports = getPortsWithInterfaces(interfacesList, "p1");
         List<Ports> portsList = Arrays.asList(ports);
 
-        // mock 2 bidirectional port for SRG
-        Ports ports1 = getPortsWithInterfaces(interfacesList, "p2");
-        List<Ports> portsList1 = Arrays.asList(ports1);
-
         // mock 2 unidirectional ports for degree
         Ports ports2 = getPorts("p2", Port.PortQual.RoadmExternal, "c3", "p3", Direction.Rx);
         Ports ports3 = getPorts("p3", Port.PortQual.RoadmExternal, "c3", "p2", Direction.Tx);
@@ -337,6 +331,8 @@ public class PortMappingVersion121Test {
         when(deviceTransactionManager.getDataFromDevice("node", LogicalDatastoreType.OPERATIONAL, portID,
                 Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT)).thenReturn(Optional.of(ports));
 
+        // mock 2 bidirectional port for SRG
+        Ports ports1 = getPortsWithInterfaces(interfacesList, "p2");
         InstanceIdentifier<Ports> portID1 = getChild("c2", "p1");
         when(deviceTransactionManager.getDataFromDevice("node",
             LogicalDatastoreType.OPERATIONAL, portID1,
@@ -433,11 +429,6 @@ public class PortMappingVersion121Test {
                 Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT))
                         .thenReturn(Optional.of(ordmSrgObject6));
 
-        Interface ifc1 = new InterfaceBuilder().withKey(new InterfaceKey("ifc1"))
-                .setType(OpticalTransport.class).build();
-        Interface ifc2 = new InterfaceBuilder().withKey(new InterfaceKey("ifc2"))
-                .setType(OpenROADMOpticalMultiplex.class).build();
-
         // test createMappingData with a node with 3 dgree + 3 srg + bidirectional & unidirectional ports
         assertTrue("creating mappingdata for existed node returns true",
                 portMappingVersion121.createMappingData("node"));
index e3c710c85f3ad45d82fdf26223fc9a2f4a256daa..646184645bb1218125e1220d59f854427d77fa9a 100644 (file)
@@ -12,16 +12,11 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port;
 
 public class SortPort121ByNameTest {
 
-    @Before
-    public void setUp() throws Exception {
-    }
-
     @Test
     public void compareTest() {
         Port port1 = mock(Port.class);
@@ -30,6 +25,5 @@ public class SortPort121ByNameTest {
         when(port2.getPortName()).thenReturn("port2");
         SortPort121ByName sortPort121ByName = new SortPort121ByName();
         assertEquals(sortPort121ByName.compare(port2, port1), 1);
-
     }
 }
\ No newline at end of file
index 77c8094720e3620447bd427b86abe28df9c02d0b..ceb55557ba72c9fb6d26197bda64e9b4b67f372b 100644 (file)
@@ -12,16 +12,11 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.Port;
 
 public class SortPort221ByNameTest {
 
-    @Before
-    public void setUp() throws Exception {
-    }
-
     @Test
     public void compareTest() {
         Port port1 = mock(Port.class);
@@ -30,6 +25,5 @@ public class SortPort221ByNameTest {
         when(port2.getPortName()).thenReturn("port2");
         SortPort221ByName sortPort221ByName = new SortPort221ByName();
         assertEquals(sortPort221ByName.compare(port2, port1), 1);
-
     }
 }
\ No newline at end of file
index 19a2375d09cc4d21bb6ee2614c1bc59c35a90c5b..91a312142c754db960191a506b1af8921369a6b6 100644 (file)
@@ -89,7 +89,6 @@ public class ServiceTypeTest {
         assertEquals("service-type should be ODU4", "ODU4", serviceType);
         serviceType = ServiceTypes.getOtnServiceType("ODU", Uint32.valueOf(400));
         assertEquals("service-type should be ODUC4", "ODUC4", serviceType);
-
     }
 
 }
\ No newline at end of file
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
deleted file mode 100644 (file)
index b6b837a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Â© 2016 AT&T 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.common.test;
-
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TransportPCETest {
-
-    private static final Logger LOG = LoggerFactory.getLogger(TransportPCETest.class);
-
-    @Test
-    public void test() {
-        LOG.info("test");
-    }
-
-}
index d2950dd22250a849084074264d1a5ff9c6d93f1e..0fc973253453d387bb5a145fa34d2b4832e4d819 100644 (file)
@@ -50,23 +50,12 @@ public class ClliNetworkTest {
     }
 
     private NodeInfoBuilder computeNodeInfoBuilder() {
-        NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
+        return new NodeInfoBuilder()
             .setNodeClli("NodeClliId")
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
             .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
             .setOpenroadmVersion(OpenroadmNodeVersion._121);
-        return nodeBldr;
-    }
-
-    private NodeInfoBuilder computeNodeInfoBuilderWithoutClli() {
-        NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
-            .setNodeModel("NodeModel")
-            .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
-            .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmNodeVersion._121);
-        return nodeBldr;
     }
 }
index 77d2a45f78bb26602db8976054bc2dcc17e6d699..714216face8091ee7e5e293cfc0d1dcbd1e94c3a 100644 (file)
@@ -31,14 +31,11 @@ import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 public final class JsonUtil {
     private static final Logger LOG = LoggerFactory.getLogger(JsonUtil.class);
     private static JsonUtil instance;
 
     private EffectiveModelContext schemaCtx;
-
     private BindingNormalizedNodeSerializer codecRegistry;
 
     private JsonUtil() {
@@ -80,6 +77,5 @@ public final class JsonUtil {
             LOG.error("Cannot deserialize JSON ", e);
             return null;
         }
-
     }
 }
index 60b5e2b442a4ee2190411d787f2fb0ebd2f42999..75ee3fcfa68cc1a1bb5ae6e1e2384e007e502edc 100644 (file)
@@ -65,12 +65,11 @@ public final class NetworkmodelTestUtil {
         Map<MappingKey,Mapping> mappingList = new HashMap<>();
         createDegreeMappings(mappingList, 1, degNb);
         createSrgMappings(mappingList, 1, srgNb);
-        Nodes mappingNode = new NodesBuilder()
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Rdm).setNodeClli(clli).build())
             .setMapping(mappingList)
             .build();
-        return mappingNode;
     }
 
     public static Nodes createMappingForXpdr(String nodeId, String clli, int networkPortNb, int clientPortNb,
index bbce9663bce7f8bbef43d00e3418b42f9c448012..0f2f49e938473a98a9d85a3d574228e4502911e0 100644 (file)
@@ -48,14 +48,12 @@ import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil;
 import org.opendaylight.transportpce.olm.util.OlmUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.Network;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.OpenroadmNodeVersion;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingBuilder;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.MappingKey;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.Nodes;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.NodesKey;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB;
@@ -64,7 +62,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.No
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.Ots;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -282,33 +279,24 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
     }
 
     private MappingBuilder getMappingBuilderDeg() {
-        MappingBuilder mappingBuilder = new MappingBuilder();
-        mappingBuilder.withKey(new MappingKey("deg"));
-        mappingBuilder.setLogicalConnectionPoint("logicalConnPoint");
-        mappingBuilder.setSupportingOts("OTS");
-        mappingBuilder.setSupportingCircuitPackName("2/0");
-        mappingBuilder.setSupportingOms("OMS");
-        mappingBuilder.setSupportingPort("8080");
-        mappingBuilder.setSupportingCircuitPackName("circuit1");
-        InstanceIdentifier<Mapping> portMappingIID =
-                InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey("node 1"))
-                        .child(Mapping.class, new MappingKey("deg")).build();
-        return mappingBuilder;
+        return new MappingBuilder()
+            .withKey(new MappingKey("deg"))
+            .setLogicalConnectionPoint("logicalConnPoint")
+            .setSupportingOts("OTS")
+            .setSupportingCircuitPackName("2/0")
+            .setSupportingOms("OMS")
+            .setSupportingPort("8080")
+            .setSupportingCircuitPackName("circuit1");
     }
 
     private MappingBuilder getMappingBuilderNetWork() {
-        MappingBuilder mappingBuilder = new MappingBuilder();
-        mappingBuilder.withKey(new MappingKey("network"));
-        mappingBuilder.setLogicalConnectionPoint("logicalConnPoint");
-        mappingBuilder.setSupportingOts("OTS");
-        mappingBuilder.setSupportingCircuitPackName("2/0");
-        mappingBuilder.setSupportingOms("OMS");
-        mappingBuilder.setSupportingPort("8080");
-        mappingBuilder.setSupportingCircuitPackName("circuit1");
-        InstanceIdentifier<Mapping> portMappingIID =
-                InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey("node 1"))
-                        .child(Mapping.class, new MappingKey("network")).build();
-        return mappingBuilder;
+        return new MappingBuilder()
+            .withKey(new MappingKey("network"))
+            .setLogicalConnectionPoint("logicalConnPoint")
+            .setSupportingOts("OTS")
+            .setSupportingCircuitPackName("2/0")
+            .setSupportingOms("OMS")
+            .setSupportingPort("8080")
+            .setSupportingCircuitPackName("circuit1");
     }
-
 }
index 67519f78c7f9ab2908f42247fa21bcb2aaf98f6f..81532602f511f1de54b062e048507d4ca89238a2 100644 (file)
@@ -70,7 +70,6 @@ public class PowerMgmtTest extends AbstractTest {
         dataBroker = this.getNewDataBroker();
         this.mountPoint = new MountPointStub(dataBroker);
         this.mountPointService = new MountPointServiceStub(mountPoint);
-        // this.mappingUtils = new MappingUtilsImpl(getDataBroker());
         this.mappingUtils = Mockito.spy(new MappingUtilsImpl(dataBroker));
         Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1).when(mappingUtils)
                 .getOpenRoadmVersion(Mockito.anyString());
@@ -189,6 +188,7 @@ public class PowerMgmtTest extends AbstractTest {
         Assert.assertEquals(true, output);
     }
     /*
+    TODO: see if this test is always relevant
     @Test
     public void testSetPowerPresentNodes31() throws InterruptedException {
         List<NodeId> nodes = TransactionUtils.getNodeIds();
@@ -238,6 +238,7 @@ public class PowerMgmtTest extends AbstractTest {
     }
 
     /*
+    TODO: see if this test is always relevant
     @Test
     public void testSetPowerPresentNodes41() throws InterruptedException {
         List<NodeId> nodes = TransactionUtils.getNodeIds();
index 879359200a6dcdc7a506c08ad3a02f6ed839e4af..edc89e8a2892dbe8bee87e97984ddab326fe1da5 100644 (file)
@@ -44,7 +44,6 @@ import org.opendaylight.transportpce.olm.power.PowerMgmtImpl;
 import org.opendaylight.transportpce.olm.stub.MountPointServiceStub;
 import org.opendaylight.transportpce.olm.stub.MountPointStub;
 import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil;
-import org.opendaylight.transportpce.olm.util.OtsPmHolder;
 import org.opendaylight.transportpce.olm.util.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseInput;
@@ -98,7 +97,6 @@ public class OlmPowerServiceImplTest  extends AbstractTest {
     private PowerMgmt powerMgmtMock;
     @InjectMocks
     private OlmPowerService olmPowerServiceMock;
-    private OtsPmHolder otsPmHolder;
 
 
     @Before
index 04687cec9b744f6d941523ebce4ad6b6a084aa33..1b579cf889dec1a2c768e721c0f01fd5a39cacf3 100644 (file)
@@ -22,8 +22,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev21
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInputBuilder;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownInput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Link1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Link1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.olm.get.pm.input.ResourceIdentifierBuilder;
@@ -181,7 +179,6 @@ public final class OlmPowerServiceRpcImplUtil {
     }
 
     public static CalculateSpanlossBaseInput getCalculateSpanlossBaseInput2() {
-        Link1 link1 = new Link1Builder().build();
         CalculateSpanlossBaseInput input = new CalculateSpanlossBaseInputBuilder()
             .setLinkId(new LinkId("link 1"))
             .setSrcType(CalculateSpanlossBaseInput.SrcType.All).build();
index 536e213e0f24d12743fc357e218f1f93926b373e..5257cdffe53c43308ee6b59318f29bcaf038b3ca 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.transportpce.olm.util;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -182,7 +181,6 @@ public final class OlmTransactionUtils {
                         .build();
         amplifiedLinkValues.put(al.key(),al);
         amplifiedLinkValues.put(al2.key(),al2);
-        Map<Class<? extends Augmentation<Link>>, Augmentation<Link>> map = Collections.emptyMap();
         Augmentation<Link> aug11 = new Link1Builder()
                 .setAmplified(true)
                 .setOMSAttributes(new OMSAttributesBuilder()
index 88e00ce5fbd342fbb99573ba4317933ddf8b6c82..b2ac5fb41019e326dd68569f7ac6ddf8e0111283 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.transportpce.olm.util;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -281,7 +280,6 @@ public final class TransactionUtils {
             .setSectionEltNumber(Uint16.valueOf(1)).build();
         amplifiedLinkValues.put(al.key(),al);
         amplifiedLinkValues.put(al2.key(),al2);
-        Map<Class<? extends Augmentation<Link>>, Augmentation<Link>> map = Collections.emptyMap();
         Augmentation<Link> aug1 = new Link1Builder()
             .setAmplified(true)
             .setOMSAttributes(new OMSAttributesBuilder()
@@ -360,7 +358,7 @@ public final class TransactionUtils {
             .setSupportingPort("port")
             .withKey(new MappingKey((mappingKey != null) ? mappingKey : "null"))
             .build();
-        Nodes nodes = new NodesBuilder()
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder()
                 .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes.Xpdr)
@@ -369,7 +367,6 @@ public final class TransactionUtils {
             .setCpToDegree(cpList)
             .setMapping(Map.of(map1.key(),map1))
             .build();
-        return nodes;
     }
 
     public static Nodes getNodes2(String nodeId, String mappingKey) {
@@ -392,7 +389,7 @@ public final class TransactionUtils {
             .setSupportingPort("port")
             .withKey(new MappingKey((mappingKey != null) ? mappingKey : "null"))
             .build();
-        Nodes nodes = new NodesBuilder()
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder()
                 .setNodeType(null)
@@ -401,7 +398,6 @@ public final class TransactionUtils {
             .setCpToDegree(cpList)
             .setMapping(Map.of(map1.key(),map1))
             .build();
-        return nodes;
     }
 
     public static Nodes getNodes3(String nodeId, String mappingKey) {
@@ -424,7 +420,7 @@ public final class TransactionUtils {
             .setSupportingPort("port")
             .withKey(new MappingKey((mappingKey != null) ? mappingKey : "null"))
             .build();
-        Nodes nodes = new NodesBuilder()
+        return new NodesBuilder()
             .setNodeId(nodeId)
             .setNodeInfo(new NodeInfoBuilder()
                 .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes.Rdm)
@@ -433,7 +429,6 @@ public final class TransactionUtils {
             .setCpToDegree(cpList)
             .setMapping(Map.of(map1.key(),map1))
             .build();
-        return nodes;
     }
 
     public static void writeNodeTransaction(String nodeId, DataBroker dataBroker, String mappingKey) {
index 6ba36dfbee6bdd974099c5fa62ff50dc81cf8205..d12f22cb22ddb4be4bbdddaa381ea2d94d6a306a 100644 (file)
@@ -20,61 +20,58 @@ import org.opendaylight.transportpce.pce.utils.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 
 public class PceConstraintsCalcTest extends AbstractTest {
-    private static PceConstraintsCalc pceConstraintsCalc;
     private static NetworkTransactionService networkTransactionService = null;
     private DataBroker dataBroker = getDataBroker();
 
+    //TODO: review this test class. May be miss few assert.
     @Before
     public void setup() throws Exception {
         // networkTransactionService = Mockito.mock(NetworkTransactionService.class);
         PceTestUtils.writeNetworkIntoDataStore(dataBroker, getDataStoreContextUtil(),
                 TransactionUtils.getNetworkForSpanLoss());
         networkTransactionService = new NetworkTransactionImpl(new RequestProcessor(dataBroker));
-
-
     }
 
     @Test
     public void testNoHardOrSoftConstrainsExists() {
         PceTestData.getPCE_test2_request_54().getSoftConstraints();
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getEmptyPCERequest(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getEmptyPCERequest(), networkTransactionService);
     }
 
     @Test()
     public void testHardConstrainsExists() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCE_simpletopology_test1_requestSetHardAndSoftConstrains(), networkTransactionService);
+        new PceConstraintsCalc(
+            PceTestData.getPCE_simpletopology_test1_requestSetHardAndSoftConstrains(),
+            networkTransactionService);
     }
 
     @Test()
     public void testHardConstrainsExists1() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPathComputationRequestInputWithCoRoutingOrGeneral(), networkTransactionService);
+        new PceConstraintsCalc(
+            PceTestData.getPathComputationRequestInputWithCoRoutingOrGeneral(),
+            networkTransactionService);
     }
 
     @Test
     public void testSoftConstrainsExists() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCERequest(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getPCERequest(), networkTransactionService);
     }
 
     @Test(expected = Exception.class)
     public void testHardConstrainsExists2() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .build_diversity_from_request(PceTestData.getPCERequest()), networkTransactionService);
+        new PceConstraintsCalc(
+            PceTestData.build_diversity_from_request(PceTestData.getPCERequest()),
+            networkTransactionService);
     }
 
     @Test()
     public void testHardConstrainsExists3() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getEmptyPCERequestServiceNameWithRequestId(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getEmptyPCERequestServiceNameWithRequestId(), networkTransactionService);
     }
 
     @Test(expected = Exception.class)
     public void testHardConstrainsExists4() {
-        pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCE_test2_request_54(), networkTransactionService);
+        new PceConstraintsCalc(PceTestData.getPCE_test2_request_54(), networkTransactionService);
     }
 
 }
index a743d5cfa7c6b98a0db620165c779bf326d5fd7c..5ae6e3d91ed399bef03f0e9030c40d46691ee1da 100644 (file)
@@ -25,8 +25,6 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceOpticalNode;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceOtnNode;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceResult;
 import org.opendaylight.transportpce.pce.utils.NodeUtils;
-import org.opendaylight.transportpce.pce.utils.PceTestData;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestInput;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat;
@@ -42,7 +40,6 @@ public class PceGraphTest {
     private Node node = null;
     private PceLink pceLink = null;
     private PceGraph pceGraph = null;
-    private PathComputationRequestInput requestInput = PceTestData.getPCE_test2_request_54();
     private PceConstraints pceHardConstraints = null;
     private PceResult rc = null;
     private PceOpticalNode pceOpticalNode = null;
index 1dbb641f69212240cb3028203e6eb3662853a0c5..07fe8b14e789696946bd941f7defc23a23641988 100644 (file)
@@ -110,7 +110,6 @@ public class PceLinkTest extends AbstractTest {
                 OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1,
                 GridConstant.SLOT_WIDTH_50, GridConstant.SLOT_WIDTH_50);
         pceLink = new PceLink(link, pceOpticalNode, pceOpticalNode);
-
     }
 
     @Test
@@ -164,7 +163,6 @@ public class PceLinkTest extends AbstractTest {
         Assert.assertNotNull(pceLink.getdestCLLI());
         Assert.assertTrue(pceLink.toString().equals("PceLink type=" + pceLink.getlinkType()
                 + " ID=" + pceLink.getLinkId().getValue() + " latency=" + pceLink.getLatency().intValue()));
-
     }
 
     @Test(expected = NullPointerException.class)
@@ -173,10 +171,7 @@ public class PceLinkTest extends AbstractTest {
         Node node = node1Builder.build();
         Assert.assertNotNull(node.augmentation(Node1.class));
         // OpenroadmNodeType nodeType = node.augmentation(Node1.class).;
-
-        PceOtnNode pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.SRG, node.getNodeId(), "otn", "serviceType",
-            null);
-
+        new PceOtnNode(node, OpenroadmNodeType.SRG, node.getNodeId(), "otn", "serviceType", null);
     }
 
     private static LinkBuilder createOTNLink(String srcNode, String destNode, String srcTp, String destTp) {
@@ -184,10 +179,8 @@ public class PceLinkTest extends AbstractTest {
                 .setLinkType(OpenroadmLinkType.OTNLINK)
                 .setOperationalState(State.InService)
                 .setAdministrativeState(AdminStates.InService);
-
         //create source link
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
-
     }
 
     private static LinkBuilder createXponderLink(String srcNode, String destNode, String srcTp, String destTp) {
@@ -195,10 +188,8 @@ public class PceLinkTest extends AbstractTest {
                 .setLinkType(OpenroadmLinkType.XPONDERINPUT)
                 .setAdministrativeState(AdminStates.InService)
                 .setOperationalState(State.InService);
-
         //create source link
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
-
     }
 
     private static LinkBuilder createLinkBuilder(
@@ -239,9 +230,7 @@ public class PceLinkTest extends AbstractTest {
                 .setOMSAttributes(omsAttributesBuilder
                         .build());
 
-
         linkBuilder.addAugmentation(linkBuilderNetworkLink.build());
-
         return linkBuilder;
     }
 
@@ -252,7 +241,6 @@ public class PceLinkTest extends AbstractTest {
                 .setOperationalState(State.InService)
                 .setLinkType(OpenroadmLinkType.ROADMTOROADM);
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
-
     }
 
     private static LinkBuilder createRoadmToRoadmWithoutLinkLatency(
@@ -260,7 +248,6 @@ public class PceLinkTest extends AbstractTest {
         Link1Builder link1Builder = new Link1Builder()
                 .setLinkType(OpenroadmLinkType.ROADMTOROADM);
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
-
     }
 
     private Map<SupportingNodeKey,SupportingNode> geSupportingNodes() {
@@ -282,8 +269,6 @@ public class PceLinkTest extends AbstractTest {
     }
 
     private NodeBuilder getNodeBuilder(Map<SupportingNodeKey,SupportingNode> supportingNodes1) {
-
-
         //update tp of nodes
         TerminationPointBuilder xpdrTpBldr = new TerminationPointBuilder()
                 .withKey(new TerminationPointKey(new TpId("xpdr")));
@@ -298,8 +283,6 @@ public class PceLinkTest extends AbstractTest {
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 node11 =
             new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
                 .setOperationalState(State.InService).setAdministrativeState(AdminStates.InService).build();
-
-
         return new NodeBuilder()
                 .setNodeId(new NodeId("node 1"))
                 .withKey(new NodeKey(new NodeId("node 1")))
index da59ba14cb0cedd67f8df70a257b02a1b22883fc..bcf5131a1c75466164aa8d54737efcb7cc97f3fb 100644 (file)
@@ -102,7 +102,6 @@ public class PceOtnNodeTest extends AbstractTest {
         Assert.assertFalse("not valid otn service type", pceOtnNode.isValid());
         Assert.assertTrue("this.nodeType isn'tOpenroadmNodeType.TPDR" ,
                 pceOtnNode.validateSwitchingPoolBandwidth(null,null,1L));
-
     }
 
     @Test
@@ -127,7 +126,6 @@ public class PceOtnNodeTest extends AbstractTest {
         pceOtnNode.checkAvailableTribSlot();
         Assert.assertFalse("not valid otn service type" , pceOtnNode.isValid());
         Assert.assertFalse("checkTp returns false by default " , pceOtnNode.checkTP("tp"));
-
     }
 
     private Map<SupportingNodeKey, SupportingNode> geSupportingNodes() {
@@ -184,33 +182,6 @@ public class PceOtnNodeTest extends AbstractTest {
                 .setSupportingNode(supportingNodes1);
     }
 
-    private NodeBuilder getNodeBuilderEmpty(Map<SupportingNodeKey,SupportingNode> supportingNodes1,
-            OpenroadmTpType openroadmTpType) {
-
-        TerminationPoint1Builder tp1Bldr = getTerminationPoint1Builder(openroadmTpType);
-        TerminationPointBuilder xpdrTpBldr = getTerminationPointBuilder(openroadmTpType);
-        xpdrTpBldr.addAugmentation(tp1Bldr.build());
-        xpdrTpBldr.addAugmentation(createAnotherTerminationPoint(openroadmTpType).build());
-
-        org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1 node1 = getNode1Empty();
-        TerminationPoint xpdr = xpdrTpBldr.build();
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 node1Rev180226 =
-                new Node1Builder()
-                        .setTerminationPoint(Map.of(xpdr.key(),xpdr))
-                        .build();
-        Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
-                .setOperationalState(State.InService).setAdministrativeState(AdminStates.InService).build();
-
-
-        return new NodeBuilder()
-                .setNodeId(new NodeId("node_test"))
-                .withKey(new NodeKey(new NodeId("node 1")))
-                .addAugmentation(node1Rev180226)
-                .addAugmentation(node1)
-                .addAugmentation(node11)
-                .setSupportingNode(supportingNodes1);
-    }
-
     private org.opendaylight
             .yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1 getNode1() {
         return new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1Builder()
@@ -219,14 +190,6 @@ public class PceOtnNodeTest extends AbstractTest {
                 .build();
     }
 
-    private org.opendaylight
-            .yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1 getNode1Empty() {
-        return new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1Builder()
-                .setSrgAttributes(getEmptySrgAttributes())
-                .setDegreeAttributes(getEmptyDegAttributes())
-                .build();
-    }
-
     private DegreeAttributes getDegAttributes() {
         return new DegreeAttributesBuilder()
                 .setAvailFreqMaps(GridUtils.initFreqMaps4FixedGrid2Available())
@@ -237,16 +200,6 @@ public class PceOtnNodeTest extends AbstractTest {
         return new SrgAttributesBuilder().setAvailFreqMaps(GridUtils.initFreqMaps4FixedGrid2Available()).build();
     }
 
-    private DegreeAttributes getEmptyDegAttributes() {
-        return (new DegreeAttributesBuilder())
-                .setAvailFreqMaps(Map.of())
-                .build();
-    }
-
-    private SrgAttributes getEmptySrgAttributes() {
-        return new SrgAttributesBuilder().setAvailFreqMaps(Map.of()).build();
-    }
-
     private TerminationPointBuilder getTerminationPointBuilder(OpenroadmTpType openroadmTpType) {
         return new TerminationPointBuilder()
                 .setTpId(new TpId("2"))
@@ -320,5 +273,4 @@ public class PceOtnNodeTest extends AbstractTest {
                 .setTpType(openroadmTpType).setOperationalState(State.InService)
                 .setAdministrativeState(AdminStates.InService);
     }
-
 }
index c021fe29fd970576c95e71ceb1cf1a9157499532..4d5f0df891b793b0c892609e4ecfaee977970352 100644 (file)
@@ -14,13 +14,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.transportpce.pce.gnpy.GnpyResult;
-import org.opendaylight.transportpce.pce.gnpy.GnpyTopoImpl;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.transportpce.test.DataStoreContext;
 import org.opendaylight.yang.gen.v1.gnpy.path.rev220221.PathBandwidth;
 import org.opendaylight.yang.gen.v1.gnpy.path.rev220221.generic.path.properties.PathPropertiesBuilder;
 import org.opendaylight.yang.gen.v1.gnpy.path.rev220221.generic.path.properties.path.properties.PathMetric;
@@ -36,16 +32,10 @@ public class PathComputationServiceImplTest extends AbstractTest {
 
     private PathComputationServiceImpl pathComputationServiceImpl;
     private static NetworkTransactionService networkTransactionService = null;
-    private static GnpyTopoImpl gnpyTopoImpl = null;
-    private static GnpyResult gnpyResult = null;
-    private DataStoreContext dataStoreContext = getDataStoreContextUtil();
-    private DataBroker dataBroker = getDataBroker();
 
     @Before
     public void setUp() {
         networkTransactionService = Mockito.mock(NetworkTransactionService.class);
-        gnpyTopoImpl = Mockito.mock(GnpyTopoImpl.class);
-        gnpyResult = Mockito.mock(GnpyResult.class);
         pathComputationServiceImpl = new PathComputationServiceImpl(
                 networkTransactionService,
                 this.getNotificationPublishService(), null, null);
index 0c54e6316b0694fbb668033b1f5a3a5796306126..be299d89bf3b1545cf23731424fcfc589f888606 100644 (file)
@@ -31,7 +31,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-
 public final class JsonUtil {
     private static final Logger LOG = LoggerFactory.getLogger(JsonUtil.class);
     private static JsonUtil instance;
@@ -74,7 +73,6 @@ public final class JsonUtil {
             LOG.error("Cannot deserialize JSON ", e);
             return null;
         }
-
     }
 
     public BindingDOMCodecServices getBindingDOMCodecServices() {
index ab319820404389abcb9c735a83032f815eb0b614..0590450b4087f12043c9e4cfcfea00df4aa8a11e 100644 (file)
@@ -8,28 +8,18 @@
 
 package org.opendaylight.transportpce.pce.utils;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.common.fixedflex.GridUtils;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.FiberPmd;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLink;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLinkKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.amplified.link.SectionElementBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenation;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenationBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenationKey;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.link.OMSAttributesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.link.oms.attributes.AmplifiedLinkBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.link.oms.attributes.SpanBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributesBuilder;
@@ -74,10 +64,9 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
-public class NodeUtils {
+public final class NodeUtils {
 
     private static final String LINK_ID_FORMAT = "%1$s-%2$sto%3$s-%4$s";
 
@@ -91,10 +80,6 @@ public class NodeUtils {
         LinkId linkId = new LinkId(String.format(LINK_ID_FORMAT, srcNode, srcTp, destNode, destTp));
 
         LinkId oppositeLinkId = new LinkId("OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1");
-        //For setting up attributes for openRoadm augment
-        OMSAttributesBuilder omsAttributesBuilder =
-                new OMSAttributesBuilder();
-
         // Augementation
         Augmentation<Link> aug11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529
                 .Link1Builder()
@@ -103,7 +88,6 @@ public class NodeUtils {
                         .setSpan(new SpanBuilder().build())
                         .build())
                 .build();
-
         return new LinkBuilder()
                 .setSource(ietfSrcLinkBldr.build())
                 .setDestination(ietfDestLinkBldr.build())
@@ -162,8 +146,6 @@ public class NodeUtils {
         Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
             .setAdministrativeState(AdminStates.InService)
             .setOperationalState(State.InService).build();
-
-
         return new NodeBuilder()
                 .setNodeId(new NodeId("node 1"))
                 .withKey(new NodeKey(new NodeId("node 1")))
@@ -172,101 +154,6 @@ public class NodeUtils {
                 .setSupportingNode(supportingNodes1);
     }
 
-    private Link genereateLinkBuilder() {
-
-        Map<LinkConcatenationKey,LinkConcatenation> linkConcentationValues = new HashMap<>();
-        LinkConcatenation linkConcatenation = new LinkConcatenationBuilder()
-                .setFiberType(LinkConcatenation.FiberType.Truewave)
-                .setPmd(new FiberPmd(BigDecimal.ONE))
-                .setSRLGId(Uint32.valueOf(1))
-                .setSRLGLength(Uint32.valueOf(1))
-                .build();
-        LinkConcatenation linkConcatenation2 = new LinkConcatenationBuilder()
-                .setFiberType(LinkConcatenation.FiberType.Truewave)
-                .setPmd(new FiberPmd(BigDecimal.ONE))
-                .setSRLGId(Uint32.valueOf(1))
-                .setSRLGLength(Uint32.valueOf(1))
-                .build();
-        linkConcentationValues.put(linkConcatenation.key(),linkConcatenation);
-        linkConcentationValues.put(linkConcatenation2.key(),linkConcatenation2);
-
-        Map<AmplifiedLinkKey,AmplifiedLink>
-                amplifiedLinkValues = new HashMap<>();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLink al =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
-                        .AmplifiedLinkBuilder().setSectionElement(new SectionElementBuilder()
-                        .setSectionElement(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529
-                                .amplified.link.attributes.amplified.link.section.element.section.element
-                                .SpanBuilder()
-                                .setSpan(
-                                        new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified
-                                                .link.attributes.amplified.link.section.element.section
-                                                .element.span.SpanBuilder()
-                                                .setAdministrativeState(AdminStates.InService)
-                                                .setAutoSpanloss(true)
-                                                .setEngineeredSpanloss(new RatioDB(BigDecimal.ONE))
-                                                .setLinkConcatenation(linkConcentationValues)
-                                                .setSpanlossBase(new RatioDB(BigDecimal.ONE))
-                                                .setSpanlossCurrent(new RatioDB(BigDecimal.ONE))
-                                                .build())
-                                .build())
-                        .build())
-                        .setSectionEltNumber(Uint16.valueOf(1)).build();
-        org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLink al2 =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
-                        .AmplifiedLinkBuilder().setSectionElement(new SectionElementBuilder()
-                        .setSectionElement(
-                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link
-                                        .attributes.amplified.link.section.element.section.element.SpanBuilder()
-                                        .setSpan(
-                                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529
-                                                        .amplified.link
-                                                        .attributes.amplified.link.section.element.section.element.span
-                                                        .SpanBuilder()
-                                                        .setAdministrativeState(AdminStates.InService)
-                                                        .setAutoSpanloss(true)
-                                                        .setEngineeredSpanloss(new RatioDB(BigDecimal.ONE))
-                                                        .setLinkConcatenation(linkConcentationValues)
-                                                        .setSpanlossBase(new RatioDB(BigDecimal.ONE))
-                                                        .setSpanlossCurrent(new RatioDB(BigDecimal.ONE))
-                                                        .build())
-                                        .build())
-                        .build())
-                        .setSectionEltNumber(Uint16.valueOf(1)).build();
-
-        amplifiedLinkValues.put(al.key(),al);
-        amplifiedLinkValues.put(al2.key(),al2);
-        Augmentation<Link> aug11 =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Link1Builder()
-                        .setAmplified(true)
-                        .setOMSAttributes(new OMSAttributesBuilder()
-                                .setAmplifiedLink(new AmplifiedLinkBuilder()
-                                        .setAmplifiedLink(amplifiedLinkValues)
-                                        .build())
-                                .setSpan(new SpanBuilder().build())
-                                .build())
-                        .build();
-        Augmentation<Link> aug111 = new Link1Builder().setAdministrativeState(AdminStates.InService)
-                .setOperationalState(State.InService).build();
-
-        TransactionUtils.getNetworkForSpanLoss();
-        return new LinkBuilder()
-                .setLinkId(new LinkId("OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1"))
-                .setSource(
-                        new SourceBuilder()
-                                .setSourceNode(new NodeId("OpenROADM-3-2-DEG1"))
-                                .setSourceTp(new TpId("DEG1-TTP-TX")).build())
-                .setDestination(
-                        new DestinationBuilder()
-                                .setDestNode(new NodeId("OpenROADM-3-1-DEG1"))
-                                .setDestTp(new TpId("DEG1-TTP-RX")).build())
-                .addAugmentation(aug11)
-                .addAugmentation(aug111)
-                .build();
-
-
-    }
-
     // OTN network node
     public static List<SupportingNode> getOTNSupportingNodes() {
         List<SupportingNode> supportingNodes1 = new ArrayList<>();
@@ -334,8 +221,6 @@ public class NodeUtils {
                 new Node1Builder()
                         .setTerminationPoint(Map.of(xpdr.key(),xpdr))
                         .build();
-
-
         return new NodeBuilder()
                 .setNodeId(new NodeId("node_test"))
                 .withKey(new NodeKey(new NodeId("node 1")))
@@ -455,4 +340,7 @@ public class NodeUtils {
                 .setTpType(openroadmTpType);
     }
 
+    private NodeUtils() {
+        throw new IllegalStateException("Utility class");
+    }
 }
index 945f920b097ceb4b9babf8524052f412194ae2b7..a9d34d6a6177fba70efd91f72d99ba55092e07ac 100644 (file)
@@ -68,31 +68,28 @@ public final class PceTestData {
         ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder()
                 .setRequestId("request1")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .build();
     }
 
     public static PathComputationRequestInput getEmptyPCERequestServiceNameWithRequestId() {
         ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder()
                 .setRequestId("request1")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("serviceName")
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("serviceName")
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .build();
     }
 
     public static PathComputationRequestInput getEmptyPCERequestServiceNameWithOutRequestId() {
         ServiceHandlerHeader serviceHandlerHeader = new ServiceHandlerHeaderBuilder()
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("serviceName")
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("serviceName")
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .build();
     }
 
     public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral2() {
@@ -155,37 +152,35 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setLocallyProtectedLinks(true)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestInput getPathComputationRequestInputWithCoRoutingOrGeneral() {
@@ -248,37 +243,35 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setLocallyProtectedLinks(true)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestInput getPCERequest() {
@@ -341,36 +334,35 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setLocallyProtectedLinks(true)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestOutput getFailedPCEResultYes() {
@@ -430,15 +422,14 @@ public final class PceTestData {
                 .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-2")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .build();
     }
 
     /**
@@ -502,26 +493,25 @@ public final class PceTestData {
                 .setHopType(new HopTypeBuilder()
                         .setHopType(new HopTypeBuilder().getHopType()).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCoRoutingOrGeneral(new GeneralBuilder()
-                                .setExclude(new ExcludeBuilder()
-                                        .setNodeId(Arrays.asList("OpenROADM-2-2"))
-                                        .build())
-                                .setLatency(new LatencyBuilder().setMaxLatency(Uint32.valueOf(3223)).build())
-                                .setInclude(new IncludeBuilder()
-                                        .setOrderedHops(Map.of(orderedHops.key(),orderedHops))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCoRoutingOrGeneral(new GeneralBuilder()
+                            .setExclude(new ExcludeBuilder()
+                                    .setNodeId(Arrays.asList("OpenROADM-2-2"))
+                                    .build())
+                            .setLatency(new LatencyBuilder().setMaxLatency(Uint32.valueOf(3223)).build())
+                            .setInclude(new IncludeBuilder()
+                                    .setOrderedHops(Map.of(orderedHops.key(),orderedHops))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     /**
@@ -582,22 +572,21 @@ public final class PceTestData {
                 .setServiceFormat(ServiceFormat.Ethernet)
                 .setNodeId("XPONDER-3-2")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCoRoutingOrGeneral(new GeneralBuilder()
-                                .setExclude(new ExcludeBuilder()
-                                        .setNodeId(Arrays.asList("OpenROADM-2-1", "OpenROADM-2-2"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCoRoutingOrGeneral(new GeneralBuilder()
+                            .setExclude(new ExcludeBuilder()
+                                    .setNodeId(Arrays.asList("OpenROADM-2-1", "OpenROADM-2-2"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     /**
@@ -629,17 +618,16 @@ public final class PceTestData {
                 .build();
         HardConstraints hardConstrains = new HardConstraintsBuilder().build();
         SoftConstraints softConstraints = new SoftConstraintsBuilder().build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(hardConstrains)
-                .setSoftConstraints(softConstraints)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(hardConstrains)
+            .setSoftConstraints(softConstraints)
+            .build();
     }
 
     public static PathComputationRequestInput getPCE_simpletopology_test1_request() {
@@ -654,15 +642,14 @@ public final class PceTestData {
                 .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-2")
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceName("service 1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder()
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceName("service 1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .build();
     }
 
     public static PathComputationRequestOutput getPCE_simpletopology_test1_result(Long wl) {
@@ -694,11 +681,10 @@ public final class PceTestData {
                 .setRate(Uint32.valueOf(zaRate))
                 .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength))
                 .build();
-        PathDescription pathDescription = new PathDescriptionBuilder()
-                .setAToZDirection(atozDirection)
-                .setZToADirection(ztoaDirection)
-                .build();
-        return pathDescription;
+        return new PathDescriptionBuilder()
+            .setAToZDirection(atozDirection)
+            .setZToADirection(ztoaDirection)
+            .build();
     }
 
     /**
@@ -746,23 +732,21 @@ public final class PceTestData {
                 .setServiceRate(Uint32.valueOf(0))
                 .setNodeId("XPONDER-3-1")
                 .build();
-
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder(base)
-                .setServiceName("service 2")
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCoRoutingOrGeneral(new GeneralBuilder()
-                                .setLatency(new LatencyBuilder()
-                                        .setMaxLatency(Uint32.valueOf(3223)).build())
-                                .setDiversity(new DiversityBuilder()
-                                        .setExistingService(Arrays.asList(base.getServiceName()))
-                                        .setExistingServiceApplicability(nodeTrue)
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+        return new PathComputationRequestInputBuilder(base)
+            .setServiceName("service 2")
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCoRoutingOrGeneral(new GeneralBuilder()
+                            .setLatency(new LatencyBuilder()
+                                    .setMaxLatency(Uint32.valueOf(3223)).build())
+                            .setDiversity(new DiversityBuilder()
+                                    .setExistingService(Arrays.asList(base.getServiceName()))
+                                    .setExistingServiceApplicability(nodeTrue)
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 
     public static ServiceCreateInput buildServiceCreateInput() {
@@ -774,43 +758,41 @@ public final class PceTestData {
                         .setServiceRate(Uint32.valueOf(0))
                         .setNodeId(new NodeIdType("XPONDER-1-2"))
                         .setTxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .setRxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .build();
 
         org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input.ServiceZEnd serviceZEnd =
                 new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531
-                        .service.create.input.ServiceZEndBuilder()
+                            .service.create.input.ServiceZEndBuilder()
                         .setClli("clli")
                         .setServiceRate(Uint32.valueOf(0))
                         .setNodeId(new NodeIdType("XPONDER-3-2"))
                         .setTxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.TxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .setRxDirection(new org.opendaylight.yang.gen.v1.http.org
-                                .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
+                                    .openroadm.common.service.types.rev190531.service.endpoint.RxDirectionBuilder()
                                 .setPort(new PortBuilder().build())
                                 .build())
                         .build();
-
-        ServiceCreateInputBuilder builtInput = new ServiceCreateInputBuilder()
-                .setCommonId("commonId")
-                .setConnectionType(ConnectionType.Service)
-                .setCustomer("Customer")
-                .setServiceName("service 1")
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setSdncRequestHeader(new SdncRequestHeaderBuilder()
-                        .setRequestId("request 1")
-                        .build());
-
-        return builtInput.build();
+        return new ServiceCreateInputBuilder()
+            .setCommonId("commonId")
+            .setConnectionType(ConnectionType.Service)
+            .setCustomer("Customer")
+            .setServiceName("service 1")
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setSdncRequestHeader(new SdncRequestHeaderBuilder()
+                    .setRequestId("request 1")
+                    .build())
+            .build();
     }
 
     public static PathComputationRequestInput getGnpyPCERequest(String nodeA, String nodeZ) {
@@ -873,35 +855,34 @@ public final class PceTestData {
                                 .build()
                 ).build())
                 .build();
-        PathComputationRequestInput input = new PathComputationRequestInputBuilder()
-                .setServiceName("service1")
-                .setResourceReserve(true)
-                .setPceMetric(PceMetric.HopCount)
-                .setLocallyProtectedLinks(true)
-                .setServiceHandlerHeader(serviceHandlerHeader)
-                .setServiceAEnd(serviceAEnd)
-                .setServiceZEnd(serviceZEnd)
-                .setHardConstraints(new HardConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+        return new PathComputationRequestInputBuilder()
+            .setServiceName("service1")
+            .setResourceReserve(true)
+            .setPceMetric(PceMetric.HopCount)
+            .setLocallyProtectedLinks(true)
+            .setServiceHandlerHeader(serviceHandlerHeader)
+            .setServiceAEnd(serviceAEnd)
+            .setServiceZEnd(serviceZEnd)
+            .setHardConstraints(new HardConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .setSoftConstraints(new SoftConstraintsBuilder()
-                        .setCustomerCode(Arrays.asList("Some customer-code"))
-                        .setCoRoutingOrGeneral(new CoRoutingBuilder()
-                                .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .setSoftConstraints(new SoftConstraintsBuilder()
+                    .setCustomerCode(Arrays.asList("Some customer-code"))
+                    .setCoRoutingOrGeneral(new CoRoutingBuilder()
+                            .setCoRouting(new org.opendaylight.yang.gen.v1.http.org
                                         .transportpce.b.c._interface.routing.constraints.rev171017
                                         .constraints.sp.co.routing.or.general.co.routing.CoRoutingBuilder()
-                                        .setExistingService(Arrays.asList("Some existing-service"))
-                                        .build())
-                                .build())
-                        .build())
-                .build();
-        return input;
+                                    .setExistingService(Arrays.asList("Some existing-service"))
+                                    .build())
+                            .build())
+                    .build())
+            .build();
     }
 }
index 579cecbcd9fd75bf725bdd2f1b5623d22e9ee85b..008a62b765508fc392587346e90030c119982ee8 100644 (file)
@@ -10,7 +10,6 @@
 package org.opendaylight.transportpce.pce.utils;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -182,7 +181,6 @@ public final class TransactionUtils {
                         .setSectionEltNumber(Uint16.valueOf(1)).build();
         amplifiedLinkValues.put(al.key(),al);
         amplifiedLinkValues.put(al2.key(),al2);
-        Map<Class<? extends Augmentation<Link>>, Augmentation<Link>> map = Collections.emptyMap();
         Augmentation<Link> aug11 = new Link1Builder()
                 .setAmplified(true)
                 .setOMSAttributes(new OMSAttributesBuilder()
index 2cc20417a5445aa2a728bb5334aad55de871d3f7..b6f886fd56220fe5b05b0434f41ad122efdb1d13 100644 (file)
@@ -19,7 +19,6 @@ import org.mockito.Mockito;
 import org.opendaylight.mdsal.binding.api.MountPoint;
 import org.opendaylight.mdsal.binding.api.MountPointService;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.ResponseCodes;
 import org.opendaylight.transportpce.common.StringConstants;
@@ -65,7 +64,6 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest {
     private final OtnDeviceRendererService otnDeviceRendererService = Mockito.mock(OtnDeviceRendererService.class);
     private final PortMapping portMapping = Mockito.mock(PortMapping.class);
     private final CrossConnect crossConnect = Mockito.mock(CrossConnect.class);
-    private final ReadTransaction readTransaction = Mockito.mock(ReadTransaction.class);
     private TransportpceOlmService olmService;
 
     private void setMountPoint(MountPoint mountPoint) {
index 6c03f4847bfd903f0fda072c82428057a670d479..a954a7549622e72a3fa826cb01cf26a580513b0d 100644 (file)
@@ -14,7 +14,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.re
 public final class CreateOtsOmsDataUtils {
 
     private CreateOtsOmsDataUtils() {
-
     }
 
     public static CreateOtsOmsInput buildCreateOtsOms() {
index 7dbd80b333934ee6343df08732d4fdb7489b22c7..47092ef10278e0ac58741a6b38c1b9a495073f9f 100644 (file)
@@ -55,7 +55,6 @@ public final class MountPointUtils {
     }
 
     private MountPointUtils() {
-
     }
 
 }
index 23026431bdbf2e72470c9d081f456fbb42a3bd51..0bc478684066e791ae263097ff28f7c188234a07 100644 (file)
@@ -38,10 +38,6 @@ 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.rev210705.path.description.ztoa.direction.ZToABuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToAKey;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.ResourceBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.Link;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.LinkBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.Node;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.NodeBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPoint;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPointBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder;
@@ -56,7 +52,6 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 public final class ServiceDataUtils {
 
     private ServiceDataUtils() {
-
     }
 
     public static Nodes createNode(String nodeId, String srcTp, String dstTp) {
@@ -97,50 +92,6 @@ public final class ServiceDataUtils {
         return builder.build();
     }
 
-    /*public static ServiceImplementationRequestInput buildServiceImplementationRequestInputInvalidResource() {
-        ServiceImplementationRequestInputBuilder builder = new ServiceImplementationRequestInputBuilder()
-            .setServiceName("service 1").setPathDescription(createPathDescriptionInvalidResource())
-            .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().setRequestId("Request 1").build())
-            .setServiceAEnd(getServiceAEndBuild().build())
-            .setServiceZEnd(getServiceZEndBuild().build());
-        return builder.build();
-    }
-
-    public static ServiceImplementationRequestInput buildServiceImplementationRequestInputLinkResource() {
-        ServiceImplementationRequestInputBuilder builder = new ServiceImplementationRequestInputBuilder()
-            .setServiceName("service 1").setPathDescription(createPathDescriptionLinkResource())
-            .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder().setRequestId("Request 1").build())
-            .setServiceAEnd(getServiceAEndBuild().build())
-            .setServiceZEnd(getServiceZEndBuild().build());
-        return builder.build();
-    }*/
-
-    private static PathDescription createPathDescriptionInvalidResource() {
-        Map<AToZKey,AToZ> atoZMap = new HashMap<>();
-        Node node = new NodeBuilder().setNodeId("XPONDER-1-2").build();
-        AToZ atoZ = new AToZBuilder().setId("1").withKey(new AToZKey("1")).setResource(new ResourceBuilder()
-            .setResource(node).build()).build();
-        atoZMap.put(atoZ.key(),atoZ);
-        AToZDirection atozDirection = new AToZDirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setAToZWavelengthNumber(Uint32.valueOf(32))
-            .setAToZ(atoZMap)
-            .build();
-        Map<ZToAKey,ZToA> ztoAMap = new HashMap<>();
-        ZToA ztoA = new ZToABuilder().setId("1").withKey(new ZToAKey("1")).setResource(new ResourceBuilder()
-            .setResource(node).build()).build();
-        ztoAMap.put(ztoA.key(),ztoA);
-        ZToADirection ztoaDirection = new ZToADirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setZToAWavelengthNumber(Uint32.valueOf(20))
-            .setZToA(ztoAMap)
-            .build();
-        PathDescriptionBuilder builder = new PathDescriptionBuilder()
-            .setAToZDirection(atozDirection)
-            .setZToADirection(ztoaDirection);
-        return builder.build();
-    }
-
     public static PathDescription createPathDescriptionTerminationPointResource(String tpId) {
         Map<AToZKey,AToZ> atoZMap = new HashMap<>();
         TerminationPointBuilder terminationPointBuilder = new TerminationPointBuilder();
@@ -159,7 +110,6 @@ public final class ServiceDataUtils {
                 atoZMap.put(atoZ.key(),atoZ);
             }
         }
-        FrequencyTHz value;
         AToZDirection atozDirection = new AToZDirectionBuilder()
             .setRate(Uint32.valueOf(20))
             .setAToZWavelengthNumber(Uint32.valueOf(20))
@@ -197,39 +147,6 @@ public final class ServiceDataUtils {
         return builder.build();
     }
 
-    private static PathDescription createPathDescriptionLinkResource() {
-        Map<AToZKey,AToZ> atoZMap = new HashMap<>();
-        Link link1 = new LinkBuilder().setLinkId("link 1").build();
-        Link link2 = new LinkBuilder().setLinkId("link 2").build();
-        AToZ atoZ = new AToZBuilder().setId("1").withKey(new AToZKey("1")).setResource(new ResourceBuilder()
-            .setResource(link1).build()).build();
-        AToZ atoZ2 = new AToZBuilder().setId("1").withKey(new AToZKey("1")).setResource(new ResourceBuilder()
-            .setResource(link2).build()).build();
-        atoZMap.put(atoZ.key(),atoZ);
-        atoZMap.put(atoZ2.key(),atoZ2);
-        AToZDirection atozDirection = new AToZDirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setAToZWavelengthNumber(Uint32.valueOf(20))
-            .setAToZ(atoZMap)
-            .build();
-        Map<ZToAKey,ZToA> ztoAMap = new HashMap<>();
-        ZToA ztoA = new ZToABuilder().setId("1").withKey(new ZToAKey("1")).setResource(new ResourceBuilder()
-            .setResource(link1).build()).build();
-        ZToA ztoA2 = new ZToABuilder().setId("1").withKey(new ZToAKey("1")).setResource(new ResourceBuilder()
-            .setResource(link2).build()).build();
-        ztoAMap.put(ztoA.key(),ztoA);
-        ztoAMap.put(ztoA2.key(),ztoA2);
-        ZToADirection ztoaDirection = new ZToADirectionBuilder()
-            .setRate(Uint32.valueOf(20))
-            .setZToAWavelengthNumber(Uint32.valueOf(20))
-            .setZToA(ztoAMap)
-            .build();
-        PathDescriptionBuilder builder = new PathDescriptionBuilder()
-            .setAToZDirection(atozDirection)
-            .setZToADirection(ztoaDirection);
-        return builder.build();
-    }
-
     public static ServiceAEndBuilder getServiceAEndBuild(String tpId) {
         return new ServiceAEndBuilder()
             .setClli("clli").setServiceFormat(ServiceFormat.OC)
@@ -269,5 +186,4 @@ public final class ServiceDataUtils {
                         .setPortSubSlot("port subslot").setPortType("port type").build())
                     .build());
     }
-
 }
index bb42b4d87c6d384975aefa627bf1d0a7a8b45325..12627b3c47a87f5b4418132b958e7988e3bf22c6 100644 (file)
@@ -38,7 +38,6 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 public final class ServiceDeleteDataUtils {
 
     private ServiceDeleteDataUtils() {
-
     }
 
     public static PathDescription createTransactionPathDescription(String tpId) {
index 9ba7c51f9cfabca3745e99ff2f028815c7826c4d..031c8db994d85fc73a35c9b566848f084ccde6f4 100644 (file)
@@ -24,7 +24,7 @@ public final class TransactionUtils {
 
     }
 
-    @SuppressWarnings({ "unchecked", "deprecation", "rawtypes" })
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     // deviceTx.put needs the "true" boolean parameter at the end in order to not compromise the Junit test suite
     // FIXME check if the InstanceIdentifier raw type can be avoided
     // Raw types use are discouraged since they lack type safety.
index 0ca4f278b7b37e08af97453437f141924777cff8..75620c4aad6e1d6615138edeb32c669712805a7a 100644 (file)
@@ -73,13 +73,11 @@ public class ModelMappingUtilsTest extends AbstractTest {
     private ListeningExecutorService executorService;
     private CountDownLatch endSignal;
     private static final int NUM_THREADS = 5;
-    private boolean callbackRan;
 
     @Before
     public void setUp() {
         executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS));
         endSignal = new CountDownLatch(1);
-        callbackRan = false;
     }
 
     @After
@@ -228,7 +226,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceDeleteOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -252,7 +249,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceDeleteOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -278,7 +274,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceCreatOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -302,7 +297,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceCreatOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -328,7 +322,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceCreatOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -352,7 +345,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceCreatOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -378,7 +370,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceCreatOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -402,7 +393,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceCreatOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -424,7 +414,6 @@ public class ModelMappingUtilsTest extends AbstractTest {
         serviceRestorationOutputF.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
index 46289d95be7ea9ba040e5806952aa3edbfe6f6cb..f023384dbdbf5a3e1d839207b107b31030c1d19c 100644 (file)
@@ -87,13 +87,11 @@ public class ServicehandlerImplTest extends AbstractTest  {
     private ListeningExecutorService executorService;
     private CountDownLatch endSignal;
     private static final int NUM_THREADS = 5;
-    private boolean callbackRan;
 
     @Before
     public void setUp() {
         executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS));
         endSignal = new CountDownLatch(1);
-        callbackRan = false;
         MockitoAnnotations.openMocks(this);
         this.serviceDataStoreOperations = new ServiceDataStoreOperationsImpl(getNewDataBroker());
     }
@@ -109,7 +107,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -134,7 +131,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -158,7 +154,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -181,7 +176,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -208,7 +202,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -232,7 +225,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -258,7 +250,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -281,7 +272,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -308,7 +298,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -343,7 +332,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -366,7 +354,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -393,7 +380,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -428,7 +414,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -451,7 +436,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -477,7 +461,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -512,7 +495,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -536,7 +518,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -562,7 +543,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -593,7 +573,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -616,7 +595,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -644,7 +622,6 @@ public class ServicehandlerImplTest extends AbstractTest  {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
index d9daebff8286f0b9a8aa390cc6f5ad14bab8d2a1..4d9d872fa05b5588cc6282a3273e0a87af7d8df7 100644 (file)
@@ -25,12 +25,10 @@ import org.slf4j.LoggerFactory;
 public final class MockedNotificationServiceWrapper {
 
     private static final Logger LOG = LoggerFactory.getLogger(MockedNotificationServiceWrapper.class);
-    private final Notification publishedNotification;
     private final NotificationPublishService notificationPublishService;
     private Boolean rendererFailed = false;
 
     public MockedNotificationServiceWrapper(NotificationPublishService notificationPublishService) {
-        this.publishedNotification = null;
         this.notificationPublishService = notificationPublishService;
     }
 
index 49c25c7d66fb1daea003f7ecbac18cca4b58f330..e8b7d6de48e8e1958a41b048e243c8f28a57b892 100644 (file)
@@ -57,12 +57,9 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePathsBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public final class ModelMappingUtils {
-    private static final Logger LOG = LoggerFactory.getLogger(ModelMappingUtils.class);
 
+public final class ModelMappingUtils {
     private ModelMappingUtils() {
     }
 
index e0e1abdf3d321cc82dcd5ca2472fd1802f7a1b14..76f0e264c0da8c5beb565c356202a13a880a22e8 100644 (file)
@@ -100,7 +100,6 @@ public class TapiConnectivityImplTest extends AbstractTest {
     private ListeningExecutorService executorService;
     private CountDownLatch endSignal;
     private static final int NUM_THREADS = 5;
-    private boolean callbackRan;
 
     @Before
     public void setUp() throws InterruptedException, ExecutionException {
@@ -116,7 +115,6 @@ public class TapiConnectivityImplTest extends AbstractTest {
         TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil(),
             TapiTopologyDataUtils.PORTMAPPING_FILE);
 
-        callbackRan = false;
         MockitoAnnotations.openMocks(this);
 
         networkTransactionService = new NetworkTransactionImpl(
@@ -148,7 +146,6 @@ public class TapiConnectivityImplTest extends AbstractTest {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -177,7 +174,6 @@ public class TapiConnectivityImplTest extends AbstractTest {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -202,7 +198,6 @@ public class TapiConnectivityImplTest extends AbstractTest {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -228,7 +223,6 @@ public class TapiConnectivityImplTest extends AbstractTest {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
@@ -261,7 +255,6 @@ public class TapiConnectivityImplTest extends AbstractTest {
         result.addListener(new Runnable() {
             @Override
             public void run() {
-                callbackRan = true;
                 endSignal.countDown();
             }
         }, executorService);
index f60f634f62d3f695bc9b934833a9666886ba287a..a25b2bfd29718e369d259c253daf5b2c764dc51f 100644 (file)
@@ -104,14 +104,11 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
     private static final Logger LOG = LoggerFactory.getLogger(ConvertORTopoToFullTapiTopoTest.class);
 
     private static Node otnMuxA;
-    private static Node otnMuxC;
     private static Node otnSwitch;
     private static Node tpdr100G;
     private static Node roadmA;
     private static Node roadmC;
     private static Network openroadmNet;
-    private static Map<LinkKey, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
-        .networks.network.Link> otnLinks;
     private static Map<LinkKey, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
         .networks.network.Link> ortopoLinks;
     private static Uuid topologyUuid;
@@ -143,7 +140,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
             .child(Node.class, new NodeKey(new NodeId("SPDR-SC1-XPDR1")));
         FluentFuture<Optional<Node>> muxCFuture = dataBroker.newReadOnlyTransaction()
             .read(LogicalDatastoreType.CONFIGURATION, muxCIID);
-        otnMuxC = muxCFuture.get().get();
+        muxCFuture.get().get();
         KeyedInstanceIdentifier<Node, NodeKey> switchIID = InstanceIdentifier.create(Networks.class)
             .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
                 .class, new NetworkKey(new NetworkId("otn-topology")))
@@ -180,7 +177,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
             .augmentation(Network1.class);
         FluentFuture<Optional<Network1>> linksFuture = dataBroker.newReadOnlyTransaction()
             .read(LogicalDatastoreType.CONFIGURATION, linksIID);
-        otnLinks = linksFuture.get().get().getLink();
+        linksFuture.get().get().getLink();
 
         InstanceIdentifier<Network1> links1IID = InstanceIdentifier.create(Networks.class)
             .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network