Skip to content

Commit 8314ff1

Browse files
stephenfinstephenfin
committed
tests: Skip vpnaas tests if extension missing
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent 2a22f9d commit 8314ff1

File tree

5 files changed

+43
-5
lines changed

5 files changed

+43
-5
lines changed

‎internal/acceptance/openstack/networking/v2/extensions/vpnaas/group_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
10+
networking "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2"
1011
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
1112
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/vpnaas/endpointgroups"
1213
th "github.com/gophercloud/gophercloud/v2/testhelper"
@@ -16,6 +17,9 @@ func TestGroupList(t *testing.T) {
1617
client, err := clients.NewNetworkV2Client()
1718
th.AssertNoErr(t, err)
1819

20+
// Skip these tests if we don't have the required extension
21+
networking.RequireNeutronExtension(t, client, "vpnaas")
22+
1923
allPages, err := endpointgroups.List(client, nil).AllPages(context.TODO())
2024
th.AssertNoErr(t, err)
2125

@@ -31,6 +35,9 @@ func TestGroupCRUD(t *testing.T) {
3135
client, err := clients.NewNetworkV2Client()
3236
th.AssertNoErr(t, err)
3337

38+
// Skip these tests if we don't have the required extension
39+
networking.RequireNeutronExtension(t, client, "vpnaas")
40+
3441
group, err := CreateEndpointGroup(t, client)
3542
th.AssertNoErr(t, err)
3643
defer DeleteEndpointGroup(t, client, group.ID)

‎internal/acceptance/openstack/networking/v2/extensions/vpnaas/ikepolicy_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
10+
networking "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2"
1011
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
1112
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/vpnaas/ikepolicies"
1213
th "github.com/gophercloud/gophercloud/v2/testhelper"
@@ -16,6 +17,9 @@ func TestIKEPolicyList(t *testing.T) {
1617
client, err := clients.NewNetworkV2Client()
1718
th.AssertNoErr(t, err)
1819

20+
// Skip these tests if we don't have the required extension
21+
networking.RequireNeutronExtension(t, client, "vpnaas")
22+
1923
allPages, err := ikepolicies.List(client, nil).AllPages(context.TODO())
2024
th.AssertNoErr(t, err)
2125

@@ -31,6 +35,9 @@ func TestIKEPolicyCRUD(t *testing.T) {
3135
client, err := clients.NewNetworkV2Client()
3236
th.AssertNoErr(t, err)
3337

38+
// Skip these tests if we don't have the required extension
39+
networking.RequireNeutronExtension(t, client, "vpnaas")
40+
3441
policy, err := CreateIKEPolicy(t, client)
3542
th.AssertNoErr(t, err)
3643
defer DeleteIKEPolicy(t, client, policy.ID)

‎internal/acceptance/openstack/networking/v2/extensions/vpnaas/ipsecpolicy_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
10+
networking "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2"
1011
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
1112
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/vpnaas/ipsecpolicies"
1213
th "github.com/gophercloud/gophercloud/v2/testhelper"
@@ -16,6 +17,9 @@ func TestIPSecPolicyList(t *testing.T) {
1617
client, err := clients.NewNetworkV2Client()
1718
th.AssertNoErr(t, err)
1819

20+
// Skip these tests if we don't have the required extension
21+
networking.RequireNeutronExtension(t, client, "vpnaas")
22+
1923
allPages, err := ipsecpolicies.List(client, nil).AllPages(context.TODO())
2024
th.AssertNoErr(t, err)
2125

@@ -31,6 +35,9 @@ func TestIPSecPolicyCRUD(t *testing.T) {
3135
client, err := clients.NewNetworkV2Client()
3236
th.AssertNoErr(t, err)
3337

38+
// Skip these tests if we don't have the required extension
39+
networking.RequireNeutronExtension(t, client, "vpnaas")
40+
3441
policy, err := CreateIPSecPolicy(t, client)
3542
th.AssertNoErr(t, err)
3643
defer DeleteIPSecPolicy(t, client, policy.ID)

‎internal/acceptance/openstack/networking/v2/extensions/vpnaas/service_test.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
10+
networking "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2"
1011
layer3 "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2/extensions/layer3"
1112
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
1213
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/vpnaas/services"
@@ -17,6 +18,9 @@ func TestServiceList(t *testing.T) {
1718
client, err := clients.NewNetworkV2Client()
1819
th.AssertNoErr(t, err)
1920

21+
// Skip these tests if we don't have the required extension
22+
networking.RequireNeutronExtension(t, client, "vpnaas")
23+
2024
allPages, err := services.List(client, nil).AllPages(context.TODO())
2125
th.AssertNoErr(t, err)
2226

@@ -29,10 +33,15 @@ func TestServiceList(t *testing.T) {
2933
}
3034

3135
func TestServiceCRUD(t *testing.T) {
36+
// TODO(stephenfin): Why are we skipping this? Can we unskip? If not, we should remove.
3237
clients.SkipReleasesAbove(t, "stable/wallaby")
38+
3339
client, err := clients.NewNetworkV2Client()
3440
th.AssertNoErr(t, err)
3541

42+
// Skip these tests if we don't have the required extension
43+
networking.RequireNeutronExtension(t, client, "vpnaas")
44+
3645
router, err := layer3.CreateExternalRouter(t, client)
3746
th.AssertNoErr(t, err)
3847
defer layer3.DeleteRouter(t, client, router.ID)

‎internal/acceptance/openstack/networking/v2/extensions/vpnaas/siteconnection_test.go‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
10-
networks "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2"
10+
networking "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2"
1111
layer3 "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2/extensions/layer3"
1212
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
1313
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers"
@@ -19,6 +19,9 @@ func TestConnectionList(t *testing.T) {
1919
client, err := clients.NewNetworkV2Client()
2020
th.AssertNoErr(t, err)
2121

22+
// Skip these tests if we don't have the required extension
23+
networking.RequireNeutronExtension(t, client, "vpnaas")
24+
2225
allPages, err := siteconnections.List(client, nil).AllPages(context.TODO())
2326
th.AssertNoErr(t, err)
2427

@@ -31,19 +34,24 @@ func TestConnectionList(t *testing.T) {
3134
}
3235

3336
func TestConnectionCRUD(t *testing.T) {
37+
// TODO(stephenfin): Why are we skipping this? Can we unskip? If not, we should remove.
3438
clients.SkipReleasesAbove(t, "stable/wallaby")
39+
3540
client, err := clients.NewNetworkV2Client()
3641
th.AssertNoErr(t, err)
3742

43+
// Skip these tests if we don't have the required extension
44+
networking.RequireNeutronExtension(t, client, "vpnaas")
45+
3846
// Create Network
39-
network, err := networks.CreateNetwork(t, client)
47+
network, err := networking.CreateNetwork(t, client)
4048
th.AssertNoErr(t, err)
41-
defer networks.DeleteNetwork(t, client, network.ID)
49+
defer networking.DeleteNetwork(t, client, network.ID)
4250

4351
// Create Subnet
44-
subnet, err := networks.CreateSubnet(t, client, network.ID)
52+
subnet, err := networking.CreateSubnet(t, client, network.ID)
4553
th.AssertNoErr(t, err)
46-
defer networks.DeleteSubnet(t, client, subnet.ID)
54+
defer networking.DeleteSubnet(t, client, subnet.ID)
4755

4856
router, err := layer3.CreateExternalRouter(t, client)
4957
th.AssertNoErr(t, err)

0 commit comments

Comments
 (0)