Refining driver subsystem to facilitate coordinated start-up.
- for ONOS-6402
Change-Id: I7f64fc62ad1d451fcf55624b2422b60631a3c8e8
diff --git a/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java b/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
index a85046b..42b4863 100644
--- a/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
@@ -37,7 +37,9 @@
import org.onosproject.net.device.DeviceServiceAdapter;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.driver.DefaultDriver;
+import org.onosproject.net.driver.DriverRegistry;
import org.onosproject.net.driver.impl.DriverManager;
+import org.onosproject.net.driver.impl.DriverRegistryManager;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.group.DefaultGroup;
@@ -112,11 +114,12 @@
mgr.activate(null);
mgr.addListener(listener);
- driverService = new TestDriverManager();
- driverService.addDriver(new DefaultDriver("foo", ImmutableList.of(), "", "", "",
- ImmutableMap.of(GroupProgrammable.class,
- TestGroupProgrammable.class),
- ImmutableMap.of()));
+ DriverRegistryManager driverRegistry = new DriverRegistryManager();
+ driverService = new TestDriverManager(driverRegistry);
+ driverRegistry.addDriver(new DefaultDriver("foo", ImmutableList.of(), "", "", "",
+ ImmutableMap.of(GroupProgrammable.class,
+ TestGroupProgrammable.class),
+ ImmutableMap.of()));
internalProvider = new TestGroupProvider(PID);
provider = internalProvider;
@@ -747,7 +750,8 @@
}
private class TestDriverManager extends DriverManager {
- TestDriverManager() {
+ TestDriverManager(DriverRegistry registry) {
+ this.registry = registry;
this.deviceService = mgr.deviceService;
activate();
}
@@ -773,7 +777,7 @@
assertEquals(lastDeviceIdProgrammable, expectedDeviceId);
assertTrue(groupOperations.containsAll(expectedGroupOps) &&
- expectedGroupOps.containsAll(groupOperations));
+ expectedGroupOps.containsAll(groupOperations));
groupOperations.clear();
lastDeviceIdProgrammable = null;