commit | 7d691f3f1e0addf2fe2ed84a8fce1ae98a3e8f57 | [log] [tgz] |
---|---|---|
author | Jian Li <pyguni@gmail.com> | Thu May 03 16:56:50 2018 +0900 |
committer | Ray Milkey <ray@opennetworking.org> | Fri May 04 21:29:51 2018 +0000 |
tree | 66441a9fba1500a894fa7209780ed8f500b7fc54 | |
parent | eaf3103e7ebe24eafd728bbdc9792be25f8b427d [diff] |
Enforce OVSDB runs as an OVSDB client mode only during SONA startup Change-Id: I9aefab86ba8e13e349f75ec0beccfc5b0048f809
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 b9e193a..e8de7a0 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,6 +151,7 @@ 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 ff59237..5641e4c 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,9 +82,11 @@ 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; @@ -238,6 +240,9 @@ expect(mockOvsdbController.getOvsdbClient(anyObject())) .andReturn(mockOvsdbClient) .anyTimes(); + mockOvsdbController.setServerMode(anyBoolean()); + expectLastCall(); + replay(mockOvsdbController); testNodeManager = new TestOpenstackNodeManager();