Cleaning up intent tests setup/teardown to avoid cascading failures
with respect to binding ID generator.
Change-Id: Ia4778f16ff5a3ecb26062e7d7b2c36493081140d
diff --git a/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockCoreService.java b/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockCoreService.java
index d63c5e6..cf854b4 100644
--- a/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockCoreService.java
+++ b/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockCoreService.java
@@ -15,9 +15,6 @@
*/
package org.onosproject.drivers.netconf;
-import java.util.HashSet;
-import java.util.Set;
-
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.core.DefaultApplicationId;
@@ -25,6 +22,9 @@
import org.onosproject.core.Version;
import org.onosproject.net.intent.MockIdGenerator;
+import java.util.HashSet;
+import java.util.Set;
+
public class MockCoreService implements CoreService {
private HashSet<ApplicationId> appIds;
@@ -35,7 +35,6 @@
appIds = new HashSet<ApplicationId>();
appIds.add(new DefaultApplicationId(101, "org.onosproject.drivers.netconf"));
version = Version.version(1, 1, "1", "1");
- idGenerator = new MockIdGenerator();
}
@Override
@@ -83,7 +82,7 @@
@Override
public IdGenerator getIdGenerator(String topic) {
- return idGenerator;
+ return MockIdGenerator.INSTANCE;
}
}