gophercloud · stephenfin · Jul 17, 2024 · Jul 17, 2024 · Oct 21, 2024 · Jul 17, 2024
diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml
@@ -2,6 +2,13 @@ name: functional-baremetal
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**baremetal**'
       - '.github/workflows/functional-baremetal.yaml'
   schedule:

diff --git a/.github/workflows/functional-blockstorage.yaml b/.github/workflows/functional-blockstorage.yaml
@@ -2,6 +2,13 @@ name: functional-blockstorage
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**blockstorage**'
       - '.github/workflows/functional-blockstorage.yaml'
   schedule:

diff --git a/.github/workflows/functional-compute.yaml b/.github/workflows/functional-compute.yaml
@@ -2,6 +2,13 @@ name: functional-compute
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**compute**'
       - '.github/workflows/functional-compute.yaml'
   schedule:

diff --git a/.github/workflows/functional-containerinfra.yaml b/.github/workflows/functional-containerinfra.yaml
@@ -2,6 +2,13 @@ name: functional-containerinfra
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**containerinfra**'
       - '.github/workflows/functional-containerinfra.yaml'
   schedule:

diff --git a/.github/workflows/functional-dns.yaml b/.github/workflows/functional-dns.yaml
@@ -2,6 +2,13 @@ name: functional-dns
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**dns**'
       - '.github/workflows/functional-dns.yaml'
   schedule:

diff --git a/.github/workflows/functional-fwaas_v2.yaml b/.github/workflows/functional-fwaas_v2.yaml
@@ -6,6 +6,13 @@ name: functional-fwaas_v2
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**networking/v2/extensions/fwaas_v2**'
       - '.github/workflows/functional-fwaas_v2.yaml'
   schedule:

diff --git a/.github/workflows/functional-identity.yaml b/.github/workflows/functional-identity.yaml
@@ -2,6 +2,13 @@ name: functional-identity
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**identity**'
       - '.github/workflows/functional-identity.yaml'
   schedule:

diff --git a/.github/workflows/functional-image.yaml b/.github/workflows/functional-image.yaml
@@ -2,6 +2,13 @@ name: functional-image
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**image**'
       - '.github/workflows/functional-image.yaml'
   schedule:

diff --git a/.github/workflows/functional-keymanager.yaml b/.github/workflows/functional-keymanager.yaml
@@ -2,6 +2,13 @@ name: functional-keymanager
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**keymanager**'
       - '.github/workflows/functional-keymanager.yaml'
   schedule:

diff --git a/.github/workflows/functional-loadbalancer.yaml b/.github/workflows/functional-loadbalancer.yaml
@@ -2,6 +2,13 @@ name: functional-loadbalancer
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**loadbalancer**'
       - '.github/workflows/functional-loadbalancer.yaml'
   schedule:

diff --git a/.github/workflows/functional-messaging.yaml b/.github/workflows/functional-messaging.yaml
@@ -2,6 +2,13 @@ name: functional-messaging
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**messaging**'
       - '.github/workflows/functional-messaging.yaml'
   schedule:

diff --git a/.github/workflows/functional-networking.yaml b/.github/workflows/functional-networking.yaml
@@ -2,6 +2,13 @@ name: functional-networking
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**networking**'
       - '.github/workflows/functional-networking.yaml'
   schedule:

diff --git a/.github/workflows/functional-objectstorage.yaml b/.github/workflows/functional-objectstorage.yaml
@@ -2,6 +2,13 @@ name: functional-objectstorage
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**objectstorage**'
       - '.github/workflows/functional-objectstorage.yaml'
   schedule:

diff --git a/.github/workflows/functional-orchestration.yaml b/.github/workflows/functional-orchestration.yaml
@@ -2,6 +2,13 @@ name: functional-orchestration
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**orchestration**'
       - '.github/workflows/functional-orchestration.yaml'
   schedule:

diff --git a/.github/workflows/functional-placement.yaml b/.github/workflows/functional-placement.yaml
@@ -2,6 +2,13 @@ name: functional-placement
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**placement**'
       - '.github/workflows/functional-placement.yaml'
   schedule:

