Skip to content

Commit b09b668

Browse files
authored
Fix nat being always configured on sdwan_transport_wan_vpn_interface_ethernet_feature (#488)
1 parent a30bca6 commit b09b668

File tree

7 files changed

+127
-64
lines changed

7 files changed

+127
-64
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- BREAKING CHANGE: Rename `sla_class_list` attribute of `sdwan_application_aware_routing_policy_definition` resource to `sla_class_list_id`
55
- BREAKING CHANGE: Rename `preferred_color_group_list` attribute of `sdwan_application_aware_routing_policy_definition` resource to `preferred_color_group_list_id`
66
- BREAKING CHANGE: Rename `preferred_color_group_list` attribute of `sdwan_traffic_data_policy_definition` resource to `preferred_color_group_list_id`
7+
- Fix issue, where NAT IPv4 and IPv6 is always configured on `sdwan_transport_wan_vpn_interface_ethernet_feature`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/485)
78
- Add missing options under `unsupported_features` attribute of `sdwan_configuration_group`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/478)
89
- Add `sdwan_policy_group` resource and data source
910
- Adds `enhanced_app_aware_routing` support to the `sdwan_cisco_system_feature_template` resource and data source

docs/guides/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ description: |-
1313
- BREAKING CHANGE: Rename `sla_class_list` attribute of `sdwan_application_aware_routing_policy_definition` resource to `sla_class_list_id`
1414
- BREAKING CHANGE: Rename `preferred_color_group_list` attribute of `sdwan_application_aware_routing_policy_definition` resource to `preferred_color_group_list_id`
1515
- BREAKING CHANGE: Rename `preferred_color_group_list` attribute of `sdwan_traffic_data_policy_definition` resource to `preferred_color_group_list_id`
16+
- Fix issue, where NAT IPv4 and IPv6 is always configured on `sdwan_transport_wan_vpn_interface_ethernet_feature`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/485)
1617
- Add missing options under `unsupported_features` attribute of `sdwan_configuration_group`, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/478)
1718
- Add `sdwan_policy_group` resource and data source
1819
- Adds `enhanced_app_aware_routing` support to the `sdwan_cisco_system_feature_template` resource and data source

