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

[WIFI-4417] Adding WiredPort profile to Model and configure AP Ethernet Switch Ports

Browse Source
This commit is contained in:
Thomas Leung
2021-10-01 20:11:29 +00:00
committed by Thomas-Leung2021
parent 55096881f6
commit 738b2f013e
13 changed files with 641 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPConfig.java vendored
View File

@@ -38,6 +38,7 @@ public class OpensyncAPConfig extends OpensyncAPBase {
private List<Profile> ssidProfile;
private List<Profile> metricsProfile;
private List<Profile> radiusProfiles;
private Profile wiredEthernetPortProfile;
private Location equipmentLocation;
private EquipmentRoutingRecord equipmentRouting;
private EquipmentGatewayRecord equipmentGateway;
@@ -136,7 +137,8 @@ public class OpensyncAPConfig extends OpensyncAPBase {
&& Objects.equals(hotspotConfig, other.hotspotConfig)
&& Objects.equals(metricsProfile, other.metricsProfile)
&& Objects.equals(radiusProfiles, other.radiusProfiles) && Objects.equals(rfProfile, other.rfProfile)
&& Objects.equals(ssidProfile, other.ssidProfile);
&& Objects.equals(ssidProfile, other.ssidProfile)
&& Objects.equals(wiredEthernetPortProfile, other.wiredEthernetPortProfile);
}
public Profile getApProfile() {
@@ -195,11 +197,15 @@ public class OpensyncAPConfig extends OpensyncAPBase {
return ssidProfile;
}
public Profile getWiredEthernetPortProfile() {
return wiredEthernetPortProfile;
}
@Override
public int hashCode() {
return Objects.hash(apProfile, blockedClients, bonjourGatewayProfiles, captiveProfiles, customerEquipment,
equipmentGateway, equipmentLocation, equipmentRouting, hotspotConfig, metricsProfile, radiusProfiles,
rfProfile, ssidProfile);
rfProfile, ssidProfile, wiredEthernetPortProfile);
}
public void setApProfile(Profile apProfile) {
@@ -325,4 +331,8 @@ public class OpensyncAPConfig extends OpensyncAPBase {
this.ssidProfile = ssidProfile;
}
public void setWiredEthernetPortProfile(Profile wiredEthernetPortProfile) {
this.wiredEthernetPortProfile = wiredEthernetPortProfile;
}
}

44
opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPInetState.java vendored
View File

@@ -22,8 +22,10 @@ public class OpensyncAPInetState extends OpensyncAPBase {
public String ifType;
public String softwdsMacAddr;
public boolean enabled;
public Map<String, String> ethPorts;
public boolean sofwdsWrap;
public int vlanId;
public Map<String, String> vlanTrunk;
public String netmask;
public boolean nat;
public String greRemoteInetAddr;
@@ -43,17 +45,21 @@ public class OpensyncAPInetState extends OpensyncAPBase {
public Uuid _uuid;
public Uuid version;
public String greLocalInetAddr;
// the following attribute is in inetC but not in inetS
public String greRemoteMacAddr;
public OpensyncAPInetState() {
dns = new HashMap<>();
dhcpc = new HashMap<>();
ethPorts = new HashMap<>();
vlanTrunk = new HashMap<>();
}
public OpensyncAPInetState(Row row) {
dns = new HashMap<>();
dhcpc = new HashMap<>();
ethPorts = new HashMap<>();
vlanTrunk = new HashMap<>();
Map<String, Value> map = row.getColumns();
@@ -83,6 +89,12 @@ public class OpensyncAPInetState extends OpensyncAPBase {
if (map.containsKey("dns")) {
this.setDns(row.getMapColumn("dns"));
}
if (map.containsKey("eth_ports")) {
this.setEthPorts(row.getMapColumn("eth_ports"));
}
if (map.containsKey("vlan_trunk")) {
this.setVlanTrunk(row.getMapColumn("vlan_trunk"));
}
if (map.get("inet_addr") != null
&& map.get("inet_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
this.setInetAddr(row.getStringColumn("inet_addr"));
@@ -157,6 +169,12 @@ public class OpensyncAPInetState extends OpensyncAPBase {
if (!Objects.equals(dhcpd, other.dhcpd)) {
return false;
}
if (!Objects.equals(ethPorts, other.ethPorts)) {
return false;
}
if (!Objects.equals(vlanTrunk, other.vlanTrunk)) {
return false;
}
if (!Objects.equals(dns, other.dns)) {
return false;
}
@@ -251,6 +269,14 @@ public class OpensyncAPInetState extends OpensyncAPBase {
public Map<String, String> getDns() {
return dns;
}
public Map<String, String> getEthPorts() {
return ethPorts;
}
public Map<String, String> getVlanTrunk() {
return vlanTrunk;
}
public String getGateway() {
return gateway;
@@ -330,9 +356,9 @@ public class OpensyncAPInetState extends OpensyncAPBase {
@Override
public int hashCode() {
return Objects.hash(_uuid, broadcast, dhcpc, dhcpd, dns, enabled, gateway, greIfName, greLocalInetAddr, greRemoteInetAddr,
return Objects.hash(_uuid, broadcast, dhcpc, dhcpd, dns, ethPorts, enabled, gateway, greIfName, greLocalInetAddr, greRemoteInetAddr,
hwAddr, ifName, ifType, ifUuid, inetAddr, inetConfig, ipAssignScheme, mtw, nat, netmask, network,
parentIfName, greRemoteMacAddr, softwdsMacAddr, sofwdsWrap, unpnpMode, version, vlanId);
parentIfName, greRemoteMacAddr, softwdsMacAddr, sofwdsWrap, unpnpMode, version, vlanId, vlanTrunk);
}
public boolean isEnabled() {
@@ -370,6 +396,14 @@ public class OpensyncAPInetState extends OpensyncAPBase {
public void setDns(Map<String, String> dns) {
this.dns = dns;
}
public void setEthPorts(Map<String, String> ethPorts) {
this.ethPorts = ethPorts;
}
public void setVlanTrunk(Map<String, String> vlanTrunk) {
this.vlanTrunk = vlanTrunk;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
@@ -466,9 +500,9 @@ public class OpensyncAPInetState extends OpensyncAPBase {
@Override
public String toString() {
return "OpensyncAPInetState [ifName=" + ifName + ", dhcpd=" + dhcpd + ", unpnpMode=" + unpnpMode + ", ifType="
return "OpensyncAPInetState [ifName=" + ifName + ", dhcpd=" + dhcpd + ", ethPorts=" + ethPorts + ", unpnpMode=" + unpnpMode + ", ifType="
+ ifType + ", softwdsMacAddr=" + softwdsMacAddr + ", enabled=" + enabled + ", sofwdsWrap=" + sofwdsWrap
+ ", vlanId=" + vlanId + ", netmask=" + netmask + ", nat=" + nat + ", greRemoteInetAddr="
+ ", vlanId=" + vlanId + ", vlanTrunk=" + vlanTrunk + ", netmask=" + netmask + ", nat=" + nat + ", greRemoteInetAddr="
+ greRemoteInetAddr + ", ifUuid=" + ifUuid + ", inetAddr=" + inetAddr + ", hwAddr=" + hwAddr + ", mtw="
+ mtw + ", network=" + network + ", dns=" + dns + ", parentIfName=" + parentIfName + ", greIfName="
+ greIfName + ", broadcast=" + broadcast + ", dhcpc=" + dhcpc + ", gateway=" + gateway