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=b5f9281b19dcebd635350fdb21c77f8f1e75a719;hb=41bcd9973fefe2dc01cbe1c246d31d6bdceba120;hp=a4a5bd767d05feebb1ff7418f404773e91568c9d;hpb=29e64054b07584f432b8f23a8bfd2cab2cad0427;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 a4a5bd767..b5f9281b1 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,12 +11,12 @@ 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.rev200429.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.NodeInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.Node1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.Node1Builder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.OpenroadmNodeVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.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;
 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.NodeId;
@@ -38,7 +38,7 @@ public class ClliNetworkTest {
         assertNull("SupportingNode should be null", createdNode.getSupportingNode());
         assertEquals("Node key should be equals to NodeClliId ", new NodeKey(new NodeId("NodeClliId")),
             createdNode.key());
-        assertEquals("Expect org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.Node1 augmentation",
+        assertEquals("Expect org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.Node1 augmentation",
             clliAugmentation, createdNode.augmentation(Node1.class));
     }
 
@@ -49,21 +49,14 @@ 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")
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(NodeTypes.Xpdr)
+            .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmVersion._121);
+            .setOpenroadmVersion(OpenroadmNodeVersion._121);
         return nodeBldr;
     }
 
@@ -71,9 +64,9 @@ public class ClliNetworkTest {
         NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(NodeTypes.Xpdr)
+            .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
-            .setOpenroadmVersion(OpenroadmVersion._121);
+            .setOpenroadmVersion(OpenroadmNodeVersion._121);
         return nodeBldr;
     }
 }