Update portmapping YANG model

[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 048e5b695eb81f1ac648dbffd3eaa4ee350fedb3..1c48d576f5e4d87a61598184041324645f018fcc 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.rev201012.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfoBuilder;
+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.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;
@@ -49,13 +49,6 @@ public class ClliNetworkTest {
         assertEquals("Node id should be equals to NodeClliId ", new NodeId("NodeClliId"), createdNode.getNodeId());
     }
 
-    @Test
-    public void createNodeWithNullClliTest() {
-        NodeInfoBuilder nodeBldr = computeNodeInfoBuilderWithoutClli();
-        Node createdNode = ClliNetwork.createNode("XPDRA01", nodeBldr.build());
-        assertNull("Node id should be null", createdNode.getNodeId());
-    }
-
     private NodeInfoBuilder computeNodeInfoBuilder() {
         NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
             .setNodeClli("NodeClliId")
@@ -63,7 +56,7 @@ public class ClliNetworkTest {
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
             .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmVersion._121);
+            .setOpenroadmVersion(OpenroadmNodeVersion._121);
         return nodeBldr;
     }
 
@@ -73,7 +66,7 @@ public class ClliNetworkTest {
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
             .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmVersion._121);
+            .setOpenroadmVersion(OpenroadmNodeVersion._121);
         return nodeBldr;
     }
 }