commit 3bee54277c108253f2933d3a24c8a6a13954bc6f
author Jian Li <pyguni@gmail.com> Mon May 14 16:36:27 2018 +0900
committer Jian Li <pyguni@gmail.com> Mon May 14 16:37:32 2018 +0900
tree 7a0746f6062f74f0f6e00542b57fe0bc85ce3939
parent d5c229667c1a96495e939e2197faa79d45909977

Revert "Enforce OVSDB runs as an OVSDB client mode only during SONA startup"

This reverts commit 7d691f3f1e0addf2fe2ed84a8fce1ae98a3e8f57.

Change-Id: Iafc795ae39b60f2517b1a4d85cea83d9d47d96cb

apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java

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 e8de7a0..b9e193a 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
@@ -151,7 +151,6 @@
         deviceService.addListener(ovsdbListener);
         deviceService.addListener(bridgeListener);
         osNodeService.addListener(osNodeListener);
-        ovsdbController.setServerMode(false);
 
         log.info("Started");
     }

apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java

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 5641e4c..ff59237 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
@@ -82,11 +82,9 @@
 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;
@@ -240,9 +238,6 @@
         expect(mockOvsdbController.getOvsdbClient(anyObject()))
                 .andReturn(mockOvsdbClient)
                 .anyTimes();
-        mockOvsdbController.setServerMode(anyBoolean());
-        expectLastCall();
-
         replay(mockOvsdbController);
 
         testNodeManager = new TestOpenstackNodeManager();