Skip to content

Commit 42818b5

Browse files
kiwikjtopjian
kiwik
authored and
jtopjian
committed
Add OS_LB_ENVIRONMENT and OS_FW_ENVIRONMENT for Acc test (terraform-provider-openstack#228)
* Add OS_LB_ENVIRONMENT and OS_FW_ENVIRONMENT for Acc test Add OS_LB_ENVIRONMENT and OS_FW_ENVIRONMENT options to decide related load balance and firewall acc tests are executed or not. Fixes terraform-provider-openstack#227 * Add LBaaS and FWaaS pipelines into porject job define OpenLab have supported LBaaS and FWaaS jobs now, add pipelines into terraform-provider-openstack. We can add comment "recheck lbaas" or "recheck fwaas" into PR comments to trigger these checks.
1 parent b325f1d commit 42818b5

13 files changed

Lines changed: 44 additions & 20 deletions

‎.zuul.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,9 @@
2222
recheck-designate:
2323
jobs:
2424
- terraform-provider-openstack-acceptance-test-designate
25+
recheck-lbaas:
26+
jobs:
27+
- terraform-provider-openstack-acceptance-test-lbaas
28+
recheck-fwaas:
29+
jobs:
30+
- terraform-provider-openstack-acceptance-test-fwaas

‎openstack/import_openstack_fw_firewall_v1_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ func TestAccFWFirewallV1_importBasic(t *testing.T) {
1010
resourceName := "openstack_fw_firewall_v1.fw_1"
1111

1212
resource.Test(t, resource.TestCase{
13-
PreCheck: func() { testAccPreCheck(t) },
13+
PreCheck: func() { testAccPreCheckFW(t) },
1414
Providers: testAccProviders,
1515
CheckDestroy: testAccCheckFWFirewallV1Destroy,
1616
Steps: []resource.TestStep{

‎openstack/import_openstack_fw_policy_v1_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ func TestAccFWPolicyV1_importBasic(t *testing.T) {
1010
resourceName := "openstack_fw_policy_v1.policy_1"
1111

1212
resource.Test(t, resource.TestCase{
13-
PreCheck: func() { testAccPreCheck(t) },
13+
PreCheck: func() { testAccPreCheckFW(t) },
1414
Providers: testAccProviders,
1515
CheckDestroy: testAccCheckFWPolicyV1Destroy,
1616
Steps: []resource.TestStep{

‎openstack/import_openstack_fw_rule_v1_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ func TestAccFWRuleV1_importBasic(t *testing.T) {
1010
resourceName := "openstack_fw_rule_v1.rule_1"
1111

1212
resource.Test(t, resource.TestCase{
13-
PreCheck: func() { testAccPreCheck(t) },
13+
PreCheck: func() { testAccPreCheckFW(t) },
1414
Providers: testAccProviders,
1515
CheckDestroy: testAccCheckFWRuleV1Destroy,
1616
Steps: []resource.TestStep{

‎openstack/provider_test.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ var (
2727
OS_POOL_NAME = os.Getenv("OS_POOL_NAME")
2828
OS_REGION_NAME = os.Getenv("OS_REGION_NAME")
2929
OS_SWIFT_ENVIRONMENT = os.Getenv("OS_SWIFT_ENVIRONMENT")
30+
OS_LB_ENVIRONMENT = os.Getenv("OS_LB_ENVIRONMENT")
31+
OS_FW_ENVIRONMENT = os.Getenv("OS_FW_ENVIRONMENT")
3032
)
3133

3234
var testAccProviders map[string]terraform.ResourceProvider
@@ -107,6 +109,22 @@ func testAccPreCheckDatabase(t *testing.T) {
107109
}
108110
}
109111

112+
func testAccPreCheckLB(t *testing.T) {
113+
testAccPreCheckRequiredEnvVars(t)
114+
115+
if OS_LB_ENVIRONMENT == "" {
116+
t.Skip("This environment does not support LB tests")
117+
}
118+
}
119+
120+
func testAccPreCheckFW(t *testing.T) {
121+
testAccPreCheckRequiredEnvVars(t)
122+
123+
if OS_FW_ENVIRONMENT == "" {
124+
t.Skip("This environment does not support FW tests")
125+
}
126+
}
127+
110128
func testAccPreCheckAdminOnly(t *testing.T) {
111129
v := os.Getenv("OS_USERNAME")
112130
if v != "admin" {

‎openstack/resource_openstack_fw_firewall_v1_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestAccFWFirewallV1_basic(t *testing.T) {
1515
var policyID *string
1616

1717
resource.Test(t, resource.TestCase{
18-
PreCheck: func() { testAccPreCheck(t) },
18+
PreCheck: func() { testAccPreCheckFW(t) },
1919
Providers: testAccProviders,
2020
CheckDestroy: testAccCheckFWFirewallV1Destroy,
2121
Steps: []resource.TestStep{
@@ -40,7 +40,7 @@ func TestAccFWFirewallV1_router(t *testing.T) {
4040
var firewall Firewall
4141

4242
resource.Test(t, resource.TestCase{
43-
PreCheck: func() { testAccPreCheck(t) },
43+
PreCheck: func() { testAccPreCheckFW(t) },
4444
Providers: testAccProviders,
4545
CheckDestroy: testAccCheckFWFirewallV1Destroy,
4646
Steps: []resource.TestStep{
@@ -59,7 +59,7 @@ func TestAccFWFirewallV1_no_router(t *testing.T) {
5959
var firewall Firewall
6060

6161
resource.Test(t, resource.TestCase{
62-
PreCheck: func() { testAccPreCheck(t) },
62+
PreCheck: func() { testAccPreCheckFW(t) },
6363
Providers: testAccProviders,
6464
CheckDestroy: testAccCheckFWFirewallV1Destroy,
6565
Steps: []resource.TestStep{
@@ -79,7 +79,7 @@ func TestAccFWFirewallV1_router_update(t *testing.T) {
7979
var firewall Firewall
8080

8181
resource.Test(t, resource.TestCase{
82-
PreCheck: func() { testAccPreCheck(t) },
82+
PreCheck: func() { testAccPreCheckFW(t) },
8383
Providers: testAccProviders,
8484
CheckDestroy: testAccCheckFWFirewallV1Destroy,
8585
Steps: []resource.TestStep{
@@ -105,7 +105,7 @@ func TestAccFWFirewallV1_router_remove(t *testing.T) {
105105
var firewall Firewall
106106

107107
resource.Test(t, resource.TestCase{
108-
PreCheck: func() { testAccPreCheck(t) },
108+
PreCheck: func() { testAccPreCheckFW(t) },
109109
Providers: testAccProviders,
110110
CheckDestroy: testAccCheckFWFirewallV1Destroy,
111111
Steps: []resource.TestStep{

‎openstack/resource_openstack_fw_policy_v1_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
func TestAccFWPolicyV1_basic(t *testing.T) {
1515
resource.Test(t, resource.TestCase{
16-
PreCheck: func() { testAccPreCheck(t) },
16+
PreCheck: func() { testAccPreCheckFW(t) },
1717
Providers: testAccProviders,
1818
CheckDestroy: testAccCheckFWPolicyV1Destroy,
1919
Steps: []resource.TestStep{
@@ -30,7 +30,7 @@ func TestAccFWPolicyV1_basic(t *testing.T) {
3030

3131
func TestAccFWPolicyV1_addRules(t *testing.T) {
3232
resource.Test(t, resource.TestCase{
33-
PreCheck: func() { testAccPreCheck(t) },
33+
PreCheck: func() { testAccPreCheckFW(t) },
3434
Providers: testAccProviders,
3535
CheckDestroy: testAccCheckFWPolicyV1Destroy,
3636
Steps: []resource.TestStep{
@@ -47,7 +47,7 @@ func TestAccFWPolicyV1_addRules(t *testing.T) {
4747

4848
func TestAccFWPolicyV1_deleteRules(t *testing.T) {
4949
resource.Test(t, resource.TestCase{
50-
PreCheck: func() { testAccPreCheck(t) },
50+
PreCheck: func() { testAccPreCheckFW(t) },
5151
Providers: testAccProviders,
5252
CheckDestroy: testAccCheckFWPolicyV1Destroy,
5353
Steps: []resource.TestStep{
@@ -64,7 +64,7 @@ func TestAccFWPolicyV1_deleteRules(t *testing.T) {
6464

6565
func TestAccFWPolicyV1_timeout(t *testing.T) {
6666
resource.Test(t, resource.TestCase{
67-
PreCheck: func() { testAccPreCheck(t) },
67+
PreCheck: func() { testAccPreCheckFW(t) },
6868
Providers: testAccProviders,
6969
CheckDestroy: testAccCheckFWPolicyV1Destroy,
7070
Steps: []resource.TestStep{

‎openstack/resource_openstack_fw_rule_v1_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestAccFWRuleV1_basic(t *testing.T) {
4848
}
4949

5050
resource.Test(t, resource.TestCase{
51-
PreCheck: func() { testAccPreCheck(t) },
51+
PreCheck: func() { testAccPreCheckFW(t) },
5252
Providers: testAccProviders,
5353
CheckDestroy: testAccCheckFWRuleV1Destroy,
5454
Steps: []resource.TestStep{
@@ -86,7 +86,7 @@ func TestAccFWRuleV1_anyProtocol(t *testing.T) {
8686
}
8787

8888
resource.Test(t, resource.TestCase{
89-
PreCheck: func() { testAccPreCheck(t) },
89+
PreCheck: func() { testAccPreCheckFW(t) },
9090
Providers: testAccProviders,
9191
CheckDestroy: testAccCheckFWRuleV1Destroy,
9292
Steps: []resource.TestStep{

‎openstack/resource_openstack_lb_listener_v2_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestAccLBV2Listener_basic(t *testing.T) {
1313
var listener listeners.Listener
1414

1515
resource.Test(t, resource.TestCase{
16-
PreCheck: func() { testAccPreCheck(t) },
16+
PreCheck: func() { testAccPreCheckLB(t) },
1717
Providers: testAccProviders,
1818
CheckDestroy: testAccCheckLBV2ListenerDestroy,
1919
Steps: []resource.TestStep{

‎openstack/resource_openstack_lb_loadbalancer_v2_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestAccLBV2LoadBalancer_basic(t *testing.T) {
1717
var lb loadbalancers.LoadBalancer
1818

1919
resource.Test(t, resource.TestCase{
20-
PreCheck: func() { testAccPreCheck(t) },
20+
PreCheck: func() { testAccPreCheckLB(t) },
2121
Providers: testAccProviders,
2222
CheckDestroy: testAccCheckLBV2LoadBalancerDestroy,
2323
Steps: []resource.TestStep{
@@ -46,7 +46,7 @@ func TestAccLBV2LoadBalancer_secGroup(t *testing.T) {
4646
var sg_1, sg_2 groups.SecGroup
4747

4848
resource.Test(t, resource.TestCase{
49-
PreCheck: func() { testAccPreCheck(t) },
49+
PreCheck: func() { testAccPreCheckLB(t) },
5050
Providers: testAccProviders,
5151
CheckDestroy: testAccCheckLBV2LoadBalancerDestroy,
5252
Steps: []resource.TestStep{

0 commit comments

Comments
 (0)