scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-03 20:17:53 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

TW-20 - code hardening

Browse Source
This commit is contained in:
DTop
2020-02-14 10:50:39 -05:00
parent 20e9052c3e
commit 920a853774
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opensync_gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -870,7 +870,10 @@ public class OvsdbDao {
conditions.add(new Condition("name", Function.EQUALS, new Atom<>(interfaceName) )); conditions.add(new Condition("name", Function.EQUALS, new Atom<>(interfaceName) ));
Set<Uuid> portInterfacesSet = new HashSet<>(existingPort.interfaceUuids); Set<Uuid> portInterfacesSet = new HashSet<>();
if(existingPort.interfaceUuids!=null) {
portInterfacesSet.addAll(existingPort.interfaceUuids);
}
portInterfacesSet.add(interfaceUuid); portInterfacesSet.add(interfaceUuid);
com.vmware.ovsdb.protocol.operation.notation.Set portInterfaces = com.vmware.ovsdb.protocol.operation.notation.Set.of(portInterfacesSet); com.vmware.ovsdb.protocol.operation.notation.Set portInterfaces = com.vmware.ovsdb.protocol.operation.notation.Set.of(portInterfacesSet);
updateColumns.put("interfaces", portInterfaces ); updateColumns.put("interfaces", portInterfaces );
@@ -901,14 +904,19 @@ public class OvsdbDao {
//link the port to the bridge //link the port to the bridge
if(provisionedBridges.containsKey(bridgeName)) { if(provisionedBridges.containsKey(bridgeName)) {
BridgeInfo existingBridge = provisionedBridges.get(brHome); BridgeInfo existingBridge = provisionedBridges.get(bridgeName);
conditions = new ArrayList<>(); conditions = new ArrayList<>();
updateColumns = new HashMap<>(); updateColumns = new HashMap<>();
conditions.add(new Condition("name", Function.EQUALS, new Atom<>(bridgeName) )); conditions.add(new Condition("name", Function.EQUALS, new Atom<>(bridgeName) ));
Set<Uuid> bridgePortsSet = new HashSet<>(existingBridge.portUuids);
Set<Uuid> bridgePortsSet = new HashSet<>();
if(existingBridge.portUuids!=null) {
bridgePortsSet.addAll(existingBridge.portUuids);
}
bridgePortsSet.add(portUuid); bridgePortsSet.add(portUuid);
com.vmware.ovsdb.protocol.operation.notation.Set bridgePorts = com.vmware.ovsdb.protocol.operation.notation.Set.of(bridgePortsSet); com.vmware.ovsdb.protocol.operation.notation.Set bridgePorts = com.vmware.ovsdb.protocol.operation.notation.Set.of(bridgePortsSet);
updateColumns.put("ports", bridgePorts ); updateColumns.put("ports", bridgePorts );