From bc1a7b5116da481bd73ef40efa0cfc0f3ec413ea Mon Sep 17 00:00:00 2001
From: Jian Li <pyguni@gmail.com>
Date: Thu, 3 May 2018 16:56:50 +0900
Subject: [PATCH] Enforce OVSDB runs as an OVSDB client mode only during SONA
 startup

Change-Id: I9aefab86ba8e13e349f75ec0beccfc5b0048f809
---
 .../openstacknode/impl/DefaultOpenstackNodeHandler.java      | 1 +
 .../openstacknode/impl/DefaultOpenstackNodeHandlerTest.java  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
index 025757e979..51852dfab2 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
@@ -152,6 +152,7 @@ public class DefaultOpenstackNodeHandler implements OpenstackNodeHandler {
         deviceService.addListener(ovsdbListener);
         deviceService.addListener(bridgeListener);
         osNodeService.addListener(osNodeListener);
+        ovsdbController.setServerMode(false);
 
         log.info("Started");
     }
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
index fccfd1ba29..18876ee6df 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
@@ -81,9 +81,11 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static org.easymock.EasyMock.anyBoolean;
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.junit.Assert.assertEquals;
 import static org.onosproject.net.AnnotationKeys.PORT_NAME;
@@ -237,6 +239,9 @@ public class DefaultOpenstackNodeHandlerTest {
         expect(mockOvsdbController.getOvsdbClient(anyObject()))
                 .andReturn(mockOvsdbClient)
                 .anyTimes();
+        mockOvsdbController.setServerMode(anyBoolean());
+        expectLastCall();
+
         replay(mockOvsdbController);
 
         testNodeManager = new TestOpenstackNodeManager();