diff --git a/.github/workflows/functional-sharedfilesystems.yaml b/.github/workflows/functional-sharedfilesystems.yaml
@@ -2,6 +2,13 @@ name: functional-sharedfilesystems
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**sharedfilesystems**'
       - '.github/workflows/functional-sharedfilesystems.yaml'
   schedule:

diff --git a/.github/workflows/functional-workflow.yaml b/.github/workflows/functional-workflow.yaml
@@ -2,6 +2,13 @@ name: functional-workflow
 on:
   pull_request:
     paths:
+      - 'openstack/auth_env.go'
+      - 'openstack/client.go'
+      - 'openstack/endpoint.go'
+      - 'openstack/endpoint_location.go'
+      - 'openstack/config/provider_client.go'
+      - 'openstack/utils/choose_version.go'
+      - 'openstack/utils/discovery.go'
       - '**workflow**'
       - '.github/workflows/functional-workflow.yaml'
   schedule:

diff --git a/Makefile b/Makefile
@@ -36,11 +36,11 @@ format:
 .PHONY: format
 
 unit:
-	$(GO_TEST) ./...
+	$(GO_TEST) -shuffle on ./...
 .PHONY: unit
 
 coverage:
-	$(GO_TEST) -covermode count -coverprofile cover.out -coverpkg=./... ./...
+	$(GO_TEST) -shuffle on -covermode count -coverprofile cover.out -coverpkg=./... ./...
 .PHONY: coverage
 
 acceptance: acceptance-basic acceptance-baremetal acceptance-blockstorage acceptance-compute acceptance-container acceptance-containerinfra acceptance-db acceptance-dns acceptance-identity acceptance-image acceptance-keymanager acceptance-loadbalancer acceptance-messaging acceptance-networking acceptance-objectstorage acceptance-orchestration acceptance-placement acceptance-sharedfilesystems acceptance-workflow

diff --git a/docs/contributor-tutorial/.template/testing/requests_test.go b/docs/contributor-tutorial/.template/testing/requests_test.go
@@ -16,7 +16,7 @@ func TestListResources(t *testing.T) {
 	HandleListResourcesSuccessfully(t)
 
 	count := 0
-	err := resources.List(client.ServiceClient(), nil).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
+	err := resources.List(client.ServiceClient(fakeServer), nil).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
 		count++
 
 		actual, err := resources.ExtractResources(page)
@@ -35,7 +35,7 @@ func TestListResourcesAllPages(t *testing.T) {
 	defer th.TeardownHTTP()
 	HandleListResourcesSuccessfully(t)
 
-	allPages, err := resources.List(client.ServiceClient(), nil).AllPages(context.TODO())
+	allPages, err := resources.List(client.ServiceClient(fakeServer), nil).AllPages(context.TODO())
 	th.AssertNoErr(t, err)
 	actual, err := resources.ExtractResources(allPages)
 	th.AssertNoErr(t, err)
@@ -47,7 +47,7 @@ func TestGetResource(t *testing.T) {
 	defer th.TeardownHTTP()
 	HandleGetResourceSuccessfully(t)
 
-	actual, err := resources.Get(context.TODO(), client.ServiceClient(), "9fe1d3").Extract()
+	actual, err := resources.Get(context.TODO(), client.ServiceClient(fakeServer), "9fe1d3").Extract()
 	th.AssertNoErr(t, err)
 	th.AssertDeepEquals(t, SecondResource, *actual)
 }
@@ -61,7 +61,7 @@ func TestCreateResource(t *testing.T) {
 		Name: "resource two",
 	}
 
-	actual, err := resources.Create(context.TODO(), client.ServiceClient(), createOpts).Extract()
+	actual, err := resources.Create(context.TODO(), client.ServiceClient(fakeServer), createOpts).Extract()
 	th.AssertNoErr(t, err)
 	th.AssertDeepEquals(t, SecondResource, *actual)
 }
@@ -71,7 +71,7 @@ func TestDeleteResource(t *testing.T) {
 	defer th.TeardownHTTP()
 	HandleDeleteResourceSuccessfully(t)
 
-	res := resources.Delete(context.TODO(), client.ServiceClient(), "9fe1d3")
+	res := resources.Delete(context.TODO(), client.ServiceClient(fakeServer), "9fe1d3")
 	th.AssertNoErr(t, res.Err)
 }
 
@@ -84,7 +84,7 @@ func TestUpdateResource(t *testing.T) {
 		Description: "Staging Resource",
 	}
 
-	actual, err := resources.Update(context.TODO(), client.ServiceClient(), "9fe1d3", updateOpts).Extract()
+	actual, err := resources.Update(context.TODO(), client.ServiceClient(fakeServer), "9fe1d3", updateOpts).Extract()
 	th.AssertNoErr(t, err)
 	th.AssertDeepEquals(t, SecondResourceUpdated, *actual)
 }
