From 39b9577a6de377188606d6ddaf86b2791007e22b Mon Sep 17 00:00:00 2001
From: Frank Wang <wangpeihuixyz@126.com>
Date: Wed, 1 Mar 2017 15:35:13 +0800
Subject: [PATCH] [ONOS-6066]bug fix openstack node moudle

Change-Id: I9bc76e132c8cf76a2a9f7453a270e859fe0fab7d
---
 .../onosproject/openstacknode/OpenstackNodeManager.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/openstacknode/src/main/java/org/onosproject/openstacknode/OpenstackNodeManager.java b/apps/openstacknode/src/main/java/org/onosproject/openstacknode/OpenstackNodeManager.java
index a5bcaf553f..09b4f5252f 100644
--- a/apps/openstacknode/src/main/java/org/onosproject/openstacknode/OpenstackNodeManager.java
+++ b/apps/openstacknode/src/main/java/org/onosproject/openstacknode/OpenstackNodeManager.java
@@ -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;
     }