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

Bridge or NAT for Inet Config. Bridge yes/no for VIF Config

Browse Source
This commit is contained in:
Mike Hansen
2020-07-16 12:16:11 -04:00
parent 6e4f77a17b
commit 14f00d01e7
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -104,10 +104,6 @@ public class OvsdbDao {
@org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_lan_type:bridge}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_lan_type:bridge}")
public String defaultLanInterfaceType; public String defaultLanInterfaceType;
@org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_lan_name:lan}")
public String defaultLanInterfaceName;
@org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_wan_type:eth}") @org.springframework.beans.factory.annotation.Value("${tip.wlan.ovsdb.wifi-iface.default_wan_type:eth}")
public String defaultWanInterfaceType; public String defaultWanInterfaceType;
@@ -1910,10 +1906,8 @@ public class OvsdbDao {
OpensyncAPVIFState tableState = processWifiVIFStateColumn(ovsdbClient, row); OpensyncAPVIFState tableState = processWifiVIFStateColumn(ovsdbClient, row);
LOG.debug("Updated table state {}", tableState.toPrettyString()); LOG.debug("Updated table state {}", tableState.toPrettyString());
ret.add(tableState); ret.add(tableState);
} }
@@ -2199,7 +2193,7 @@ public class OvsdbDao {
} }
} }
public void configureSingleSsid(OvsdbClient ovsdbClient, String bridge, String ifName, String ssid, public void configureSingleSsid(OvsdbClient ovsdbClient, String ifName, String ssid,
boolean ssidBroadcast, Map<String, String> security, String radioFreqBand, int vlanId, boolean rrmEnabled, boolean ssidBroadcast, Map<String, String> security, String radioFreqBand, int vlanId, boolean rrmEnabled,
boolean enable80211r, String minHwMode, boolean enabled, int keyRefresh, boolean uapsdEnabled, boolean enable80211r, String minHwMode, boolean enabled, int keyRefresh, boolean uapsdEnabled,
boolean apBridge, NetworkForwardMode networkForwardMode, String gateway, String inet, boolean apBridge, NetworkForwardMode networkForwardMode, String gateway, String inet,
@@ -2209,7 +2203,13 @@ public class OvsdbDao {
Map<String, Value> updateColumns = new HashMap<>(); Map<String, Value> updateColumns = new HashMap<>();
try { try {
updateColumns.put("bridge", new Atom<>(bridge)); // If we are doing a NAT SSID, no bridge, else yes
if (networkForwardMode == NetworkForwardMode.NAT) {
updateColumns.put("bridge", new Atom<>("no"));
} else {
updateColumns.put("bridge", new Atom<>("yes"));
}
updateColumns.put("btm", new Atom<>(1)); updateColumns.put("btm", new Atom<>(1));
updateColumns.put("enabled", new Atom<>(enabled)); updateColumns.put("enabled", new Atom<>(enabled));
if (enable80211r) { if (enable80211r) {
@@ -2532,7 +2532,7 @@ public class OvsdbDao {
ifName = ifName + "-" + numberOfInterfaces; ifName = ifName + "-" + numberOfInterfaces;
} }
configureSingleSsid(ovsdbClient, defaultLanInterfaceName, ifName, ssidConfig.getSsid(), configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(),
ssidBroadcast, security, freqBand, ssidConfig.getVlanId(), rrmEnabled, enable80211r, ssidBroadcast, security, freqBand, ssidConfig.getVlanId(), rrmEnabled, enable80211r,
minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge, ssidConfig.getForwardMode(), minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge, ssidConfig.getForwardMode(),
gateway, inet, dns, ipAssignScheme, macBlackList, macWhiteList); gateway, inet, dns, ipAssignScheme, macBlackList, macWhiteList);