Enhancing driver subsystem to support asynchronous event notifications.
Change-Id: I6850aae4f660b8328378da98460529eb58531732
diff --git a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java
index 84649c0..ab0af5a 100644
--- a/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java
+++ b/apps/optical-model/src/test/java/org/onosproject/net/optical/intent/impl/compiler/OpticalCircuitIntentCompilerTest.java
@@ -50,8 +50,6 @@
import org.onosproject.net.driver.Behaviour;
import org.onosproject.net.driver.DefaultDriver;
import org.onosproject.net.driver.Driver;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
import org.onosproject.net.driver.DriverServiceAdapter;
import org.onosproject.net.driver.TestBehaviourImpl;
import org.onosproject.net.driver.TestBehaviourTwoImpl;
@@ -202,31 +200,7 @@
/**
* Mocks the driver service so it will appear supporting TributarySlotQuery Behaviour in the test.
*/
- private static class MockDriverServiceWithTs implements DriverService {
- @Override
- public Driver getDriver(String driverName) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Set<Driver> getDrivers() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Set<Driver> getDrivers(Class<? extends Behaviour> withBehaviour) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Driver getDriver(String mfr, String hw, String sw) {
- // TODO Auto-generated method stub
- return null;
- }
-
+ private static class MockDriverServiceWithTs extends DriverServiceAdapter {
@Override
public Driver getDriver(DeviceId deviceId) {
DefaultDriver ddp = new DefaultDriver("foo.base", new ArrayList<>(), "Circus", "lux", "1.2a",
@@ -237,43 +211,12 @@
ImmutableMap.of("foo", "bar"));
return ddp;
}
-
- @Override
- public DriverHandler createHandler(DeviceId deviceId,
- String... credentials) {
- // TODO Auto-generated method stub
- return null;
- }
}
/**
* Mocks the driver service so it will appear not-supporting TributarySlotQuery Behaviour in the test.
*/
- private static class MockDriverServiceNoTs implements DriverService {
- @Override
- public Driver getDriver(String driverName) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Set<Driver> getDrivers() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Set<Driver> getDrivers(Class<? extends Behaviour> withBehaviour) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Driver getDriver(String mfr, String hw, String sw) {
- // TODO Auto-generated method stub
- return null;
- }
-
+ private static class MockDriverServiceNoTs extends DriverServiceAdapter {
@Override
public Driver getDriver(DeviceId deviceId) {
DefaultDriver ddp = new DefaultDriver("foo.base", new ArrayList<>(), "Circus", "lux", "1.2a",
@@ -282,13 +225,6 @@
ImmutableMap.of("foo", "bar"));
return ddp;
}
-
- @Override
- public DriverHandler createHandler(DeviceId deviceId,
- String... credentials) {
- // TODO Auto-generated method stub
- return null;
- }
}
private static class MockIntentSetMultimap implements IntentSetMultimap {