Clean JUnit tests

[transportpce.git] / networkmodel / src / test / java / org / opendaylight / transportpce / networkmodel / util / ClliNetworkTest.java

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
index d9983f4ea88bfe910f3d1095c3a941b1da5f2829..0fc973253453d387bb5a145fa34d2b4832e4d819 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
@@ -11,9 +11,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfoBuilder;
+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.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.Node1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
@@ -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(OpenroadmVersion._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(OpenroadmVersion._121);
-        return nodeBldr;
+            .setOpenroadmVersion(OpenroadmNodeVersion._121);
     }
 }