| commit | fd629e8584dff1bea65c75bc0dc89afdb4e5353b | [log] [tgz] |
|---|---|---|
| author | alshabib <alshabibi.ali@gmail.com> | Wed Dec 03 13:20:22 2014 -0800 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Wed Dec 03 21:39:32 2014 +0000 |
| tree | dbd78fc37032770b6eb24a0945c79e8404415e0d | |
| parent | ff071a274990b97b484e19222f393cf486e4e5e8 [diff] |
Devices should not be disconnected when an instance shuts down. Change-Id: I0864c1f79b52e021c4ebbcd3a5bdb3eb7c3f1614
diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java index 8feb385..99a9650 100644 --- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java +++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -109,9 +109,6 @@ @Deactivate public void deactivate() { - for (OpenFlowSwitch sw : controller.getSwitches()) { - providerService.deviceDisconnected(DeviceId.deviceId(uri(sw.getId()))); - } providerRegistry.unregister(this); controller.removeListener(listener); providerService = null;
diff --git a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java index ab2a92e..8fb5b79 100644 --- a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java +++ b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
@@ -97,7 +97,6 @@ @After public void tearDown() { provider.deactivate(); - assertTrue("devices should be removed", registry.connected.isEmpty()); assertNull("listener should be removed", controller.listener); provider.controller = null; provider.providerRegistry = null;