package org.opendaylight.transportpce.networkmodel.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.OpenroadmNodeVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
public class OpenRoadmNetworkTest {
@Test
- public void createXpdrNodeTest() {
+ void createXpdrNodeTest() {
NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Xpdr, "nodeA");
Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
assertEquals("XPDRA01", createdNode.getNodeId().getValue());
}
@Test
- public void createRdmNodeTest() {
+ void createRdmNodeTest() {
NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Rdm, "nodeA");
Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
assertEquals("XPDRA01", createdNode.getNodeId().getValue());
}
@Test
- public void createNodeWithBadNodeTypeTest() {
+ void createNodeWithBadNodeTypeTest() {
NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Ila, "nodeA");
Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
assertEquals("XPDRA01", createdNode.getNodeId().getValue());
- assertNull("NodeType should be ROADM or XPONDER", createdNode.augmentation(Node1.class).getNodeType());
+ assertNull(createdNode.augmentation(Node1.class).getNodeType(), "NodeType should be ROADM or XPONDER");
supportingNodeTest(nodeInfo.getNodeClli(), createdNode);
}
- @Ignore
@Test
- public void createNodeWithoutClliTest() {
+ void createNodeWithoutClliTest() {
NodeInfo nodeInfo = computeNodeInfo(NodeTypes.Xpdr, null);
- Node createdNode = OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
- assertEquals("XPDRA01", createdNode.getNodeId().getValue());
- assertEquals("XPONDER", createdNode.augmentation(Node1.class).getNodeType().getName());
- assertEquals(0, createdNode.getSupportingNode().size());
+ Exception exception = assertThrows(NullPointerException.class, () -> {
+ OpenRoadmNetwork.createNode("XPDRA01", nodeInfo);
+ });
+ assertTrue("Supplied value may not be null".contains(exception.getMessage()));
}
private NodeInfo computeNodeInfo(NodeTypes nodeType, String clli) {
.setNodeType(nodeType)
.setNodeClli(clli)
.setNodeVendor("VendorA")
- .setOpenroadmVersion(OpenroadmVersion._121)
+ .setOpenroadmVersion(OpenroadmNodeVersion._121)
.build();
}
private void supportingNodeTest(String clli, Node createdNode) {
SupportingNode supportingNode = computeSupportingNode(clli);
assertEquals(1, createdNode.getSupportingNode().size());
- assertEquals(supportingNode, createdNode.getSupportingNode().get(0));
+ List<SupportingNode> supportingNodeList = new ArrayList<>(createdNode.nonnullSupportingNode().values());
+ assertEquals(supportingNode, supportingNodeList.get(0));
}
}
\ No newline at end of file