Acceptance Test Updates (#218)
* compute: don't pass choices
* blockstorage: don't pass choices
* DumpResource Function
This function prints a resource in JSON format but retains the actual
field name rather than using the name specified in the JSON tag.
* New DumpResource
This version just converts the resource into JSON. The original is
being left in git history for posterity.
* Renaming DumpResource to PrintResource
* Removing all print functions in favor of PrintResource
* Rebase reconcilliation
diff --git a/acceptance/openstack/identity/v3/endpoint_test.go b/acceptance/openstack/identity/v3/endpoint_test.go
index 6a52f26..a589970 100644
--- a/acceptance/openstack/identity/v3/endpoint_test.go
+++ b/acceptance/openstack/identity/v3/endpoint_test.go
@@ -7,6 +7,7 @@
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/clients"
+ "github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/identity/v3/endpoints"
"github.com/gophercloud/gophercloud/openstack/identity/v3/services"
)
@@ -28,7 +29,7 @@
}
for _, endpoint := range allEndpoints {
- PrintEndpoint(t, &endpoint)
+ tools.PrintResource(t, endpoint)
}
}
@@ -58,7 +59,7 @@
}
computeService := allServices[0]
- PrintService(t, &computeService)
+ tools.PrintResource(t, computeService)
// Enumerate the endpoints available for this service.
endpointListOpts := endpoints.ListOpts{
@@ -80,6 +81,6 @@
t.Fatalf("Expected one endpoint, got %d", len(allEndpoints))
}
- PrintEndpoint(t, &allEndpoints[0])
+ tools.PrintResource(t, allEndpoints[0])
}
diff --git a/acceptance/openstack/identity/v3/identity.go b/acceptance/openstack/identity/v3/identity.go
index f7ea48f..3276efc 100644
--- a/acceptance/openstack/identity/v3/identity.go
+++ b/acceptance/openstack/identity/v3/identity.go
@@ -5,10 +5,7 @@
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/tools"
- "github.com/gophercloud/gophercloud/openstack/identity/v3/endpoints"
"github.com/gophercloud/gophercloud/openstack/identity/v3/projects"
- "github.com/gophercloud/gophercloud/openstack/identity/v3/services"
- "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
)
// CreateProject will create a project with a random name.
@@ -49,38 +46,3 @@
t.Logf("Deleted project: %s", projectID)
}
-
-// PrintEndpoint will print an endpoint and all of its attributes.
-func PrintEndpoint(t *testing.T, endpoint *endpoints.Endpoint) {
- t.Logf("ID: %s", endpoint.ID)
- t.Logf("Availability: %s", endpoint.Availability)
- t.Logf("Name: %s", endpoint.Name)
- t.Logf("Region: %s", endpoint.Region)
- t.Logf("ServiceID: %s", endpoint.ServiceID)
- t.Logf("URL: %s", endpoint.URL)
-}
-
-// PrintProject will print a project and all of its attributes.
-func PrintProject(t *testing.T, project *projects.Project) {
- t.Logf("ID: %s", project.ID)
- t.Logf("IsDomain: %t", project.IsDomain)
- t.Logf("Description: %s", project.Description)
- t.Logf("DomainID: %s", project.DomainID)
- t.Logf("Enabled: %t", project.Enabled)
- t.Logf("Name: %s", project.Name)
- t.Logf("ParentID: %s", project.ParentID)
-}
-
-// PrintService will print a service and all of its attributes.
-func PrintService(t *testing.T, service *services.Service) {
- t.Logf("ID: %s", service.ID)
- t.Logf("Description: %s", service.Description)
- t.Logf("Name: %s", service.Name)
- t.Logf("Type: %s", service.Type)
-}
-
-// PrintToken will print a token and all of its attributes.
-func PrintToken(t *testing.T, token *tokens.Token) {
- t.Logf("ID: %s", token.ID)
- t.Logf("ExpiresAt: %v", token.ExpiresAt)
-}
diff --git a/acceptance/openstack/identity/v3/projects_test.go b/acceptance/openstack/identity/v3/projects_test.go
index ebb5543..8325bee 100644
--- a/acceptance/openstack/identity/v3/projects_test.go
+++ b/acceptance/openstack/identity/v3/projects_test.go
@@ -6,6 +6,7 @@
"testing"
"github.com/gophercloud/gophercloud/acceptance/clients"
+ "github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/identity/v3/projects"
)
@@ -31,7 +32,7 @@
}
for _, project := range allProjects {
- PrintProject(t, &project)
+ tools.PrintResource(t, project)
}
}
@@ -57,7 +58,7 @@
t.Fatalf("Unable to get project: %v", err)
}
- PrintProject(t, p)
+ tools.PrintResource(t, p)
}
func TestProjectsCRUD(t *testing.T) {
@@ -72,7 +73,7 @@
}
defer DeleteProject(t, client, project.ID)
- PrintProject(t, project)
+ tools.PrintResource(t, project)
var iFalse bool = false
updateOpts := projects.UpdateOpts{
@@ -84,7 +85,7 @@
t.Fatalf("Unable to update project: %v", err)
}
- PrintProject(t, updatedProject)
+ tools.PrintResource(t, updatedProject)
}
func TestProjectsDomain(t *testing.T) {
@@ -104,7 +105,7 @@
}
defer DeleteProject(t, client, projectDomain.ID)
- PrintProject(t, projectDomain)
+ tools.PrintResource(t, projectDomain)
createOpts = projects.CreateOpts{
DomainID: projectDomain.ID,
@@ -116,7 +117,7 @@
}
defer DeleteProject(t, client, project.ID)
- PrintProject(t, project)
+ tools.PrintResource(t, project)
var iFalse = false
updateOpts := projects.UpdateOpts{
@@ -141,7 +142,7 @@
}
defer DeleteProject(t, client, projectMain.ID)
- PrintProject(t, projectMain)
+ tools.PrintResource(t, projectMain)
createOpts := projects.CreateOpts{
ParentID: projectMain.ID,
@@ -153,5 +154,5 @@
}
defer DeleteProject(t, client, project.ID)
- PrintProject(t, project)
+ tools.PrintResource(t, project)
}
diff --git a/acceptance/openstack/identity/v3/service_test.go b/acceptance/openstack/identity/v3/service_test.go
index 364f69b..7a0c71f 100644
--- a/acceptance/openstack/identity/v3/service_test.go
+++ b/acceptance/openstack/identity/v3/service_test.go
@@ -6,6 +6,7 @@
"testing"
"github.com/gophercloud/gophercloud/acceptance/clients"
+ "github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/identity/v3/services"
)
@@ -26,7 +27,7 @@
}
for _, service := range allServices {
- PrintService(t, &service)
+ tools.PrintResource(t, service)
}
}
diff --git a/acceptance/openstack/identity/v3/token_test.go b/acceptance/openstack/identity/v3/token_test.go
index 13b38f8..e0f90d9 100644
--- a/acceptance/openstack/identity/v3/token_test.go
+++ b/acceptance/openstack/identity/v3/token_test.go
@@ -6,6 +6,7 @@
"testing"
"github.com/gophercloud/gophercloud/acceptance/clients"
+ "github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack"
"github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
)
@@ -32,5 +33,5 @@
t.Fatalf("Unable to get token: %v", err)
}
- PrintToken(t, token)
+ tools.PrintResource(t, token)
}