mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 12:16:13 +02:00
Code Issues Projects Releases Wiki Activity

[ONOS-6066]bug fix openstack node moudle

Browse Source 
Change-Id: I9bc76e132c8cf76a2a9f7453a270e859fe0fab7d
This commit is contained in:
Frank Wang 2017-03-01 15:35:13 +08:00 committed by Hyunsun Moon
parent 75b882f7e8
commit 39b9577a6d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openstacknode/src/main/java/org/onosproject/openstacknode/OpenstackNodeManager.java
View File

@ -337,7 +337,8 @@ public final class OpenstackNodeManager extends ListenerRegistry<OpenstackNodeEv
}
private NodeState nodeState(OpenstackNode node) {
if (!isOvsdbConnected(node) || !deviceService.isAvailable(node.intBridge())) {
if (!isOvsdbConnected(node) || !deviceService.isAvailable(node.intBridge()) ||
!isBridgeCreated(node.ovsdbId(), INTEGRATION_BRIDGE)) {
return INIT;
}
@ -518,8 +519,9 @@ public final class OpenstackNodeManager extends ListenerRegistry<OpenstackNodeEv
.findFirst().orElseGet(() -> nodes().stream()
.filter(n -> n.routerBridge().isPresent())
.filter(n -> n.routerBridge().get().equals(deviceId))
.findFirst().orElse(null));
.findFirst().orElseGet(() -> nodes().stream()
.filter(n -> n.ovsdbId().equals(deviceId))
.findFirst().orElse(null)));
return node;
}