홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Hyunsun Moon
Committed by Gerrit Code Review
ba22572d 1 parent ca37aa27

Removed workaround codes related to OVSDB device availability issue 

Change-Id: Id58812a16eba60ea368388dd6cadfa9102bd4f4c
Inline Side-by-side
Showing 1 changed file with 3 additions and 10 deletions
...@@ -395,10 +395,6 @@ public class CordVtn implements CordVtnService { ...@@ -395,10 +395,6 @@ public class CordVtn implements CordVtnService {
395 } 395 }
396 396
397 if (!getOvsdbConnectionState(node)) { 397 if (!getOvsdbConnectionState(node)) {
398 - // FIXME remove existing OVSDB device to work around OVSDB device re-connect issue
399 - if (deviceService.getDevice(node.ovsdbId()) != null) {
400 - adminService.removeDevice(node.ovsdbId());
401 - }
402 controller.connect(node.ovsdbIp(), node.ovsdbPort()); 398 controller.connect(node.ovsdbIp(), node.ovsdbPort());
403 } 399 }
404 } 400 }
...@@ -420,11 +416,6 @@ public class CordVtn implements CordVtnService { ...@@ -420,11 +416,6 @@ public class CordVtn implements CordVtnService {
420 OvsdbClientService ovsdbClient = getOvsdbClient(node); 416 OvsdbClientService ovsdbClient = getOvsdbClient(node);
421 ovsdbClient.disconnect(); 417 ovsdbClient.disconnect();
422 } 418 }
423 -
424 - // FIXME remove existing OVSDB device to work around OVSDB device re-connect issue
425 - if (deviceService.getDevice(node.ovsdbId()) != null) {
426 - adminService.removeDevice(node.ovsdbId());
427 - }
428 } 419 }
429 420
430 /** 421 /**
...@@ -830,7 +821,9 @@ public class CordVtn implements CordVtnService { ...@@ -830,7 +821,9 @@ public class CordVtn implements CordVtnService {
830 821
831 @Override 822 @Override
832 public void disconnected(Device device) { 823 public void disconnected(Device device) {
833 - log.info("OVSDB {} is disconnected", device.id()); 824 + if (!deviceService.isAvailable(device.id())) {
825 + adminService.removeDevice(device.id());
826 + }
834 } 827 }
835 } 828 }
836 829
......