add various fixes
diff --git a/acceptance/rackspace/db/v1/config_group_test.go b/acceptance/rackspace/db/v1/config_group_test.go
index 85c3756..81bd40a 100644
--- a/acceptance/rackspace/db/v1/config_group_test.go
+++ b/acceptance/rackspace/db/v1/config_group_test.go
@@ -4,13 +4,14 @@
import (
"github.com/rackspace/gophercloud/acceptance/tools"
+ os "github.com/rackspace/gophercloud/openstack/db/v1/configurations"
"github.com/rackspace/gophercloud/pagination"
config "github.com/rackspace/gophercloud/rackspace/db/v1/configurations"
"github.com/rackspace/gophercloud/rackspace/db/v1/instances"
)
func (c *context) createConfigGrp() {
- opts := config.CreateOpts{
+ opts := os.CreateOpts{
Name: tools.RandomString("config_", 5),
Values: map[string]interface{}{
"connect_timeout": 300,
@@ -33,7 +34,7 @@
}
func (c *context) updateConfigGrp() {
- opts := config.UpdateOpts{
+ opts := os.UpdateOpts{
Name: tools.RandomString("new_name_", 5),
Values: map[string]interface{}{
"connect_timeout": 250,
@@ -45,9 +46,9 @@
}
func (c *context) replaceConfigGrp() {
- opts := config.UpdateOpts{
+ opts := os.UpdateOpts{
Values: map[string]interface{}{
- "expire_logs_days": 7,
+ "big_tables": 1,
},
}
diff --git a/acceptance/rackspace/db/v1/instance_test.go b/acceptance/rackspace/db/v1/instance_test.go
index f6e1f03..5441763 100644
--- a/acceptance/rackspace/db/v1/instance_test.go
+++ b/acceptance/rackspace/db/v1/instance_test.go
@@ -5,7 +5,6 @@
import (
"testing"
- "github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/acceptance/tools"
"github.com/rackspace/gophercloud/pagination"
"github.com/rackspace/gophercloud/rackspace/db/v1/instances"
@@ -69,8 +68,12 @@
// TEARDOWN
c.deleteUsers()
c.deleteDBs()
- c.detachAndDeleteReplica()
- c.deleteInstance()
+
+ c.restartInstance()
+ c.WaitUntilActive(c.instanceID)
+
+ c.deleteInstance(c.replicaID)
+ c.deleteInstance(c.instanceID)
}
func (c *context) createInstance() {
@@ -114,10 +117,10 @@
c.Logf("Getting instance: %#v", instance)
}
-func (c *context) deleteInstance() {
- err := instances.Delete(c.client, c.instanceID).ExtractErr()
+func (c *context) deleteInstance(id string) {
+ err := instances.Delete(c.client, id).ExtractErr()
c.AssertNoErr(err)
- c.Logf("Deleted instance %s", c.instanceID)
+ c.Logf("Deleted instance %s", id)
}
func (c *context) enableRootUser() {
@@ -164,25 +167,3 @@
c.Logf("Default config group for instance %s: %#v", c.instanceID, config)
c.AssertNoErr(err)
}
-
-func (c *context) detachAndDeleteReplica() {
- err := instances.DetachReplica(c.client, c.replicaID).ExtractErr()
- c.AssertNoErr(err)
- c.Logf("Detached replica %s from instance %s", c.replicaID, c.instanceID)
-
- err = instances.Delete(c.client, c.replicaID).ExtractErr()
- c.AssertNoErr(err)
- c.Logf("Deleted replica %s", c.replicaID)
-
- // Check that it's deleted
- err = gophercloud.WaitFor(60, func() (bool, error) {
- _, err := instances.Get(c.client, c.replicaID).Extract()
- if casted, ok := err.(*gophercloud.UnexpectedResponseCodeError); ok && casted.Actual == 404 {
- return true, nil
- }
- if err != nil {
- return false, err
- }
- return false, nil
- })
-}
diff --git a/openstack/db/v1/configurations/fixtures.go b/openstack/db/v1/configurations/fixtures.go
index c3723ab..95784ad 100644
--- a/openstack/db/v1/configurations/fixtures.go
+++ b/openstack/db/v1/configurations/fixtures.go
@@ -34,12 +34,12 @@
`
var (
- listConfigsJSON = fmt.Sprintf(`{"configurations": [%s]}`, singleConfigJSON)
- getConfigJSON = fmt.Sprintf(`{"configuration": %s}`, singleConfigJSON)
- createConfigJSON = fmt.Sprintf(`{"configuration": %s}`, singleConfigWithValuesJSON)
+ ListConfigsJSON = fmt.Sprintf(`{"configurations": [%s]}`, singleConfigJSON)
+ GetConfigJSON = fmt.Sprintf(`{"configuration": %s}`, singleConfigJSON)
+ CreateConfigJSON = fmt.Sprintf(`{"configuration": %s}`, singleConfigWithValuesJSON)
)
-var createReq = `
+var CreateReq = `
{
"configuration": {
"datastore": {
@@ -56,7 +56,7 @@
}
`
-var updateReq = `
+var UpdateReq = `
{
"configuration": {
"values": {
@@ -66,7 +66,7 @@
}
`
-var listInstancesJSON = `
+var ListInstancesJSON = `
{
"instances": [
{
@@ -77,7 +77,7 @@
}
`
-var listParamsJSON = `
+var ListParamsJSON = `
{
"configuration-parameters": [
{
@@ -112,7 +112,7 @@
}
`
-var getParamJSON = `
+var GetParamJSON = `
{
"max": 1,
"min": 0,
@@ -122,7 +122,7 @@
}
`
-var exampleConfig = Config{
+var ExampleConfig = Config{
Created: "2014-07-31T18:56:09",
DatastoreName: "mysql",
DatastoreVersionID: "b00000b0-00b0-0b00-00b0-000b000000bb",
@@ -133,7 +133,7 @@
Updated: "2014-07-31T18:56:09",
}
-var exampleConfigWithValues = Config{
+var ExampleConfigWithValues = Config{
Created: "2014-07-31T15:02:52",
DatastoreName: "mysql",
DatastoreVersionID: "b00000b0-00b0-0b00-00b0-000b000000bb",
diff --git a/openstack/db/v1/databases/requests.go b/openstack/db/v1/databases/requests.go
index 4a1b40c..f1eb5d9 100644
--- a/openstack/db/v1/databases/requests.go
+++ b/openstack/db/v1/databases/requests.go
@@ -108,8 +108,7 @@
var res DeleteResult
_, res.Err = client.Request("DELETE", dbURL(client, instanceID, dbName), gophercloud.RequestOpts{
- JSONBody: &res.Body,
- OkCodes: []int{202},
+ OkCodes: []int{202},
})
return res
diff --git a/openstack/db/v1/instances/fixtures.go b/openstack/db/v1/instances/fixtures.go
index 9b4b209..1388e23 100644
--- a/openstack/db/v1/instances/fixtures.go
+++ b/openstack/db/v1/instances/fixtures.go
@@ -89,7 +89,7 @@
)
var (
- restartReq = `{"restart": true}`
+ restartReq = `{"restart": {}}`
resizeReq = `{"resize": {"flavorRef": "2"}}`
resizeVolReq = `{"resize": {"volume": {"size": 4}}}`
)
diff --git a/openstack/db/v1/instances/requests.go b/openstack/db/v1/instances/requests.go
index bd70295..425db13 100644
--- a/openstack/db/v1/instances/requests.go
+++ b/openstack/db/v1/instances/requests.go
@@ -179,7 +179,7 @@
var res ActionResult
_, res.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
- JSONBody: map[string]interface{}{"restart": true},
+ JSONBody: map[string]interface{}{"restart": struct{}{}},
OkCodes: []int{202},
})