From 248840ba72d556e12ccf6205d222e4ea7f85a66b Mon Sep 17 00:00:00 2001
From: Chuan Miao <chuan137@gmail.com>
Date: Wed, 2 Oct 2019 09:04:25 +0200
Subject: [PATCH] remove duplicated method from netbox.go

---
 internal/discovery/netbox_discovery.go |  2 +-
 pkg/netbox/netbox.go                   | 31 ++------------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/internal/discovery/netbox_discovery.go b/internal/discovery/netbox_discovery.go
index d9daa8c..1408579 100644
--- a/internal/discovery/netbox_discovery.go
+++ b/internal/discovery/netbox_discovery.go
@@ -131,7 +131,7 @@ func (sd *NetboxDiscovery) getData() (tgroups []*targetgroup.Group, err error) {
 
 func (sd *NetboxDiscovery) loadDcimDevices(d dcimDevice) (tgroups []*targetgroup.Group, err error) {
 	var dcims []models.Device
-	dcims, err = sd.netbox.DevicesByParams(d.DcimDevicesListParams)
+	dcims, err = sd.netbox.DevicesByParams(&d.DcimDevicesListParams)
 	if err != nil {
 		return tgroups, err
 	}
diff --git a/pkg/netbox/netbox.go b/pkg/netbox/netbox.go
index cfa9ed9..5de993d 100644
--- a/pkg/netbox/netbox.go
+++ b/pkg/netbox/netbox.go
@@ -179,7 +179,7 @@ func (nb *Netbox) DevicesByRegion(query, manufacturer, region, status string) (r
 }
 
 //DevicesByRegion retrieves devices by region, manufacturer and status
-func (nb *Netbox) DevicesByParams(params dcim.DcimDevicesListParams) (res []models.Device, err error) {
+func (nb *Netbox) DevicesByParams(params *dcim.DcimDevicesListParams) (res []models.Device, err error) {
 	res = make([]models.Device, 0)
 	limit := int64(100)
 	params.WithLimit(&limit)
@@ -191,7 +191,7 @@ func (nb *Netbox) DevicesByParams(params dcim.DcimDevicesListParams) (res []mode
 			offset = *params.Offset + limit
 		}
 		params.Offset = &offset
-		list, err := nb.client.Dcim.DcimDevicesList(&params, nil)
+		list, err := nb.client.Dcim.DcimDevicesList(params, nil)
 		if err != nil {
 			return res, err
 		}
@@ -435,33 +435,6 @@ func (nb *Netbox) ServersByRegion(rackRole string, region string) ([]models.Devi
 	return results, nil
 }
 
-// AcitveDevicesByCustomParameters retrievs all active devices with custom parameters
-func (nb *Netbox) ActiveDevicesByCustomParameters(query string, params *dcim.DcimDevicesListParams) ([]models.Device, error) {
-	res := make([]models.Device, 0)
-	activeStatus := "1"
-	limit := int64(100)
-	params.WithStatus(&activeStatus)
-	params.WithLimit(&limit)
-	for {
-		offset := int64(0)
-		if params.Offset != nil {
-			offset = *params.Offset + limit
-		}
-		params.Offset = &offset
-		list, err := nb.client.Dcim.DcimDevicesList(params, nil)
-		if err != nil {
-			return res, err
-		}
-		for _, device := range list.Payload.Results {
-			res = append(res, *device)
-		}
-		if list.Payload.Next == nil {
-			break
-		}
-	}
-	return res, nil
-}
-
 func client(host, token string) (*netboxclient.NetBox, error) {
 
 	tlsClient, err := runtimeclient.TLSClient(runtimeclient.TLSClientOptions{InsecureSkipVerify: true})