Finalizing most acceptance tests
diff --git a/openstack/db/v1/databases/results.go b/openstack/db/v1/databases/results.go
index 7c967f5..7d4b6ae 100644
--- a/openstack/db/v1/databases/results.go
+++ b/openstack/db/v1/databases/results.go
@@ -21,7 +21,7 @@
// CreateResult represents the result of a Create operation.
type CreateResult struct {
- gophercloud.Result
+ gophercloud.ErrResult
}
// DeleteResult represents the result of a Delete operation.
diff --git a/openstack/db/v1/flavors/requests_test.go b/openstack/db/v1/flavors/requests_test.go
index 0afe9bb..88b5871 100644
--- a/openstack/db/v1/flavors/requests_test.go
+++ b/openstack/db/v1/flavors/requests_test.go
@@ -25,7 +25,7 @@
expected := []Flavor{
Flavor{
- ID: 1,
+ ID: "1",
Name: "m1.tiny",
RAM: 512,
Links: []gophercloud.Link{
@@ -34,7 +34,7 @@
},
},
Flavor{
- ID: 2,
+ ID: "2",
Name: "m1.small",
RAM: 1024,
Links: []gophercloud.Link{
@@ -43,7 +43,7 @@
},
},
Flavor{
- ID: 3,
+ ID: "3",
Name: "m1.medium",
RAM: 2048,
Links: []gophercloud.Link{
@@ -52,7 +52,7 @@
},
},
Flavor{
- ID: 4,
+ ID: "4",
Name: "m1.large",
RAM: 4096,
Links: []gophercloud.Link{
@@ -79,7 +79,7 @@
th.AssertNoErr(t, err)
expected := &Flavor{
- ID: 1,
+ ID: "1",
Name: "m1.tiny",
RAM: 512,
Links: []gophercloud.Link{
diff --git a/openstack/db/v1/flavors/results.go b/openstack/db/v1/flavors/results.go
index d3f507e..2089f67 100644
--- a/openstack/db/v1/flavors/results.go
+++ b/openstack/db/v1/flavors/results.go
@@ -28,7 +28,7 @@
// Flavor records represent (virtual) hardware configurations for server resources in a region.
type Flavor struct {
// The flavor's unique identifier.
- ID int `mapstructure:"id"`
+ ID string `mapstructure:"id"`
// The RAM capacity for the flavor.
RAM int `mapstructure:"ram"`
diff --git a/openstack/db/v1/instances/fixtures.go b/openstack/db/v1/instances/fixtures.go
index 726501b..502d87f 100644
--- a/openstack/db/v1/instances/fixtures.go
+++ b/openstack/db/v1/instances/fixtures.go
@@ -105,7 +105,7 @@
Created: "2014-02-13T21:47:13",
Updated: "2014-02-13T21:47:13",
Flavor: flavors.Flavor{
- ID: 1,
+ ID: "1",
Links: []gophercloud.Link{
gophercloud.Link{Href: "https://my-openstack.com/v1.0/1234/flavors/1", Rel: "self"},
gophercloud.Link{Href: "https://my-openstack.com/v1.0/1234/flavors/1", Rel: "bookmark"},