홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
Committed by Gerrit Code Review
fd629e85 1 parent ff071a27

Devices should not be disconnected when an instance shuts down. 

Change-Id: I0864c1f79b52e021c4ebbcd3a5bdb3eb7c3f1614
Inline Side-by-side
Showing 2 changed files with 0 additions and 4 deletions
...@@ -109,9 +109,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr ...@@ -109,9 +109,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
109 109
110 @Deactivate 110 @Deactivate
111 public void deactivate() { 111 public void deactivate() {
112 - for (OpenFlowSwitch sw : controller.getSwitches()) {
113 - providerService.deviceDisconnected(DeviceId.deviceId(uri(sw.getId())));
114 - }
115 providerRegistry.unregister(this); 112 providerRegistry.unregister(this);
116 controller.removeListener(listener); 113 controller.removeListener(listener);
117 providerService = null; 114 providerService = null;
......
...@@ -97,7 +97,6 @@ public class OpenFlowDeviceProviderTest { ...@@ -97,7 +97,6 @@ public class OpenFlowDeviceProviderTest {
97 @After 97 @After
98 public void tearDown() { 98 public void tearDown() {
99 provider.deactivate(); 99 provider.deactivate();
100 - assertTrue("devices should be removed", registry.connected.isEmpty());
101 assertNull("listener should be removed", controller.listener); 100 assertNull("listener should be removed", controller.listener);
102 provider.controller = null; 101 provider.controller = null;
103 provider.providerRegistry = null; 102 provider.providerRegistry = null;
......