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

Temporary work-around until AP load has updated ovsdb-schema with the

Browse Source 
changes to the Hotspot20_OSU_Providers
This commit is contained in:
Mike Hansen
2020-10-19 18:52:26 -04:00
parent 338b35ef06
commit d7b0110b28
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20OsuProviders.java
View File

@@ -4,16 +4,19 @@ import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao;
import com.vmware.ovsdb.protocol.operation.notation.Row; import com.vmware.ovsdb.protocol.operation.notation.Row;
import com.vmware.ovsdb.protocol.operation.notation.Uuid; import com.vmware.ovsdb.protocol.operation.notation.Uuid;
public class Hotspot20OsuProviders implements Cloneable { public class Hotspot20OsuProviders implements Cloneable {
public static String[] ovsdbColumns = { "_version", "osu_nai", "osu_nai2", "osu_icons", "osu_provider_name", // public static String[] ovsdbColumns = { "_version", "osu_nai", "osu_nai2", "osu_icons", "osu_provider_name",
// "server_uri", "method_list", "_uuid", "osu_friendly_name", "service_description" };
public static String[] ovsdbColumns = { "_version", "osu_nai", "osu_icons",
"server_uri", "method_list", "_uuid", "osu_friendly_name", "service_description" }; "server_uri", "method_list", "_uuid", "osu_friendly_name", "service_description" };
public Uuid version; public Uuid version;
public String osuNai; public String osuNai;
public String osuNai2; /* public String osuNai2; */
public Set<Uuid> osuIcons; public Set<Uuid> osuIcons;
public String serverUri; public String serverUri;
public Set<Integer> methodList; public Set<Integer> methodList;
@@ -31,10 +34,11 @@ public class Hotspot20OsuProviders implements Cloneable {
.equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
this.osuNai = row.getStringColumn("osu_nai"); this.osuNai = row.getStringColumn("osu_nai");
} }
if ((row.getColumns().get("osu_nai2") != null) && row.getColumns().get("osu_nai2").getClass() /*
.equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { * if (row.getColumns().containsKey("osu_nai2")) { this.osuNai2 =
this.osuNai2 = row.getStringColumn("osu_nai2"); * OvsdbDao.getSingleValueFromSet(row, "osu_nai2"); }
} */
this.osuIcons = row.getSetColumn("osu_icons"); this.osuIcons = row.getSetColumn("osu_icons");
if ((row.getColumns().get("server_uri") != null) && row.getColumns().get("server_uri").getClass() if ((row.getColumns().get("server_uri") != null) && row.getColumns().get("server_uri").getClass()
.equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
@@ -72,7 +76,8 @@ public class Hotspot20OsuProviders implements Cloneable {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(methodList, osuFriendlyName, osuIcons, osuNai, osuNai2, serverUri, serviceDescription, uuid, return Objects.hash(methodList, osuFriendlyName, osuIcons, osuNai,
/* osuNai2, */ serverUri, serviceDescription, uuid,
version); version);
} }
@@ -87,14 +92,15 @@ public class Hotspot20OsuProviders implements Cloneable {
Hotspot20OsuProviders other = (Hotspot20OsuProviders) obj; Hotspot20OsuProviders other = (Hotspot20OsuProviders) obj;
return Objects.equals(methodList, other.methodList) && Objects.equals(osuFriendlyName, other.osuFriendlyName) return Objects.equals(methodList, other.methodList) && Objects.equals(osuFriendlyName, other.osuFriendlyName)
&& Objects.equals(osuIcons, other.osuIcons) && Objects.equals(osuNai, other.osuNai) && Objects.equals(osuIcons, other.osuIcons) && Objects.equals(osuNai, other.osuNai)
&& Objects.equals(osuNai2, other.osuNai2) && Objects.equals(serverUri, other.serverUri) /* && Objects.equals(osuNai2, other.osuNai2) */&& Objects.equals(serverUri, other.serverUri)
&& Objects.equals(serviceDescription, other.serviceDescription) && Objects.equals(uuid, other.uuid) && Objects.equals(serviceDescription, other.serviceDescription) && Objects.equals(uuid, other.uuid)
&& Objects.equals(version, other.version); && Objects.equals(version, other.version);
} }
@Override @Override
public String toString() { public String toString() {
return "Hotspot20OsuProviders [version=" + version + ", osuNai=" + osuNai + ", osuNai2=" + osuNai2 return "Hotspot20OsuProviders [version=" + version + ", osuNai=" + osuNai
/*+ ", osuNai2=" + osuNai2 */
+ ", osuIcons=" + osuIcons + ", serverUri=" + serverUri + ", methodList=" + methodList + ", uuid=" + ", osuIcons=" + osuIcons + ", serverUri=" + serverUri + ", methodList=" + methodList + ", uuid="
+ uuid + ", osuFriendlyName=" + osuFriendlyName + ", serviceDescription=" + serviceDescription + "]"; + uuid + ", osuFriendlyName=" + osuFriendlyName + ", serviceDescription=" + serviceDescription + "]";
} }