Identity Acceptance Test Cleanup (#49)
diff --git a/acceptance/openstack/identity/v2/token_test.go b/acceptance/openstack/identity/v2/token_test.go
index c2f7e51..4cd8301 100644
--- a/acceptance/openstack/identity/v2/token_test.go
+++ b/acceptance/openstack/identity/v2/token_test.go
@@ -5,50 +5,64 @@
import (
"testing"
- tokens2 "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens"
- th "github.com/gophercloud/gophercloud/testhelper"
+ "github.com/gophercloud/gophercloud/acceptance/clients"
+ "github.com/gophercloud/gophercloud/openstack"
+ "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens"
)
-func TestAuthenticateAndValidate(t *testing.T) {
- // 1. TestAuthenticate
- ao := v2AuthOptions(t)
- service := unauthenticatedClient(t)
-
- // Authenticated!
- result := tokens2.Create(service, tokens2.WrapOptions(ao))
-
- // Extract and print the token.
- token, err := result.ExtractToken()
- th.AssertNoErr(t, err)
-
- t.Logf("Acquired token: [%s]", token.ID)
- t.Logf("The token will expire at: [%s]", token.ExpiresAt.String())
- t.Logf("The token is valid for tenant: [%#v]", token.Tenant)
-
- // Extract and print the service catalog.
- catalog, err := result.ExtractServiceCatalog()
- th.AssertNoErr(t, err)
-
- t.Logf("Acquired service catalog listing [%d] services", len(catalog.Entries))
- for i, entry := range catalog.Entries {
- t.Logf("[%02d]: name=[%s], type=[%s]", i, entry.Name, entry.Type)
- for _, endpoint := range entry.Endpoints {
- t.Logf(" - region=[%s] publicURL=[%s]", endpoint.Region, endpoint.PublicURL)
- }
+func TestTokenAuthenticate(t *testing.T) {
+ client, err := clients.NewIdentityV2UnauthenticatedClient()
+ if err != nil {
+ t.Fatalf("Unable to obtain an identity client: %v", err)
}
- // 2. TestValidate
- client := authenticatedClient(t)
+ authOptions, err := openstack.AuthOptionsFromEnv()
+ if err != nil {
+ t.Fatalf("Unable to obtain authentication options: %v", err)
+ }
- // Validate Token!
- getResult := tokens2.Get(client, token.ID)
+ result := tokens.Create(client, authOptions)
+ token, err := result.ExtractToken()
+ if err != nil {
+ t.Fatalf("Unable to extract token: %v", err)
+ }
- // Extract and print the user.
+ PrintToken(t, token)
+
+ catalog, err := result.ExtractServiceCatalog()
+ if err != nil {
+ t.Fatalf("Unable to extract service catalog: %v", err)
+ }
+
+ for _, entry := range catalog.Entries {
+ PrintCatalogEntry(t, &entry)
+ }
+}
+
+func TestTokenValidate(t *testing.T) {
+ client, err := clients.NewIdentityV2Client()
+ if err != nil {
+ t.Fatalf("Unable to obtain an identity client: %v", err)
+ }
+
+ authOptions, err := openstack.AuthOptionsFromEnv()
+ if err != nil {
+ t.Fatalf("Unable to obtain authentication options: %v", err)
+ }
+
+ result := tokens.Create(client, authOptions)
+ token, err := result.ExtractToken()
+ if err != nil {
+ t.Fatalf("Unable to extract token: %v", err)
+ }
+
+ PrintToken(t, token)
+
+ getResult := tokens.Get(client, token.ID)
user, err := getResult.ExtractUser()
- th.AssertNoErr(t, err)
+ if err != nil {
+ t.Fatalf("Unable to extract user: %v", err)
+ }
- t.Logf("Acquired User: [%s]", user.Name)
- t.Logf("The User id: [%s]", user.ID)
- t.Logf("The User username: [%s]", user.UserName)
- t.Logf("The User roles: [%#v]", user.Roles)
+ PrintTokenUser(t, user)
}