Port-mapping changes to support 7.1.0 models

[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 a4a5bd767d05feebb1ff7418f404773e91568c9d..e30849972e703dd355a7dc12166eb01c424aa712 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,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.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.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.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;
@@ -61,7 +61,8 @@ public class ClliNetworkTest {
             .setNodeClli("NodeClliId")
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(NodeTypes.Xpdr)
+            .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129
+                .NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
             .setOpenroadmVersion(OpenroadmVersion._121);
         return nodeBldr;
@@ -71,7 +72,8 @@ public class ClliNetworkTest {
         NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(NodeTypes.Xpdr)
+            .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129
+                .NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
             .setOpenroadmVersion(OpenroadmVersion._121);
         return nodeBldr;