public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

with controller on site do not need it per device

This commit is contained in:
David Newhall II 2021-03-14 15:12:28 -07:00
parent 267e55906e
commit 813c96ffb6
6 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/unifi/devices.go
View File

@ -140,7 +140,6 @@ func (u *Unifi) unmarshallUAP(site *Site, payload json.RawMessage, devices *Devi
dev := &UAP{SiteName: site.Name, SourceName: u.URL} dev := &UAP{SiteName: site.Name, SourceName: u.URL}
if u.unmarshalDevice("uap", payload, dev) == nil { if u.unmarshalDevice("uap", payload, dev) == nil {
dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac)) dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
dev.controller = u
dev.site = site dev.site = site
devices.UAPs = append(devices.UAPs, dev) devices.UAPs = append(devices.UAPs, dev)
} }
@ -150,7 +149,6 @@ func (u *Unifi) unmarshallUSG(site *Site, payload json.RawMessage, devices *Devi
dev := &USG{SiteName: site.Name, SourceName: u.URL} dev := &USG{SiteName: site.Name, SourceName: u.URL}
if u.unmarshalDevice("ugw", payload, dev) == nil { if u.unmarshalDevice("ugw", payload, dev) == nil {
dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac)) dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
dev.controller = u
dev.site = site dev.site = site
devices.USGs = append(devices.USGs, dev) devices.USGs = append(devices.USGs, dev)
} }
@ -160,7 +158,6 @@ func (u *Unifi) unmarshallUSW(site *Site, payload json.RawMessage, devices *Devi
dev := &USW{SiteName: site.Name, SourceName: u.URL} dev := &USW{SiteName: site.Name, SourceName: u.URL}
if u.unmarshalDevice("usw", payload, dev) == nil { if u.unmarshalDevice("usw", payload, dev) == nil {
dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac)) dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
dev.controller = u
dev.site = site dev.site = site
devices.USWs = append(devices.USWs, dev) devices.USWs = append(devices.USWs, dev)
} }
@ -170,7 +167,6 @@ func (u *Unifi) unmarshallUXG(site *Site, payload json.RawMessage, devices *Devi
dev := &UXG{SiteName: site.Name, SourceName: u.URL} dev := &UXG{SiteName: site.Name, SourceName: u.URL}
if u.unmarshalDevice("uxg", payload, dev) == nil { if u.unmarshalDevice("uxg", payload, dev) == nil {
dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac)) dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
dev.controller = u
dev.site = site dev.site = site
devices.UXGs = append(devices.UXGs, dev) devices.UXGs = append(devices.UXGs, dev)
} }
@ -180,7 +176,6 @@ func (u *Unifi) unmarshallUDM(site *Site, payload json.RawMessage, devices *Devi
dev := &UDM{SiteName: site.Name, SourceName: u.URL} dev := &UDM{SiteName: site.Name, SourceName: u.URL}
if u.unmarshalDevice("udm", payload, dev) == nil { if u.unmarshalDevice("udm", payload, dev) == nil {
dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac)) dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
dev.controller = u
dev.site = site dev.site = site
devices.UDMs = append(devices.UDMs, dev) devices.UDMs = append(devices.UDMs, dev)
} }

1
core/unifi/uap.go
View File

@ -9,7 +9,6 @@ import (
// This was auto generated then edited by hand to get all the data types right. // This was auto generated then edited by hand to get all the data types right.
type UAP struct { type UAP struct {
site *Site site *Site
controller *Unifi
SourceName string `json:"-"` SourceName string `json:"-"`
ID string `json:"_id"` ID string `json:"_id"`
Adopted FlexBool `json:"adopted"` Adopted FlexBool `json:"adopted"`

1
core/unifi/udm.go
View File

@ -4,7 +4,6 @@ package unifi
// The UDM shares several structs/type-data with USW and USG. // The UDM shares several structs/type-data with USW and USG.
type UDM struct { type UDM struct {
site *Site site *Site
controller *Unifi
SourceName string `json:"-"` SourceName string `json:"-"`
SiteID string `json:"site_id"` SiteID string `json:"site_id"`
SiteName string `json:"-"` SiteName string `json:"-"`

1
core/unifi/usg.go
View File

@ -8,7 +8,6 @@ import (
// USG represents all the data from the Ubiquiti Controller for a Unifi Security Gateway. // USG represents all the data from the Ubiquiti Controller for a Unifi Security Gateway.
type USG struct { type USG struct {
site *Site site *Site
controller *Unifi
SourceName string `json:"-"` SourceName string `json:"-"`
ID string `json:"_id"` ID string `json:"_id"`
Adopted FlexBool `json:"adopted"` Adopted FlexBool `json:"adopted"`

1
core/unifi/usw.go
View File

@ -8,7 +8,6 @@ import (
// USW represents all the data from the Ubiquiti Controller for a Unifi Switch. // USW represents all the data from the Ubiquiti Controller for a Unifi Switch.
type USW struct { type USW struct {
site *Site site *Site
controller *Unifi
SourceName string `json:"-"` SourceName string `json:"-"`
SiteName string `json:"-"` SiteName string `json:"-"`
ID string `json:"_id"` ID string `json:"_id"`

1
core/unifi/uxg.go
View File

@ -4,7 +4,6 @@ package unifi
// The UDM shares several structs/type-data with USW and USG. // The UDM shares several structs/type-data with USW and USG.
type UXG struct { type UXG struct {
site *Site site *Site
controller *Unifi
SourceName string `json:"-"` SourceName string `json:"-"`
SiteName string `json:"-"` SiteName string `json:"-"`
ID string `json:"_id"` ID string `json:"_id"`