diff --git a/endpoint_search.go b/endpoint_search.go
@@ -79,6 +79,11 @@ type EndpointOpts struct {
 	// Required only for services that span multiple regions.
 	Region string
 
+	// Version [optional] is the major version of the service required. It it not
+	// a microversion. Use this to ensure the correct endpoint is selected when
+	// multiple API versions are available.
+	Version int
+
 	// Availability [optional] is the visibility of the endpoint to be returned.
 	// Valid types include the constants AvailabilityPublic, AvailabilityInternal,
 	// or AvailabilityAdmin from this package.

diff --git a/internal/acceptance/openstack/networking/v2/extensions/vlantransparent/vlantransparent.go b/internal/acceptance/openstack/networking/v2/extensions/vlantransparent/vlantransparent.go
@@ -75,33 +75,3 @@ func CreateVLANTransparentNetwork(t *testing.T, client *gophercloud.ServiceClien
 
 	return &network, nil
 }
-
-// UpdateVLANTransparentNetwork will update a network with the
-// "vlan-transparent" extension. An error will be returned if the network could
-// not be updated.
-func UpdateVLANTransparentNetwork(t *testing.T, client *gophercloud.ServiceClient, networkID string) (*VLANTransparentNetwork, error) {
-	networkName := tools.RandomString("TESTACC-NEW-", 6)
-	networkUpdateOpts := networks.UpdateOpts{
-		Name: &networkName,
-	}
-
-	iFalse := false
-	updateOpts := vlantransparent.UpdateOptsExt{
-		UpdateOptsBuilder: &networkUpdateOpts,
-		VLANTransparent:   &iFalse,
-	}
-
-	t.Logf("Attempting to update a VLAN-transparent network: %s", networkID)
-
-	var network VLANTransparentNetwork
-	err := networks.Update(context.TODO(), client, networkID, updateOpts).ExtractInto(&network)
-	if err != nil {
-		return nil, err
-	}
-
-	t.Logf("Successfully updated the network.")
-
-	th.AssertEquals(t, networkName, network.Name)
-
-	return &network, nil
-}
diff --git a/...nal/acceptance/openstack/networking/v2/extensions/vlantransparent/vlantransparent_test.go b/...nal/acceptance/openstack/networking/v2/extensions/vlantransparent/vlantransparent_test.go
@@ -25,11 +25,7 @@ func TestVLANTransparentCRUD(t *testing.T) {
 
 	tools.PrintResource(t, network)
 
-	// Update the created VLAN transparent network.
-	newNetwork, err := UpdateVLANTransparentNetwork(t, client, network.ID)
-	th.AssertNoErr(t, err)
-
-	tools.PrintResource(t, newNetwork)
+	// The vlan_transparent field is read-only so no update test
 
 	// Check that the created VLAN transparent network exists.
 	vlanTransparentNetworks, err := ListVLANTransparentNetworks(t, client)

diff --git a/openstack/baremetal/apiversions/testing/fixtures_test.go b/openstack/baremetal/apiversions/testing/fixtures_test.go
@@ -81,8 +81,8 @@ var IronicAllAPIVersionResults = apiversions.APIVersions{
 	},
 }
 
-func MockListResponse(t *testing.T) {
-	th.Mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+func MockListResponse(t *testing.T, fakeServer th.FakeServer) {
+	fakeServer.Mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
@@ -93,8 +93,8 @@ func MockListResponse(t *testing.T) {
 	})
 }
 
-func MockGetResponse(t *testing.T) {
-	th.Mux.HandleFunc("/v1/", func(w http.ResponseWriter, r *http.Request) {
+func MockGetResponse(t *testing.T, fakeServer th.FakeServer) {
+	fakeServer.Mux.HandleFunc("/v1/", func(w http.ResponseWriter, r *http.Request) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)