Finalizing most acceptance tests
diff --git a/rackspace/db/v1/configurations/urls.go b/rackspace/db/v1/configurations/urls.go
index 4d4c244..abea961 100644
--- a/rackspace/db/v1/configurations/urls.go
+++ b/rackspace/db/v1/configurations/urls.go
@@ -15,11 +15,11 @@
}
func listDSParamsURL(c *gophercloud.ServiceClient, datastoreID, versionID string) string {
- return c.ServiceURL("datastores", dsID, "versions", versionID, "parameters")
+ return c.ServiceURL("datastores", datastoreID, "versions", versionID, "parameters")
}
func getDSParamURL(c *gophercloud.ServiceClient, datastoreID, versionID, paramID string) string {
- return c.ServiceURL("datastores", dsID, "versions", versionID, "parameters", paramID)
+ return c.ServiceURL("datastores", datastoreID, "versions", versionID, "parameters", paramID)
}
func listGlobalParamsURL(c *gophercloud.ServiceClient, versionID string) string {
diff --git a/rackspace/db/v1/databases/results.go b/rackspace/db/v1/databases/results.go
deleted file mode 100644
index 18cbec7..0000000
--- a/rackspace/db/v1/databases/results.go
+++ /dev/null
@@ -1 +0,0 @@
-package databases
diff --git a/rackspace/db/v1/flavors/delegate.go b/rackspace/db/v1/flavors/delegate.go
index 689b81e..fd2608d 100644
--- a/rackspace/db/v1/flavors/delegate.go
+++ b/rackspace/db/v1/flavors/delegate.go
@@ -12,6 +12,6 @@
}
// Get retrieves the details for a particular flavor.
-func Get(client *gophercloud.ServiceClient, flavorID string) os.GetResult {
+func Get(client *gophercloud.ServiceClient, flavorID int) os.GetResult {
return os.Get(client, flavorID)
}
diff --git a/rackspace/db/v1/instances/fixtures.go b/rackspace/db/v1/instances/fixtures.go
index 92ad7ec..b59aeae 100644
--- a/rackspace/db/v1/instances/fixtures.go
+++ b/rackspace/db/v1/instances/fixtures.go
@@ -2,6 +2,7 @@
import (
"github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/openstack/db/v1/flavors"
os "github.com/rackspace/gophercloud/openstack/db/v1/instances"
"github.com/rackspace/gophercloud/rackspace/db/v1/datastores"
)
@@ -301,7 +302,7 @@
Created: "2014-10-14T18:42:15",
ID: "8367c312-7c40-4a66-aab1-5767478914fc",
Volume: os.Volume{Size: 1},
- Flavor: os.Flavor{ID: "9"},
+ Flavor: flavors.Flavor{ID: "9"},
Datastore: datastores.DatastorePartial{Version: "5.6", Type: "mysql"},
ReplicaOf: &Instance{
ID: "6bdca2fc-418e-40bd-a595-62abda61862d",
diff --git a/rackspace/db/v1/instances/results.go b/rackspace/db/v1/instances/results.go
index 7a44f1b..a516cb4 100644
--- a/rackspace/db/v1/instances/results.go
+++ b/rackspace/db/v1/instances/results.go
@@ -3,6 +3,7 @@
import (
"github.com/mitchellh/mapstructure"
"github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/openstack/db/v1/flavors"
os "github.com/rackspace/gophercloud/openstack/db/v1/instances"
"github.com/rackspace/gophercloud/pagination"
"github.com/rackspace/gophercloud/rackspace/db/v1/datastores"
@@ -20,7 +21,7 @@
Datastore datastores.DatastorePartial
// Indicates the hardware flavor the instance uses.
- Flavor os.Flavor
+ Flavor flavors.Flavor
// A DNS-resolvable hostname associated with the database instance (rather
// than an IPv4 address). Since the hostname always resolves to the correct
diff --git a/rackspace/db/v1/users/requests.go b/rackspace/db/v1/users/requests.go
index 7c30079..fd0b649 100644
--- a/rackspace/db/v1/users/requests.go
+++ b/rackspace/db/v1/users/requests.go
@@ -107,16 +107,9 @@
/*
RevokeAccess will revoke access for the specified user to one or more databases
-on a specified instance. For example, to remove a user's access to multiple
-databases:
+on a specified instance. For example:
- opts := db.BatchCreateOpts{
- db.CreateOpts{Name: "database_1"},
- db.CreateOpts{Name: "database_3"},
- db.CreateOpts{Name: "database_19"},
- }
-
- RevokeAccess(client, "instance_id", "user_name", opts)
+ RevokeAccess(client, "instance_id", "user_name", "db_name")
*/
func RevokeAccess(client *gophercloud.ServiceClient, instanceID, userName, dbName string) RevokeAccessResult {
var res RevokeAccessResult