X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FClliNetworkTest.java;h=0fc973253453d387bb5a145fa34d2b4832e4d819;hb=e28bd03204e0c521f98d9c338ac48ed3a5188ffa;hp=1c48d576f5e4d87a61598184041324645f018fcc;hpb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;p=transportpce.git 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 1c48d576f..0fc973253 100644 --- 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.rev210315.OpenroadmNodeVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.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(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; } }