Merge dev/fluorine work across to master

[unimgr.git] / template-driver / src / test / java / org / opendaylight / unimgr / mef / nrp / template / tapi / TopologyDataHandlerTest.java

diff --git a/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java b/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java
index 72387835d360146fafdc3125d36f19ba346563f4..5a3cd571e46690ae08e9a0968efb46a55c0eb6bd 100644 (file)
--- a/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java
+++ b/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java
@@ -18,7 +18,8 @@ import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
 import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
 import org.opendaylight.unimgr.mef.nrp.impl.AbstractTestWithTopo;
 import org.opendaylight.unimgr.mef.nrp.template.TemplateConstants;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.topology.context.Topology;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.NodeAdiAugmentation;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.context.Topology;
 
 /**
  * A simple integration test to look at the handler
@@ -42,7 +43,7 @@ public class TopologyDataHandlerTest extends AbstractTestWithTopo {
         ReadOnlyTransaction tx = dataBroker.newReadOnlyTransaction();
         Topology t = new NrpDao(tx).getTopology(TapiConstants.PRESTO_SYSTEM_TOPO);
         assertNotNull(t.getNode());
-        assertTrue(t.getNode().stream().anyMatch(n -> n.getUuid().getValue().equals(TemplateConstants.DRIVER_ID)));
+        assertTrue(t.getNode().stream().allMatch(n -> n.augmentation(NodeAdiAugmentation.class).getActivationDriverId().equals(TemplateConstants.DRIVER_ID)));
 
     }