Code Review / unimgr.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge dev/fluorine work across to master
[unimgr.git] / impl / src / test / java / org / opendaylight / unimgr / mef / nrp / impl / topologyservice / TapiTopologyServiceImplIntTest.java
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/topologyservice/TapiTopologyServiceImplIntTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/topologyservice/TapiTopologyServiceImplIntTest.java
index 58ce9a55f1674a29fc418747712601580a850ec0..d640350fb0848efd990e92cd797318287fc2872e 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/topologyservice/TapiTopologyServiceImplIntTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/topologyservice/TapiTopologyServiceImplIntTest.java
@@ -7,6 +7,11 @@
  */
 package org.opendaylight.unimgr.mef.nrp.impl.topologyservice;
 
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -15,24 +20,23 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile
 import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
 import org.opendaylight.unimgr.mef.nrp.impl.AbstractTestWithTopo;
 import org.opendaylight.unimgr.mef.nrp.impl.topologytervice.TapiTopologyServiceImpl;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.OperationalState;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.*;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.get.link.details.output.Link;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.get.topology.list.output.Topology;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.OperationalState;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetLinkDetailsInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetLinkDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetNodeDetailsInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetNodeDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyDetailsInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyListInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.GetTopologyListOutput;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.get.link.details.output.Link;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.get.topology.list.output.Topology;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
 