docs/resources/transport_wan_vpn_interface_ethernet_feature.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -228,41 +228,41 @@ resource "sdwan_transport_wan_vpn_interface_ethernet_feature" "example" {
228228
- `media_type` (String) Media type
229229
- Choices: `auto-select`, `rj45`, `sfp`
230230
- `media_type_variable` (String) Variable name
231-
- `nat64` (Boolean) NAT64 on this interface
231+
- `nat64` (Boolean) NAT64 on this interface, Attribute conditional on `nat_ipv6` being equal to `true`
232232
- Default value: `false`
233-
- `nat66` (Boolean) NAT66 on this interface
233+
- `nat66` (Boolean) NAT66 on this interface, Attribute conditional on `nat_ipv6` being equal to `true`
234234
- Default value: `false`
235235
- `nat_ipv4` (Boolean) enable Network Address Translation on this interface
236236
- Default value: `false`
237237
- `nat_ipv4_variable` (String) Variable name
238238
- `nat_ipv6` (Boolean) enable Network Address Translation ipv6 on this interface
239239
- Default value: `false`
240240
- `nat_ipv6_variable` (String) Variable name
241-
- `nat_loopback` (String) NAT Inside Source Loopback Interface
242-
- `nat_loopback_variable` (String) Variable name
243-
- `nat_overload` (Boolean) NAT Overload
241+
- `nat_loopback` (String) NAT Inside Source Loopback Interface, Attribute conditional on `nat_ipv4` being equal to `true`
242+
- `nat_loopback_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
243+
- `nat_overload` (Boolean) NAT Overload, Attribute conditional on `nat_ipv4` being equal to `true`
244244
- Default value: `true`
245-
- `nat_overload_variable` (String) Variable name
246-
- `nat_prefix_length` (Number) NAT Pool Prefix Length
245+
- `nat_overload_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
246+
- `nat_prefix_length` (Number) NAT Pool Prefix Length, Attribute conditional on `nat_ipv4` being equal to `true`
247247
- Range: `1`-`32`
248-
- `nat_prefix_length_variable` (String) Variable name
249-
- `nat_range_end` (String) NAT Pool Range End
250-
- `nat_range_end_variable` (String) Variable name
251-
- `nat_range_start` (String) NAT Pool Range Start
252-
- `nat_range_start_variable` (String) Variable name
253-
- `nat_tcp_timeout` (Number) Set NAT TCP session timeout, in minutes
248+
- `nat_prefix_length_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
249+
- `nat_range_end` (String) NAT Pool Range End, Attribute conditional on `nat_ipv4` being equal to `true`
250+
- `nat_range_end_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
251+
- `nat_range_start` (String) NAT Pool Range Start, Attribute conditional on `nat_ipv4` being equal to `true`
252+
- `nat_range_start_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
253+
- `nat_tcp_timeout` (Number) Set NAT TCP session timeout, in minutes, Attribute conditional on `nat_ipv4` being equal to `true`
254254
- Range: `1`-`8947`
255255
- Default value: `60`
256-
- `nat_tcp_timeout_variable` (String) Variable name
257-
- `nat_type` (String) NAT Type
256+
- `nat_tcp_timeout_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
257+
- `nat_type` (String) NAT Type, Attribute conditional on `nat_ipv4` being equal to `true`
258258
- Choices: `interface`, `pool`, `loopback`
259259
- Default value: `interface`
260-
- `nat_type_variable` (String) Variable name
261-
- `nat_udp_timeout` (Number) Set NAT UDP session timeout, in minutes
260+
- `nat_type_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
261+
- `nat_udp_timeout` (Number) Set NAT UDP session timeout, in minutes, Attribute conditional on `nat_ipv4` being equal to `true`
262262
- Range: `1`-`8947`
263263
- Default value: `1`
264-
- `nat_udp_timeout_variable` (String) Variable name
265-
- `new_static_nats` (Attributes List) static NAT (see [below for nested schema](#nestedatt--new_static_nats))
264+
- `nat_udp_timeout_variable` (String) Variable name, Attribute conditional on `nat_ipv4` being equal to `true`
265+
- `new_static_nats` (Attributes List) static NAT, Attribute conditional on `nat_ipv4` being equal to `true` (see [below for nested schema](#nestedatt--new_static_nats))
266266
- `per_tunnel_qos` (Boolean) Per-tunnel Qos, Attribute conditional on `tunnel_interface` being equal to `true`
267267
- Default value: `false`
268268
- `per_tunnel_qos_variable` (String) Variable name, Attribute conditional on `tunnel_interface` being equal to `true`
@@ -304,7 +304,7 @@ resource "sdwan_transport_wan_vpn_interface_ethernet_feature" "example" {
304304
- `speed` (String) Set interface speed
305305
- Choices: `10`, `100`, `1000`, `2500`, `10000`
306306
- `speed_variable` (String) Variable name
307-
- `static_nat66` (Attributes List) static NAT66 (see [below for nested schema](#nestedatt--static_nat66))
307+
- `static_nat66` (Attributes List) static NAT66, Attribute conditional on `nat_ipv6` being equal to `true` (see [below for nested schema](#nestedatt--static_nat66))
308308
- `tcp_mss` (Number) TCP MSS on SYN packets, in bytes
309309
- Range: `500`-`1460`
310310
- `tcp_mss_variable` (String) Variable name

gen/definitions/profile_parcels/transport_wan_vpn_interface_ethernet.yaml

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,20 @@ attributes:
419419
- model_name: natType
420420
tf_name: nat_type
421421
data_path: [natAttributesIpv4]
422-
example: interface
422+
example: interface
423+
conditional_attribute:
424+
name: nat_ipv4
425+
value: true
426+
type: Bool
423427
- model_name: rangeStart
424428
tf_name: nat_range_start
425429
data_path: [natAttributesIpv4, natPool]
426430
exclude_test: true
427431
exclude_null: true
432+
conditional_attribute:
433+
name: nat_ipv4
434+
value: true
435+
type: Bool
428436
# conditional_attribute:
429437
# name: natType
430438
# value: pool
@@ -434,6 +442,10 @@ attributes:
434442
data_path: [natAttributesIpv4, natPool]
435443
exclude_test: true
436444
exclude_null: true
445+
conditional_attribute:
446+
name: nat_ipv4
447+
value: true
448+
type: Bool
437449
# conditional_attribute:
438450
# name: natType
439451
# value: pool
@@ -443,6 +455,10 @@ attributes:
443455
data_path: [natAttributesIpv4, natPool]
444456
exclude_test: true
445457
exclude_null: true
458+
conditional_attribute:
459+
name: nat_ipv4
460+
value: true
461+
type: Bool
446462
# conditional_attribute:
447463
# name: natType
448464
# value: pool
@@ -452,6 +468,10 @@ attributes:
452468
data_path: [natAttributesIpv4, natPool]
453469
exclude_test: true
454470
exclude_null: true
471+
conditional_attribute:
472+
name: nat_ipv4
473+
value: true
474+
type: Bool
455475
# conditional_attribute:
456476
# name: natType
457477
# value: pool
@@ -461,6 +481,10 @@ attributes:
461481
data_path: [natAttributesIpv4]
462482
exclude_test: true
463483
exclude_null: true
484+
conditional_attribute:
485+
name: nat_ipv4
486+
value: true
487+
type: Bool
464488
# conditional_attribute:
465489
# name: natType
466490
# value: loopback
@@ -469,13 +493,25 @@ attributes:
469493
tf_name: nat_udp_timeout
470494
data_path: [natAttributesIpv4]
471495
example: 1
496+
conditional_attribute:
497+
name: nat_ipv4
498+
value: true
499+
type: Bool
472500
- model_name: tcpTimeout
473501
tf_name: nat_tcp_timeout
474502
data_path: [natAttributesIpv4]
475503
example: 60
504+
conditional_attribute:
505+
name: nat_ipv4
506+
value: true
507+
type: Bool
476508
- model_name: newStaticNat
477509
tf_name: new_static_nats
478510
data_path: [natAttributesIpv4]
511+
conditional_attribute:
512+
name: nat_ipv4
513+
value: true
514+
type: Bool
479515
attributes:
480516
- model_name: sourceIp
481517
id: true
@@ -496,13 +532,25 @@ attributes:
496532
data_path: [natAttributesIpv6]
497533
exclude_null: true
498534
example: false
535+
conditional_attribute:
536+
name: nat_ipv6
537+
value: true
538+
type: Bool
499539
- model_name: nat66
500540
data_path: [natAttributesIpv6]
501541
exclude_null: true
502542
example: true
543+
conditional_attribute:
544+
name: nat_ipv6
545+
value: true
546+
type: Bool
503547
- model_name: staticNat66
504548
data_path: [natAttributesIpv6]
505549
exclude_null: true
550+
conditional_attribute:
551+
name: nat_ipv6
552+
value: true
553+
type: Bool
506554
attributes:
507555
- model_name: sourcePrefix
508556
id: true

0 commit comments

Comments
 (0)