kc/netboxgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify device_list.

Browse source
This commit is contained in:
Kalle Carlbark 2019-09-11 20:25:49 +02:00
parent b1803645b8
commit 037c44b93f
No known key found for this signature in database
GPG key ID: 3FC0C93C5A5A0670
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
netbox_devices.go
View file

@ -203,18 +203,15 @@ func (n *NetBox) ListDevices(d *Dcim_Devices_List, f *DeviceFilter) error {
Timeout: timeout, Timeout: timeout,
Transport: transport, Transport: transport,
} }
deviceurl := n.RootURL + "/api/dcim/devices/"
var request *http.Request var request *http.Request
if len(query) > 0 { if len(query) > 0 {
request, err = http.NewRequest("GET", n.RootURL+"/api/dcim/devices/"+"?"+query, nil) deviceurl = deviceurl + query
}
request, err = http.NewRequest("GET", deviceurl, nil)
if err != nil { if err != nil {
return err return err
} }
} else {
request, err = http.NewRequest("GET", n.RootURL+"/api/dcim/devices/", nil)
if err != nil {
return err
}
}
request.Header.Add("Accept", "application/json") request.Header.Add("Accept", "application/json")
request.Header.Add("Authorization", " Token "+n.Token) request.Header.Add("Authorization", " Token "+n.Token)
response, err := client.Do(request) response, err := client.Do(request)
@ -223,7 +220,7 @@ func (n *NetBox) ListDevices(d *Dcim_Devices_List, f *DeviceFilter) error {
} }
if response.StatusCode != http.StatusOK { if response.StatusCode != http.StatusOK {
return errors.Errorf("Error: response was: %d should be %d\n", response.StatusCode, http.StatusOK) return errors.Errorf("Error: response was: %d should be %d (%s)\n", response.StatusCode, http.StatusOK, deviceurl)
} }
data, err := ioutil.ReadAll(response.Body) data, err := ioutil.ReadAll(response.Body)