acceptance: Skip noauth tests if config not provided

This is a non-default (and somewhat esoteric) configuration. Skip the
tests unless explicitly provided.

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

internal/acceptance/clients/clients.go

@@ -218,7 +218,7 @@ func NewBlockStorageV2NoAuthClient() (*gophercloud.ServiceClient, error) {
 }
 
 // NewBlockStorageV3NoAuthClient returns a noauth *ServiceClient for
-// making calls to the OpenStack Block Storage v2 API. An error will be
+// making calls to the OpenStack Block Storage v3 API. An error will be
 // returned if client creation was not possible.
 func NewBlockStorageV3NoAuthClient() (*gophercloud.ServiceClient, error) {
 	client, err := blockstorageNoAuth.NewClient(gophercloud.AuthOptions{

internal/acceptance/clients/conditions.go

@@ -83,8 +83,24 @@ func RequireNovaNetwork(t *testing.T) {
 	}
 }
 
-// RequireIronicHTTPBasic will restric a test to be only run in
-// environments that have Ironic using http_basic.
+// RequireCinderNoAuth will restrict a test to be only run in environments that
+// have Cinder using noauth.
+func RequireCinderNoAuth(t *testing.T) {
+	if os.Getenv("CINDER_ENDPOINT") == "" || os.Getenv("OS_USERNAME") == "" {
+		t.Skip("this test requires Cinder using noauth, set OS_USERNAME and CINDER_ENDPOINT")
+	}
+}
+
+// RequireIronicNoAuth will restrict a test to be only run in environments that
+// have Ironic using noauth.
+func RequireIronicNoAuth(t *testing.T) {
+	if os.Getenv("IRONIC_ENDPOINT") == "" || os.Getenv("OS_USERNAME") == "" {
+		t.Skip("this test requires IRONIC using noauth, set OS_USERNAME and IRONIC_ENDPOINT")
+	}
+}
+
+// RequireIronicHTTPBasic will restrict a test to be only run in environments
+// that have Ironic using http_basic.
 func RequireIronicHTTPBasic(t *testing.T) {
 	if os.Getenv("IRONIC_ENDPOINT") == "" || os.Getenv("OS_USERNAME") == "" || os.Getenv("OS_PASSWORD") == "" {
 		t.Skip("this test requires Ironic using http_basic, set OS_USERNAME, OS_PASSWORD and IRONIC_ENDPOINT")

internal/acceptance/openstack/baremetal/noauth/allocations_test.go

@@ -15,6 +15,7 @@ import (
 
 func TestAllocationsCreateDestroy(t *testing.T) {
 	clients.RequireLong(t)
+	clients.RequireIronicNoAuth(t)
 
 	client, err := clients.NewBareMetalV1NoAuthClient()
 	th.AssertNoErr(t, err)

internal/acceptance/openstack/baremetal/noauth/nodes_test.go

@@ -16,6 +16,7 @@ import (
 
 func TestNodesCreateDestroy(t *testing.T) {
 	clients.RequireLong(t)
+	clients.RequireIronicNoAuth(t)
 
 	client, err := clients.NewBareMetalV1NoAuthClient()
 	th.AssertNoErr(t, err)
@@ -48,6 +49,7 @@ func TestNodesCreateDestroy(t *testing.T) {
 
 func TestNodesUpdate(t *testing.T) {
 	clients.RequireLong(t)
+	clients.RequireIronicNoAuth(t)
 
 	client, err := clients.NewBareMetalV1NoAuthClient()
 	th.AssertNoErr(t, err)
@@ -72,6 +74,7 @@ func TestNodesUpdate(t *testing.T) {
 func TestNodesRAIDConfig(t *testing.T) {
 	clients.SkipReleasesBelow(t, "stable/ussuri")
 	clients.RequireLong(t)
+	clients.RequireIronicNoAuth(t)
 
 	client, err := clients.NewBareMetalV1NoAuthClient()
 	th.AssertNoErr(t, err)

internal/acceptance/openstack/baremetal/noauth/ports_test.go

@@ -16,6 +16,7 @@ import (
 
 func TestPortsCreateDestroy(t *testing.T) {
 	clients.RequireLong(t)
+	clients.RequireIronicNoAuth(t)
 
 	client, err := clients.NewBareMetalV1NoAuthClient()
 	th.AssertNoErr(t, err)
@@ -50,6 +51,7 @@ func TestPortsCreateDestroy(t *testing.T) {
 
 func TestPortsUpdate(t *testing.T) {
 	clients.RequireLong(t)
+	clients.RequireIronicNoAuth(t)
 
 	client, err := clients.NewBareMetalV1NoAuthClient()
 	th.AssertNoErr(t, err)

internal/acceptance/openstack/blockstorage/noauth/snapshots_test.go

@@ -12,6 +12,8 @@ import (
 )
 
 func TestSnapshotsList(t *testing.T) {
+	clients.RequireCinderNoAuth(t)
+
 	client, err := clients.NewBlockStorageV3NoAuthClient()
 	if err != nil {
 		t.Fatalf("Unable to create a blockstorage client: %v", err)
@@ -33,6 +35,8 @@ func TestSnapshotsList(t *testing.T) {
 }
 
 func TestSnapshotsCreateDelete(t *testing.T) {
+	clients.RequireCinderNoAuth(t)
+
 	client, err := clients.NewBlockStorageV3NoAuthClient()
 	if err != nil {
 		t.Fatalf("Unable to create a blockstorage client: %v", err)

internal/acceptance/openstack/blockstorage/noauth/volumes_test.go

@@ -12,6 +12,8 @@ import (
 )
 
 func TestVolumesList(t *testing.T) {
+	clients.RequireCinderNoAuth(t)
+
 	client, err := clients.NewBlockStorageV3NoAuthClient()
 	if err != nil {
 		t.Fatalf("Unable to create a blockstorage client: %v", err)
@@ -33,6 +35,8 @@ func TestVolumesList(t *testing.T) {
 }
 
 func TestVolumesCreateDestroy(t *testing.T) {
+	clients.RequireCinderNoAuth(t)
+
 	client, err := clients.NewBlockStorageV3NoAuthClient()
 	if err != nil {
 		t.Fatalf("Unable to create blockstorage client: %v", err)