scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-10-31 18:47:57 +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

Browse Source 
Wifi-999: JUnit updates opensync-gateway and opensync-ext-cloud

Move the GreProfile attributes to the ApProfile.
This commit is contained in:
Mike Hansen
2020-11-04 12:14:51 -05:00
parent acdd5eddbf
commit b182a6953d
4 changed files with 42 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ public class OpensyncAPConfig extends BaseJsonModel {
private List<Profile> ssidProfile;
private List<Profile> metricsProfile;
private List<Profile> radiusProfiles;
private List<Profile> greTunnelProfiles;
private Location equipmentLocation;
private EquipmentRoutingRecord equipmentRouting;
private EquipmentGatewayRecord equipmentGateway;
@@ -237,12 +236,6 @@ public class OpensyncAPConfig extends BaseJsonModel {
ret.radiusProfiles.add(radiusProfile);
}
}
if (greTunnelProfiles != null) {
ret.greTunnelProfiles = new ArrayList<>();
for (Profile greTunnelProfile : this.greTunnelProfiles) {
ret.greTunnelProfiles.add(greTunnelProfile);
}
}
if (captiveProfiles != null) {
ret.captiveProfiles = new ArrayList<>();
for (Profile cpConfig : this.captiveProfiles) {
@@ -267,16 +260,6 @@ public class OpensyncAPConfig extends BaseJsonModel {
this.radiusProfiles = radiusProfiles;
}
public List<Profile> getGreTunnelProfiles() {
return greTunnelProfiles;
}
public void setGreTunnelProfiles(List<Profile> greTunnelProfiles) {
this.greTunnelProfiles = greTunnelProfiles;
}
public List<Profile> getCaptiveProfiles() {
return captiveProfiles;
}
@@ -304,7 +287,7 @@ public class OpensyncAPConfig extends BaseJsonModel {
@Override
public int hashCode() {
return Objects.hash(apProfile, blockedClients, bonjourGatewayProfiles, captiveProfiles, customerEquipment,
equipmentGateway, equipmentLocation, equipmentRouting, greTunnelProfiles, hotspotConfig, metricsProfile,
equipmentGateway, equipmentLocation, equipmentRouting, hotspotConfig, metricsProfile,
radiusProfiles, rfProfile, ssidProfile);
}
@@ -324,7 +307,6 @@ public class OpensyncAPConfig extends BaseJsonModel {
&& Objects.equals(equipmentGateway, other.equipmentGateway)
&& Objects.equals(equipmentLocation, other.equipmentLocation)
&& Objects.equals(equipmentRouting, other.equipmentRouting)
&& Objects.equals(greTunnelProfiles, other.greTunnelProfiles)
&& Objects.equals(hotspotConfig, other.hotspotConfig)
&& Objects.equals(metricsProfile, other.metricsProfile)
&& Objects.equals(radiusProfiles, other.radiusProfiles) && Objects.equals(rfProfile, other.rfProfile)