mirror of
https://github.com/opennetworkinglab/onos.git
synced 2025-10-23 13:21:21 +02:00
Devices should not be disconnected when an instance shuts down.
Change-Id: I0864c1f79b52e021c4ebbcd3a5bdb3eb7c3f1614
This commit is contained in:
parent
ff071a2749
commit
fd629e8584
@ -109,9 +109,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
|
|||||||
|
|
||||||
@Deactivate
|
@Deactivate
|
||||||
public void deactivate() {
|
public void deactivate() {
|
||||||
for (OpenFlowSwitch sw : controller.getSwitches()) {
|
|
||||||
providerService.deviceDisconnected(DeviceId.deviceId(uri(sw.getId())));
|
|
||||||
}
|
|
||||||
providerRegistry.unregister(this);
|
providerRegistry.unregister(this);
|
||||||
controller.removeListener(listener);
|
controller.removeListener(listener);
|
||||||
providerService = null;
|
providerService = null;
|
||||||
|
@ -97,7 +97,6 @@ public class OpenFlowDeviceProviderTest {
|
|||||||
@After
|
@After
|
||||||
public void tearDown() {
|
public void tearDown() {
|
||||||
provider.deactivate();
|
provider.deactivate();
|
||||||
assertTrue("devices should be removed", registry.connected.isEmpty());
|
|
||||||
assertNull("listener should be removed", controller.listener);
|
assertNull("listener should be removed", controller.listener);
|
||||||
provider.controller = null;
|
provider.controller = null;
|
||||||
provider.providerRegistry = null;
|
provider.providerRegistry = null;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user