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

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

Browse Source 
Change-Id: I9aefab86ba8e13e349f75ec0beccfc5b0048f809
This commit is contained in:
Jian Li 2018-05-03 16:56:50 +09:00
parent 9b1bc9d78a
commit bc1a7b5116
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,7 @@ public class DefaultOpenstackNodeHandler implements OpenstackNodeHandler {
deviceService.addListener(ovsdbListener);
deviceService.addListener(bridgeListener);
osNodeService.addListener(osNodeListener);
ovsdbController.setServerMode(false);
log.info("Started");
}

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

@ -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();