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

Update Wifi_Inet_Config for vlan handling

Browse Source
This commit is contained in:
Mike Hansen
2020-10-28 18:16:40 -04:00
parent 0e80415e52
commit 7ef59937f2
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2753,9 +2753,9 @@ public class OvsdbDao {
Map<String, WifiInetConfigInfo> inetConfigs = getProvisionedWifiInetConfigs(ovsdbClient); Map<String, WifiInetConfigInfo> inetConfigs = getProvisionedWifiInetConfigs(ovsdbClient);
if (inetConfigs.containsKey(vifInterfaceName)) { if (inetConfigs.containsKey(vifInterfaceName)) {
configureInetInterface(ovsdbClient, vifInterfaceName, enabled, "vif", true); configureInetInterface(ovsdbClient, vifInterfaceName, enabled, "vif", true, (networkForwardMode == NetworkForwardMode.NAT));
} else { } else {
configureInetInterface(ovsdbClient, vifInterfaceName, enabled, "vif", false); configureInetInterface(ovsdbClient, vifInterfaceName, enabled, "vif", false, (networkForwardMode == NetworkForwardMode.NAT));
} }
LOG.info("Provisioned SSID {} on interface {} / {}", ssid, vifInterfaceName, radioFreqBand); LOG.info("Provisioned SSID {} on interface {} / {}", ssid, vifInterfaceName, radioFreqBand);
@@ -3160,13 +3160,23 @@ public class OvsdbDao {
tableColumns.put("parent_ifname", new Atom<>(parentIfName)); tableColumns.put("parent_ifname", new Atom<>(parentIfName));
tableColumns.put("enabled", new Atom<>(true)); tableColumns.put("enabled", new Atom<>(true));
tableColumns.put("network", new Atom<>(true)); tableColumns.put("network", new Atom<>(true));
if (parentIfName.equals(defaultLanInterfaceName)) {
tableColumns.put("ip_assign_scheme", new Atom<>("static"));
} else {
tableColumns.put("ip_assign_scheme", new Atom<>("dhcp"));
}
tableColumns.put("dhcp_sniff", new Atom<>(true)); tableColumns.put("dhcp_sniff", new Atom<>(true));
WifiInetConfigInfo parent = getProvisionedWifiInetConfigs(ovsdbClient).get(parentIfName);
if (parent == null)
throw new RuntimeException("Cannot get parent interface " + parentIfName + " for vlan " + vlanId);
tableColumns.put("ip_assign_scheme", new Atom<>(parent.ipAssignScheme));
tableColumns.put("NAT", new Atom<>(parent.nat));
tableColumns.put("mtu", new Atom<>(1500));
if (parent.ipAssignScheme.equals("static")) {
String[] inetAddress = parent.inetAddr.split("\\.");
String vlanAddress = inetAddress[0] + "." + inetAddress[1] + "." + vlanId + "." + inetAddress[3];
tableColumns.put("inet_addr", new Atom<>(vlanAddress));
tableColumns.put("netmask", new Atom<>(parent.netmask));
}
Row row = new Row(tableColumns); Row row = new Row(tableColumns);
operations.clear(); operations.clear();
if (isUpdate) { if (isUpdate) {
@@ -3337,7 +3347,7 @@ public class OvsdbDao {
} }
private void configureInetInterface(OvsdbClient ovsdbClient, String ifName, boolean enabled, String ifType, private void configureInetInterface(OvsdbClient ovsdbClient, String ifName, boolean enabled, String ifType,
boolean isUpdate) { boolean isUpdate, boolean isNat) {
try { try {
@@ -3348,10 +3358,8 @@ public class OvsdbDao {
tableColumns.put("enabled", new Atom<>(enabled)); tableColumns.put("enabled", new Atom<>(enabled));
tableColumns.put("network", new Atom<>(true)); tableColumns.put("network", new Atom<>(true));
tableColumns.put("if_name", new Atom<>(ifName)); tableColumns.put("if_name", new Atom<>(ifName));
tableColumns.put("dhcp_sniff", new Atom<>(true)); tableColumns.put("NAT", new Atom<>(isNat));
tableColumns.put("ip_assign_scheme", new Atom<>("dhcp"));
tableColumns.put("NAT", new Atom<>(false));
Row row = new Row(tableColumns); Row row = new Row(tableColumns);
if (isUpdate) { if (isUpdate) {
List<Condition> conditions = new ArrayList<>(); List<Condition> conditions = new ArrayList<>();