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

Wifi-1004: Provision gre_ifname, gre_local_inet_addr, gre_remote_inet_addr, gre_remote_mac_addr on AP -- remove hardcoded 'wan' for parent if_name

Browse Source
This commit is contained in:
Mike Hansen
2020-11-04 11:45:50 -05:00
parent c1de88aa05
commit acdd5eddbf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3274,7 +3274,7 @@ public class OvsdbDao {
Map<String, Value> tableColumns = new HashMap<>(); Map<String, Value> tableColumns = new HashMap<>();
GreTunnelProfile details = (GreTunnelProfile) greTunnelProfile.getDetails(); GreTunnelProfile details = (GreTunnelProfile) greTunnelProfile.getDetails();
tableColumns.put("gre_ifname", new Atom<>(defaultWanInterfaceName)); tableColumns.put("gre_ifname", new Atom<>(details.getGreParentIfName()));
tableColumns.put("gre_local_inet_addr", new Atom<>(details.getGreLocalInetAddr().getHostAddress())); tableColumns.put("gre_local_inet_addr", new Atom<>(details.getGreLocalInetAddr().getHostAddress()));
tableColumns.put("gre_remote_inet_addr", new Atom<>(details.getGreRemoteInetAddr().getHostAddress())); tableColumns.put("gre_remote_inet_addr", new Atom<>(details.getGreRemoteInetAddr().getHostAddress()));
if (details.getGreRemoteMacAddr() != null) { if (details.getGreRemoteMacAddr() != null) {
@@ -3375,6 +3375,7 @@ public class OvsdbDao {
tableColumns.put("dhcp_sniff", new Atom<>(true)); tableColumns.put("dhcp_sniff", new Atom<>(true));
tableColumns.put("ip_assign_scheme", new Atom<>(parentWanInterface.ipAssignScheme)); tableColumns.put("ip_assign_scheme", new Atom<>(parentWanInterface.ipAssignScheme));
tableColumns.put("NAT", new Atom<>(parentWanInterface.nat)); tableColumns.put("NAT", new Atom<>(parentWanInterface.nat));
tableColumns.put("mtu", new Atom<>(1500)); tableColumns.put("mtu", new Atom<>(1500));
row = new Row(tableColumns); row = new Row(tableColumns);