Skip to content

Commit af2f866

Browse files
afedorchkohashim
afedorch
authored and
kohashim
committed
ORCH-1351 UpdateRequired properties
Tests should update the properties values even if UpdateRequired is false
1 parent ca8e2c0 commit af2f866

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

‎provider/load_balancer_backend_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,24 +116,24 @@ func TestLoadBalancerBackendResource_basic(t *testing.T) {
116116
{
117117
Config: config + `
118118
variable "backend_backendset_name" { default = "backendSet1" }
119-
variable "backend_backup" { default = false }
120-
variable "backend_drain" { default = false }
119+
variable "backend_backup" { default = true }
120+
variable "backend_drain" { default = true }
121121
variable "backend_ip_address" { default = "10.0.0.3" }
122-
variable "backend_offline" { default = false }
122+
variable "backend_offline" { default = true }
123123
variable "backend_port" { default = 10 }
124-
variable "backend_weight" { default = 10 }
124+
variable "backend_weight" { default = 11 }
125125
126126
` + compartmentIdVariableStr + BackendResourceConfig,
127127
Check: resource.ComposeAggregateTestCheckFunc(
128128
resource.TestCheckResourceAttr(resourceName, "backendset_name", "backendSet1"),
129-
resource.TestCheckResourceAttr(resourceName, "backup", "false"),
130-
resource.TestCheckResourceAttr(resourceName, "drain", "false"),
129+
resource.TestCheckResourceAttr(resourceName, "backup", "true"),
130+
resource.TestCheckResourceAttr(resourceName, "drain", "true"),
131131
resource.TestCheckResourceAttr(resourceName, "ip_address", "10.0.0.3"),
132132
resource.TestCheckResourceAttrSet(resourceName, "load_balancer_id"),
133133
resource.TestCheckResourceAttrSet(resourceName, "name"),
134-
resource.TestCheckResourceAttr(resourceName, "offline", "false"),
134+
resource.TestCheckResourceAttr(resourceName, "offline", "true"),
135135
resource.TestCheckResourceAttr(resourceName, "port", "10"),
136-
resource.TestCheckResourceAttr(resourceName, "weight", "10"),
136+
resource.TestCheckResourceAttr(resourceName, "weight", "11"),
137137

138138
func(s *terraform.State) (err error) {
139139
resId2, err = fromInstanceState(s, resourceName, "id")
@@ -148,12 +148,12 @@ variable "backend_weight" { default = 10 }
148148
{
149149
Config: config + `
150150
variable "backend_backendset_name" { default = "backendSet1" }
151-
variable "backend_backup" { default = false }
152-
variable "backend_drain" { default = false }
151+
variable "backend_backup" { default = true }
152+
variable "backend_drain" { default = true }
153153
variable "backend_ip_address" { default = "10.0.0.3" }
154-
variable "backend_offline" { default = false }
154+
variable "backend_offline" { default = true }
155155
variable "backend_port" { default = 10 }
156-
variable "backend_weight" { default = 10 }
156+
variable "backend_weight" { default = 11 }
157157
158158
data "oci_load_balancer_backends" "test_backends" {
159159
#Required
@@ -166,13 +166,13 @@ data "oci_load_balancer_backends" "test_backends" {
166166
resource.TestCheckResourceAttrSet(datasourceName, "load_balancer_id"),
167167

168168
resource.TestCheckResourceAttr(datasourceName, "backends.#", "1"),
169-
resource.TestCheckResourceAttr(datasourceName, "backends.0.backup", "false"),
170-
resource.TestCheckResourceAttr(datasourceName, "backends.0.drain", "false"),
169+
resource.TestCheckResourceAttr(datasourceName, "backends.0.backup", "true"),
170+
resource.TestCheckResourceAttr(datasourceName, "backends.0.drain", "true"),
171171
resource.TestCheckResourceAttr(datasourceName, "backends.0.ip_address", "10.0.0.3"),
172172
resource.TestCheckResourceAttrSet(datasourceName, "backends.0.name"),
173-
resource.TestCheckResourceAttr(datasourceName, "backends.0.offline", "false"),
173+
resource.TestCheckResourceAttr(datasourceName, "backends.0.offline", "true"),
174174
resource.TestCheckResourceAttr(datasourceName, "backends.0.port", "10"),
175-
resource.TestCheckResourceAttr(datasourceName, "backends.0.weight", "10"),
175+
resource.TestCheckResourceAttr(datasourceName, "backends.0.weight", "11"),
176176
),
177177
},
178178
},

‎provider/load_balancer_listener_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,12 @@ func TestLoadBalancerListenerResource_basic(t *testing.T) {
241241
// verify updates to updatable parameters
242242
{
243243
Config: config + `
244-
variable "listener_connection_configuration_idle_timeout_in_seconds" { default = 10 }
244+
variable "listener_connection_configuration_idle_timeout_in_seconds" { default = 11 }
245245
variable "listener_default_backend_set_name" { default = "example_backend_set" }
246246
variable "listener_hostname_names" { default = [] }
247247
variable "listener_name" { default = "mylistener" }
248-
variable "listener_port" { default = 10 }
248+
variable "listener_path_route_set_name" { default = "example_path_route_set" }
249+
variable "listener_port" { default = 11 }
249250
variable "listener_protocol" { default = "HTTP" }
250251
variable "listener_ssl_configuration_certificate_name" { default = "example_certificate_bundle" }
251252
variable "listener_ssl_configuration_verify_depth" { default = 11 }
@@ -254,14 +255,14 @@ variable "listener_ssl_configuration_verify_peer_certificate" { default = true }
254255
` + compartmentIdVariableStr + ListenerResourceConfig,
255256
Check: resource.ComposeAggregateTestCheckFunc(
256257
resource.TestCheckResourceAttr(resourceName, "connection_configuration.#", "1"),
257-
resource.TestCheckResourceAttr(resourceName, "connection_configuration.0.idle_timeout_in_seconds", "10"),
258+
resource.TestCheckResourceAttr(resourceName, "connection_configuration.0.idle_timeout_in_seconds", "11"),
258259
resource.TestCheckResourceAttr(resourceName, "default_backend_set_name", "example_backend_set"),
259260
resource.TestCheckResourceAttr(resourceName, "hostname_names.#", "1"),
260261
resource.TestCheckResourceAttr(resourceName, "hostname_names.0", "example_hostname_001"),
261262
resource.TestCheckResourceAttrSet(resourceName, "load_balancer_id"),
262263
resource.TestCheckResourceAttr(resourceName, "name", "mylistener"),
263-
resource.TestCheckResourceAttrSet(resourceName, "path_route_set_name"),
264-
resource.TestCheckResourceAttr(resourceName, "port", "10"),
264+
resource.TestCheckResourceAttr(resourceName, "path_route_set_name", "example_path_route_set"),
265+
resource.TestCheckResourceAttr(resourceName, "port", "11"),
265266
resource.TestCheckResourceAttr(resourceName, "protocol", "HTTP"),
266267
resource.TestCheckResourceAttr(resourceName, "ssl_configuration.#", "1"),
267268
resource.TestCheckResourceAttr(resourceName, "ssl_configuration.0.certificate_name", "example_certificate_bundle"),

‎provider/load_balancer_path_route_set_test.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,17 @@ func TestLoadBalancerPathRouteSetResource_basic(t *testing.T) {
8181
{
8282
Config: config + `
8383
variable "path_route_set_name" { default = "example_path_route_set" }
84-
variable "path_route_set_path_routes_path" { default = "/example/video/123" }
84+
variable "path_route_set_path_routes_backend_set_name" { default = "backendSet1" }
85+
variable "path_route_set_path_routes_path" { default = "path2" }
8586
variable "path_route_set_path_routes_path_match_type_match_type" { default = "EXACT_MATCH" }
8687
8788
` + compartmentIdVariableStr + PathRouteSetResourceConfig,
8889
Check: resource.ComposeAggregateTestCheckFunc(
8990
resource.TestCheckResourceAttrSet(resourceName, "load_balancer_id"),
9091
resource.TestCheckResourceAttr(resourceName, "name", "example_path_route_set"),
9192
resource.TestCheckResourceAttr(resourceName, "path_routes.#", "1"),
92-
resource.TestCheckResourceAttrSet(resourceName, "path_routes.0.backend_set_name"),
93-
resource.TestCheckResourceAttr(resourceName, "path_routes.0.path", "/example/video/123"),
93+
resource.TestCheckResourceAttr(resourceName, "path_routes.0.backend_set_name", "backendSet1"),
94+
resource.TestCheckResourceAttr(resourceName, "path_routes.0.path", "path2"),
9495
resource.TestCheckResourceAttr(resourceName, "path_routes.0.path_match_type.#", "1"),
9596
resource.TestCheckResourceAttr(resourceName, "path_routes.0.path_match_type.0.match_type", "EXACT_MATCH"),
9697

@@ -107,7 +108,8 @@ variable "path_route_set_path_routes_path_match_type_match_type" { default = "EX
107108
{
108109
Config: config + `
109110
variable "path_route_set_name" { default = "example_path_route_set" }
110-
variable "path_route_set_path_routes_path" { default = "/example/video/123" }
111+
variable "path_route_set_path_routes_backend_set_name" { default = "backendSet1" }
112+
variable "path_route_set_path_routes_path" { default = "path2" }
111113
variable "path_route_set_path_routes_path_match_type_match_type" { default = "EXACT_MATCH" }
112114
113115
data "oci_load_balancer_path_route_sets" "test_path_route_sets" {
@@ -126,8 +128,8 @@ data "oci_load_balancer_path_route_sets" "test_path_route_sets" {
126128
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.#", "1"),
127129
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.0.name", "example_path_route_set"),
128130
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.0.path_routes.#", "1"),
129-
resource.TestCheckResourceAttrSet(datasourceName, "path_route_sets.0.path_routes.0.backend_set_name"),
130-
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.0.path_routes.0.path", "/example/video/123"),
131+
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.0.path_routes.0.backend_set_name", "backendSet1"),
132+
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.0.path_routes.0.path", "path2"),
131133
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.0.path_routes.0.path_match_type.#", "1"),
132134
resource.TestCheckResourceAttr(datasourceName, "path_route_sets.0.path_routes.0.path_match_type.0.match_type", "EXACT_MATCH"),
133135
),

0 commit comments

Comments
 (0)