-/**
- * @author bartosz.michalik@amartus.com
- */
 public class TapiTopologyServiceImplIntTest extends AbstractTestWithTopo {
 
     private String uuid1 = "uuid1";
-    private String uuid2 = "uuid2";
 
     private TapiTopologyServiceImpl tapiTopologyService;
 
@@ -47,9 +51,10 @@ public class TapiTopologyServiceImplIntTest extends AbstractTestWithTopo {
     public void getTopologies() throws TransactionCommitFailedException, ExecutionException, InterruptedException {
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, uuid1, uuid1 + ":1", uuid1 + ":2", uuid1 + ":3");
-        tx.submit().checkedGet();
+        tx.commit().get();
 
-        RpcResult<GetTopologyListOutput> output = tapiTopologyService.getTopologyList().get();
+        RpcResult<GetTopologyListOutput> output = tapiTopologyService.getTopologyList(
+                new GetTopologyListInputBuilder().build()).get();
 
         Assert.assertTrue(output.isSuccessful());
 
@@ -60,13 +65,15 @@ public class TapiTopologyServiceImplIntTest extends AbstractTestWithTopo {
     }
 
     @Test
-    public void getTopologyUnknown() throws TransactionCommitFailedException, ExecutionException, InterruptedException {
+    public void getTopologyUnknown()
+            throws TransactionCommitFailedException, ExecutionException, InterruptedException {
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, uuid1, uuid1 + ":1", uuid1 + ":2", uuid1 + ":3");
-        tx.submit().checkedGet();
+        tx.commit().get();
 
         RpcResult<GetTopologyDetailsOutput> output = tapiTopologyService
-                .getTopologyDetails(new GetTopologyDetailsInputBuilder().setTopologyIdOrName("unknown").build()).get();
+                .getTopologyDetails(
+                        new GetTopologyDetailsInputBuilder().setTopologyIdOrName("unknown").build()).get();
 
         Assert.assertFalse(output.isSuccessful());
 
@@ -74,26 +81,32 @@ public class TapiTopologyServiceImplIntTest extends AbstractTestWithTopo {
 
 
     @Test
-    public void getTopologySystem() throws TransactionCommitFailedException, ExecutionException, InterruptedException {
+    public void getTopologySystem()
+            throws TransactionCommitFailedException, ExecutionException, InterruptedException {
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, uuid1, uuid1 + ":1", uuid1 + ":2", uuid1 + ":3");
-        tx.submit().checkedGet();
+        tx.commit().get();
 
         RpcResult<GetTopologyDetailsOutput> output = tapiTopologyService
-                .getTopologyDetails(new GetTopologyDetailsInputBuilder().setTopologyIdOrName(TapiConstants.PRESTO_SYSTEM_TOPO).build()).get();
+                .getTopologyDetails(
+                        new GetTopologyDetailsInputBuilder().setTopologyIdOrName(
+                                TapiConstants.PRESTO_SYSTEM_TOPO).build()).get();
 
         Assert.assertTrue(output.isSuccessful());
 
-        Assert.assertEquals(TapiConstants.PRESTO_SYSTEM_TOPO, output.getResult().getTopology().getUuid().getValue());
+        Assert.assertEquals(
+                TapiConstants.PRESTO_SYSTEM_TOPO,
+                output.getResult().getTopology().getUuid().getValue());
 
     }
 
 
     @Test
-    public void getTopologyNode() throws TransactionCommitFailedException, ExecutionException, InterruptedException {
+    public void getTopologyNode()
+            throws TransactionCommitFailedException, ExecutionException, InterruptedException {
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, uuid1, uuid1 + ":1", uuid1 + ":2", uuid1 + ":3");
-        tx.submit().checkedGet();
+        tx.commit().get();
 
         RpcResult<GetNodeDetailsOutput> output = tapiTopologyService
                 .getNodeDetails(new GetNodeDetailsInputBuilder()
@@ -108,10 +121,11 @@ public class TapiTopologyServiceImplIntTest extends AbstractTestWithTopo {
     }
 
     @Test
-    public void getTopologyNodeWrongTopology() throws TransactionCommitFailedException, ExecutionException, InterruptedException {
+    public void getTopologyNodeWrongTopology()
+            throws TransactionCommitFailedException, ExecutionException, InterruptedException {
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, uuid1, uuid1 + ":1", uuid1 + ":2", uuid1 + ":3");
-        tx.submit().checkedGet();
+        tx.commit().get();
 
         RpcResult<GetNodeDetailsOutput> output = tapiTopologyService
                 .getNodeDetails(new GetNodeDetailsInputBuilder()
@@ -124,10 +138,11 @@ public class TapiTopologyServiceImplIntTest extends AbstractTestWithTopo {
 
 
     @Test
-    public void getLinkNotFound() throws TransactionCommitFailedException, ExecutionException, InterruptedException {
+    public void getLinkNotFound()
+            throws TransactionCommitFailedException, ExecutionException, InterruptedException {
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, uuid1, uuid1 + ":1", uuid1 + ":2", uuid1 + ":3");
-        tx.submit().checkedGet();
+        tx.commit().get();
 
         RpcResult<GetLinkDetailsOutput> output = tapiTopologyService
                 .getLinkDetails(new GetLinkDetailsInputBuilder()
@@ -141,21 +156,23 @@ public class TapiTopologyServiceImplIntTest extends AbstractTestWithTopo {
     @Test
     public void getLink() throws TransactionCommitFailedException, ExecutionException, InterruptedException {
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
-        String linkId = uuid1 + "-" + uuid2;
+        String uuid2 = "uuid2";
         n(tx, uuid1, uuid1 + ":1", uuid1 + ":2", uuid1 + ":3");
         n(tx, uuid2, uuid2 + ":1", uuid2 + ":2", uuid2 + ":3");
-        org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.Link l = l(tx, uuid1, uuid1 + ":1", uuid2, uuid2 + ":1", OperationalState.ENABLED);
-        tx.submit().checkedGet();
+        org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.Link linkToCreate =
+                l(tx, uuid1, uuid1 + ":1", uuid2, uuid2 + ":1", OperationalState.ENABLED);
+        tx.commit().get();
 
         RpcResult<GetLinkDetailsOutput> output = tapiTopologyService
                 .getLinkDetails(new GetLinkDetailsInputBuilder()
-                        .setLinkIdOrName(l.getUuid().getValue())
+                        .setLinkIdOrName(linkToCreate.getUuid().getValue())
                         .setTopologyIdOrName(TapiConstants.PRESTO_SYSTEM_TOPO).build())
                 .get();
 
         Assert.assertTrue(output.isSuccessful());
         Link link = output.getResult().getLink();
-        Set<String> nodeUuids = link.getNode().stream().map(u -> u.getValue()).collect(Collectors.toSet());
+        Set<String> nodeUuids =
+                link.getNodeEdgePoint().stream().map(u -> u.getNodeId().getValue()).collect(Collectors.toSet());
         Assert.assertTrue(nodeUuids.contains(uuid1));
         Assert.assertTrue(nodeUuids.contains(uuid2));
     }
User Network Interface Manager plugin