range updates

range.go

@@ -6,15 +6,22 @@ import (
 )
 
 const (
-	rangeBasePath = "range"
+	rangeBasePath     = "range"
+	rangeReturnFields = "network,network_view,start_addr,end_addr,disable,comment,extattrs"
 )
 
 // GetRangeByRef gets range by reference
-func (c *Client) GetRangeByRef(ref string) (Range, error) {
+func (c *Client) GetRangeByRef(ref string, queryParams map[string]string) (Range, error) {
 	var ret Range
-	queryParams := map[string]string{
-		"_return_fields": "network,network_view,start_addr,end_addr,disable,comment,extattrs",
+
+	if queryParams == nil {
+		queryParams = map[string]string{
+			"_return_fields": rangeReturnFields,
+		}
+	} else {
+		queryParams["_return_fields"] = rangeReturnFields
 	}
+
 	queryParamString := c.BuildQuery(queryParams)
 	request, err := c.CreateJSONRequest(http.MethodGet, fmt.Sprintf("%s?%s", ref, queryParamString), nil)
 	if err != nil {
@@ -29,10 +36,30 @@ func (c *Client) GetRangeByRef(ref string) (Range, error) {
 	return ret, nil
 }
 
+// GetRangeByQuery gets range by reference
+func (c *Client) GetRangeByQuery(queryParams map[string]string) (Range, error) {
+	var ret Range
+
+	queryParams["_return_fields"] = rangeReturnFields
+
+	queryParamString := c.BuildQuery(queryParams)
+	request, err := c.CreateJSONRequest(http.MethodGet, fmt.Sprintf("%s?%s", rangeBasePath, queryParamString), nil)
+	if err != nil {
+		return ret, err
+	}
+
+	err = c.Call(request, &ret)
+	if err != nil {
+		return ret, err
+	}
+
+	return ret, nil
+}
+
 // CreateRange creates range
 func (c *Client) CreateRange(rangeObject *Range) error {
 	queryParams := map[string]string{
-		"_return_fields": "network,network_view,start_addr,end_addr,disable,comment,extattrs",
+		"_return_fields": rangeReturnFields,
 	}
 	queryParamString := c.BuildQuery(queryParams)
 	request, err := c.CreateJSONRequest(http.MethodPost, fmt.Sprintf("%s?%s", rangeBasePath, queryParamString), rangeObject)
@@ -51,7 +78,7 @@ func (c *Client) CreateRange(rangeObject *Range) error {
 func (c *Client) UpdateRange(ref string, rangeObject Range) (Range, error) {
 	var ret Range
 	queryParams := map[string]string{
-		"_return_fields": "network,network_view,start_addr,end_addr,disable,comment,extattrs",
+		"_return_fields": rangeReturnFields,
 	}
 	queryParamString := c.BuildQuery(queryParams)
 	request, err := c.CreateJSONRequest(http.MethodPut, fmt.Sprintf("%s?%s", ref, queryParamString), rangeObject)

range_test.go

@@ -57,7 +57,7 @@ func TestCreateRange(t *testing.T) {
 }
 
 func TestGetRange(t *testing.T) {
-	rangeObject, err := rangeClient.GetRangeByRef(testRange.Ref)
+	rangeObject, err := rangeClient.GetRangeByRef(testRange.Ref, nil)
 	if err != nil {
 		t.Errorf("Error retrieving range: %s", err)
 	}