Adding dependency between driver topology handlers and impl common handler to resolve...

[unimgr.git] / impl / src / test / java / org / opendaylight / unimgr / mef / nrp / impl / AbstractTestWithTopo.java

diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java
index da40cbaaee2fa60d1e66581921f46abdd994f0b5..9a878964d1d70648bc2b8f0cbdd8b64f809e7e5e 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java
@@ -28,6 +28,7 @@ import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBro
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
 import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
+import org.opendaylight.unimgr.mef.nrp.api.TopologyManager;
 import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
 import org.opendaylight.unimgr.mef.nrp.common.TapiUtils;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.*;
@@ -37,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.connectivity
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.Context1;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.link.*;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.node.OwnedNodeEdgePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.node.edge.point.LayerProtocolBuilder;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.risk.parameter.pac.RiskCharacteristicBuilder;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.*;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.context.*;
@@ -59,10 +59,13 @@ public abstract class AbstractTestWithTopo extends AbstractConcurrentDataBrokerT
 
     protected DataBroker dataBroker;
 
+    protected NrpInitializer topologyManager;
+
     @Before
     public void setupBroker() throws Exception {
         dataBroker = getDataBroker();
-        new NrpInitializer(dataBroker).init();
+        topologyManager = new NrpInitializer(dataBroker);
+        topologyManager.init();
     }
 
     protected  EndPoint ep(String nepId) {
@@ -79,11 +82,11 @@ public abstract class AbstractTestWithTopo extends AbstractConcurrentDataBrokerT
         return new EndPoint(ep, null);
     }
 
-    protected void l(ReadWriteTransaction tx, String nA, String nepA, String nB, String nepB, OperationalState state) {
-        l(tx, nA, nepA, nB, nepB, state, ForwardingDirection.BIDIRECTIONAL);
+    protected Link l(ReadWriteTransaction tx, String nA, String nepA, String nB, String nepB, OperationalState state) {
+        return l(tx, nA, nepA, nB, nepB, state, ForwardingDirection.BIDIRECTIONAL);
     }
 
-    protected void l(ReadWriteTransaction tx, String nA, String nepA, String nB, String nepB, OperationalState state, ForwardingDirection dir) {
+    protected Link l(ReadWriteTransaction tx, String nA, String nepA, String nB, String nepB, OperationalState state, ForwardingDirection dir) {
         Uuid uuid = new Uuid(nepA + "-" + nepB);
 
         NrpDao dao = new NrpDao(tx);
@@ -112,6 +115,7 @@ public abstract class AbstractTestWithTopo extends AbstractConcurrentDataBrokerT
                 .build();
 
         tx.put(LogicalDatastoreType.OPERATIONAL, NrpDao.topo(PRESTO_SYSTEM_TOPO).child(Link.class, new LinkKey(uuid)), link);
+        return link;
     }
 
     private LpTransition emptyLpTransition() {
@@ -187,7 +191,7 @@ public abstract class AbstractTestWithTopo extends AbstractConcurrentDataBrokerT
                     .forEach(nrpDao::addSip);
         }
 
-        return nrpDao.createSystemNode(node, eps.stream()
+        return nrpDao.createNode(TapiConstants.PRESTO_SYSTEM_TOPO, node, ETH.class, eps.stream()
                 .map(e-> {
                     OwnedNodeEdgePointBuilder builder = new OwnedNodeEdgePointBuilder()
                             .setLinkPortDirection(e.getDir())
@@ -203,7 +207,8 @@ public abstract class AbstractTestWithTopo extends AbstractConcurrentDataBrokerT
     protected Node getAbstractNode() {
 
         try(ReadOnlyTransaction tx = dataBroker.newReadOnlyTransaction()) {
-            Optional<Node> opt = tx.read(LogicalDatastoreType.OPERATIONAL,NRP_ABSTRACT_NODE_IID).checkedGet();
+            Optional<Node> opt =
+                    tx.read(LogicalDatastoreType.OPERATIONAL,NRP_ABSTRACT_NODE_IID).checkedGet();
             if (opt.isPresent()) {
                 return opt.get();
             } else {