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

VLAN changes per AP request to create LAN and WAN Vlan Interfaces whenever a VLAN is provisioned

Browse Source
This commit is contained in:
Mike Hansen
2020-10-29 17:42:12 -04:00
parent 4df03431ed
commit 15e26fd829
2 changed files with 4596 additions and 4553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -1268,7 +1268,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
protocolStatus.setDetails(protocolStatusData);
protocolStatus = statusServiceInterface.update(protocolStatus);
LOG.info("Updated IpV4Addr for AP {} to {} from Wifi_Inet_State change for if_name {}", apId,
((EquipmentProtocolStatusData) protocolStatus.getDetails()).getReportedIpV4Addr(), inetState.ifName);
((EquipmentProtocolStatusData) protocolStatus.getDetails()).getReportedIpV4Addr(),
inetState.ifName);
LOG.debug("ProtocolStatus for AP {} updated to {}", apId, protocolStatus);
} catch (UnknownHostException e) {
@@ -1279,45 +1280,60 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
}
if (inetState.getVlanId() > 1) {
if (!lanStatusData.getVlanStatusDataMap().containsKey(inetState.getVlanId())) {
lanStatusData.getVlanStatusDataMap().put(inetState.getVlanId(), new VLANStatusData());
}
if (inetState.getIfType().equals("vlan") && inetState.parentIfName != null
&& inetState.parentIfName.equals(defaultWanInterfaceName)) {
try {
lanStatusData.getVlanStatusDataMap().get(inetState.getVlanId())
.setGateway(InetAddress.getByName(inetState.getGateway()));
String primaryDns = inetState.getDns().get("primary");
if (primaryDns != null) {
lanStatusData.getVlanStatusDataMap().get(inetState.getVlanId())
.setDnsServer1(InetAddress.getByName(primaryDns));
}
lanStatusData.getVlanStatusDataMap().get(inetState.getVlanId())
.setSubnetMask(InetAddress.getByName(inetState.getNetmask()));
VLANStatusData vlanStatusData = new VLANStatusData();
String dhcpOption = inetState.getDhcpd().get("dhcp_option");
if (dhcpOption != null) {
String dhcpServer = dhcpOption.split(",")[1];
if (dhcpServer != null) {
lanStatusData.getVlanStatusDataMap().get(inetState.getVlanId())
.setDhcpServer(InetAddress.getByName(dhcpServer));
if (inetState.gateway != null)
vlanStatusData.setGateway(InetAddress.getByName(inetState.getGateway()));
if (inetState.dns != null) {
String primaryDns = inetState.dns.get("primary");
if (primaryDns != null) {
vlanStatusData
.setDnsServer1(InetAddress.getByName(primaryDns));
}
String secondaryDns = inetState.dns.get("secondary");
if (secondaryDns != null) {
vlanStatusData
.setDnsServer2(InetAddress.getByName(secondaryDns));
}
}
if (inetState.netmask != null) {
vlanStatusData
.setSubnetMask(InetAddress.getByName(inetState.netmask));
}
if (inetState.dhcpd != null) {
String dhcpOption = inetState.dhcpd.get("dhcp_option");
if (dhcpOption != null) {
String dhcpServer = dhcpOption.split(",")[1];
if (dhcpServer != null) {
vlanStatusData
.setDhcpServer(InetAddress.getByName(dhcpServer));
}
}
}
String inetAddr = inetState.getInetAddr();
if (inetAddr != null) {
lanStatusData.getVlanStatusDataMap().get(inetState.getVlanId())
vlanStatusData
.setIpBase(InetAddress.getByName(inetAddr));
}
lanStatusData.getVlanStatusDataMap().put(inetState.vlanId, vlanStatusData);
lanStatus.setDetails(lanStatusData);
lanStatus = statusServiceInterface.update(lanStatus);
LOG.info("LANINFO updated for VLAN {}", lanStatus);
} catch (UnknownHostException e) {
// TODO Auto-generated catch block
e.printStackTrace();
LOG.error("Unknown Host while configuring LANINFO", e);
}
lanStatus.setDetails(lanStatusData);
lanStatus = statusServiceInterface.update(lanStatus);
}
}