Shifting common v1 functionality to root pkg
diff --git a/rackspace/lb/v1/monitors/requests.go b/rackspace/lb/v1/monitors/requests.go
index aa6ec5b..cfc35d2 100644
--- a/rackspace/lb/v1/monitors/requests.go
+++ b/rackspace/lb/v1/monitors/requests.go
@@ -6,7 +6,6 @@
"github.com/racker/perigee"
"github.com/rackspace/gophercloud"
- "github.com/rackspace/gophercloud/rackspace/lb/v1"
)
var (
@@ -41,13 +40,13 @@
func (opts UpdateConnectMonitorOpts) ToMonitorUpdateMap() (map[string]interface{}, error) {
type m map[string]interface{}
- if !v1.WithinRange(opts.AttemptLimit, 1, 10) {
+ if !gophercloud.IntWithinRange(opts.AttemptLimit, 1, 10) {
return m{}, errAttemptLimit
}
- if !v1.WithinRange(opts.Delay, 1, 3600) {
+ if !gophercloud.IntWithinRange(opts.Delay, 1, 3600) {
return m{}, errDelay
}
- if !v1.WithinRange(opts.Timeout, 1, 300) {
+ if !gophercloud.IntWithinRange(opts.Timeout, 1, 300) {
return m{}, errTimeout
}
@@ -95,13 +94,13 @@
func (opts UpdateHTTPMonitorOpts) ToMonitorUpdateMap() (map[string]interface{}, error) {
type m map[string]interface{}
- if !v1.WithinRange(opts.AttemptLimit, 1, 10) {
+ if !gophercloud.IntWithinRange(opts.AttemptLimit, 1, 10) {
return m{}, errAttemptLimit
}
- if !v1.WithinRange(opts.Delay, 1, 3600) {
+ if !gophercloud.IntWithinRange(opts.Delay, 1, 3600) {
return m{}, errDelay
}
- if !v1.WithinRange(opts.Timeout, 1, 300) {
+ if !gophercloud.IntWithinRange(opts.Timeout, 1, 300) {
return m{}, errTimeout
}
if opts.Type != HTTP && opts.Type != HTTPS {