Resolve Issue #471 and #473 (#472)

seconroy · web-flow · commit 9cd39801f1bb · 2025-08-07T21:19:46.000+02:00
diff --git a/docs/data-sources/ipv4_acl_policy_definition.md b/docs/data-sources/ipv4_acl_policy_definition.md
@@ -82,15 +82,17 @@ Read-Only:
 - `destination_data_ipv4_prefix_list_id` (String) Destination data IPv4 prefix list ID
 - `destination_data_ipv4_prefix_list_version` (Number) Destination data IPv4 prefix list version
 - `destination_ip` (String) Destination IP prefix
+- `destination_ip_variable` (String) Destination IP prefix variable
 - `destination_ports` (String) Destination ports. Single value (0-65535) or ranges separated by spaces.
-- `dscp` (Number) DSCP value
+- `dscp` (String) DSCP value
 - `icmp_message` (String) ICMP Message
 - `packet_length` (Number) Packet length
 - `priority` (String) PLP - priority
 - `protocol` (String) Single value (0-255) or multiple values separated by spaces
 - `source_data_ipv4_prefix_list_id` (String) Source data IPv4 prefix list ID
 - `source_data_ipv4_prefix_list_version` (Number) Source data IPv4 prefix list version
 - `source_ip` (String) Source IP prefix
+- `source_ip_variable` (String) Source IP prefix variable
 - `source_ports` (String) Source ports. Single value (0-65535) or ranges separated by spaces.
 - `tcp` (String) TCP parameters
 - `type` (String) Type of match entry
diff --git a/docs/data-sources/ipv4_device_acl_policy_definition.md b/docs/data-sources/ipv4_device_acl_policy_definition.md
@@ -62,9 +62,11 @@ Read-Only:
 - `destination_data_ipv4_prefix_list_id` (String) Destination data IPv4 prefix list ID
 - `destination_data_ipv4_prefix_list_version` (Number) Destination data IPv4 prefix list version
 - `destination_ip` (String) Destination IP prefix
+- `destination_ip_variable` (String) Destination IP prefix variable
 - `destination_port` (Number) Destination port, only `22` and `161` supported
 - `source_data_ipv4_prefix_list_id` (String) Source data IPv4 prefix list ID
 - `source_data_ipv4_prefix_list_version` (Number) Source data IPv4 prefix list version
 - `source_ip` (String) Source IP prefix
+- `source_ip_variable` (String) Source IP prefix variable
 - `source_ports` (String) Source ports. Single value (0-65535) or ranges separated by spaces.
 - `type` (String) Type of match entry
diff --git a/docs/data-sources/route_policy_definition.md b/docs/data-sources/route_policy_definition.md
@@ -58,6 +58,7 @@ Read-Only:
 - `atomic_aggregate` (Boolean) Atomic aggregate
 - `community` (String) Community value, e.g. `1000:10000` or `internet` or `local-AS`
 - `community_additive` (Boolean) Community additive
+- `community_variable` (String) Community variable
 - `local_preference` (Number) Local preference
 - `metric` (Number) Metric
 - `metric_type` (String) Metric type
@@ -81,6 +82,7 @@ Read-Only:
 - `community_list_match_flag` (String) Community list match flag
 - `community_list_versions` (List of String) Community list versions
 - `expanded_community_list_id` (String) Expanded community list ID
+- `expanded_community_list_variable` (String) Expanded community list variable
 - `expanded_community_list_version` (Number) Expanded community list version
 - `extended_community_list_id` (String) Extended community list ID
 - `extended_community_list_version` (Number) Extended community list version
diff --git a/docs/resources/ipv4_acl_policy_definition.md b/docs/resources/ipv4_acl_policy_definition.md
@@ -25,7 +25,7 @@ resource "sdwan_ipv4_acl_policy_definition" "example" {
       match_entries = [
         {
           type = "dscp"
-          dscp = 16
+          dscp = "16"
         }
       ]
       action_entries = [
@@ -131,9 +131,9 @@ Optional:
 - `destination_data_ipv4_prefix_list_id` (String) Destination data IPv4 prefix list ID, Attribute conditional on `type` being equal to `destinationDataPrefixList`
 - `destination_data_ipv4_prefix_list_version` (Number) Destination data IPv4 prefix list version
 - `destination_ip` (String) Destination IP prefix, Attribute conditional on `type` being equal to `destinationIp`
+- `destination_ip_variable` (String) Destination IP prefix variable, Attribute conditional on `type` being equal to `destinationIp`
 - `destination_ports` (String) Destination ports. Single value (0-65535) or ranges separated by spaces., Attribute conditional on `type` being equal to `destinationPort`
-- `dscp` (Number) DSCP value, Attribute conditional on `type` being equal to `dscp`
-  - Range: `0`-`63`
+- `dscp` (String) DSCP value, Attribute conditional on `type` being equal to `dscp`
 - `icmp_message` (String) ICMP Message, Attribute conditional on `type` being equal to `icmpMessage`
 - `packet_length` (Number) Packet length, Attribute conditional on `type` being equal to `packetLength`
   - Range: `0`-`65535`
@@ -143,6 +143,7 @@ Optional:
 - `source_data_ipv4_prefix_list_id` (String) Source data IPv4 prefix list ID, Attribute conditional on `type` being equal to `sourceDataPrefixList`
 - `source_data_ipv4_prefix_list_version` (Number) Source data IPv4 prefix list version
 - `source_ip` (String) Source IP prefix, Attribute conditional on `type` being equal to `sourceIp`
+- `source_ip_variable` (String) Source IP prefix variable, Attribute conditional on `type` being equal to `sourceIp`
 - `source_ports` (String) Source ports. Single value (0-65535) or ranges separated by spaces., Attribute conditional on `type` being equal to `sourcePort`
 - `tcp` (String) TCP parameters, Attribute conditional on `type` being equal to `tcp`
   - Choices: `syn`
diff --git a/docs/resources/ipv4_device_acl_policy_definition.md b/docs/resources/ipv4_device_acl_policy_definition.md
@@ -101,11 +101,13 @@ Optional:
 - `destination_data_ipv4_prefix_list_id` (String) Destination data IPv4 prefix list ID, Attribute conditional on `type` being equal to `destinationDataPrefixList`
 - `destination_data_ipv4_prefix_list_version` (Number) Destination data IPv4 prefix list version
 - `destination_ip` (String) Destination IP prefix, Attribute conditional on `type` being equal to `destinationIp`
+- `destination_ip_variable` (String) Destination IP prefix variable, Attribute conditional on `type` being equal to `destinationIp`
 - `destination_port` (Number) Destination port, only `22` and `161` supported, Attribute conditional on `type` being equal to `destinationPort`
   - Range: `0`-`65535`
 - `source_data_ipv4_prefix_list_id` (String) Source data IPv4 prefix list ID, Attribute conditional on `type` being equal to `sourceDataPrefixList`
 - `source_data_ipv4_prefix_list_version` (Number) Source data IPv4 prefix list version
 - `source_ip` (String) Source IP prefix, Attribute conditional on `type` being equal to `sourceIp`
+- `source_ip_variable` (String) Source IP prefix variable, Attribute conditional on `type` being equal to `sourceIp`
 - `source_ports` (String) Source ports. Single value (0-65535) or ranges separated by spaces., Attribute conditional on `type` being equal to `sourcePort`
 
 ## Import
diff --git a/docs/resources/route_policy_definition.md b/docs/resources/route_policy_definition.md
@@ -97,6 +97,7 @@ Optional:
 - `atomic_aggregate` (Boolean) Atomic aggregate, Attribute conditional on `type` being equal to `atomicAggregate`
 - `community` (String) Community value, e.g. `1000:10000` or `internet` or `local-AS`, Attribute conditional on `type` being equal to `community`
 - `community_additive` (Boolean) Community additive, Attribute conditional on `type` being equal to `communityAdditive`
+- `community_variable` (String) Community variable, Attribute conditional on `type` being equal to `community`
 - `local_preference` (Number) Local preference, Attribute conditional on `type` being equal to `localPreference`
   - Range: `0`-`4294967295`
 - `metric` (Number) Metric, Attribute conditional on `type` being equal to `metric`
@@ -121,7 +122,7 @@ Optional:
 Required:
 
 - `type` (String) Type of match entry
-  - Choices: `address`, `asPath`, `advancedCommunity`, `expandedCommunity`, `extCommunity`, `localPreference`, `metric`, `nextHop`, `origin`, `peer`, `ompTag`, `ospfTag`
+  - Choices: `address`, `asPath`, `advancedCommunity`, `expandedCommunity`, `expandedCommunityInline`, `extCommunity`, `localPreference`, `metric`, `nextHop`, `origin`, `peer`, `ompTag`, `ospfTag`
 
 Optional:
 
@@ -132,6 +133,7 @@ Optional:
   - Choices: `and`, `or`, `exact`
 - `community_list_versions` (List of String) Community list versions
 - `expanded_community_list_id` (String) Expanded community list ID, Attribute conditional on `type` being equal to `expandedCommunity`
+- `expanded_community_list_variable` (String) Expanded community list variable, Attribute conditional on `type` being equal to `expandedCommunityInline`
 - `expanded_community_list_version` (Number) Expanded community list version
 - `extended_community_list_id` (String) Extended community list ID, Attribute conditional on `type` being equal to `extCommunity`
 - `extended_community_list_version` (Number) Extended community list version
diff --git a/examples/resources/sdwan_ipv4_acl_policy_definition/resource.tf b/examples/resources/sdwan_ipv4_acl_policy_definition/resource.tf
@@ -10,7 +10,7 @@ resource "sdwan_ipv4_acl_policy_definition" "example" {
       match_entries = [
         {
           type = "dscp"
-          dscp = 16
+          dscp = "16"
         }
       ]
       action_entries = [
diff --git a/gen/definitions/generic/ipv4_acl_policy_definition.yaml b/gen/definitions/generic/ipv4_acl_policy_definition.yaml
@@ -93,11 +93,9 @@ attributes:
             conditional_attribute:
               name: type
               value: dscp
-            type: Int64
+            type: String
             model_type_string: true
             description: DSCP value
-            min_int: 0
-            max_int: 63
             example: 16
           - model_name: value
             tf_name: source_ip
@@ -108,6 +106,15 @@ attributes:
             description: Source IP prefix
             exclude_test: true
             example: 10.0.0.0/8
+          - model_name: vipVariableName
+            tf_name: source_ip_variable
+            conditional_attribute:
+              name: type
+              value: sourceIp
+            type: String
+            description: Source IP prefix variable
+            exclude_test: true
+            example: source_ip_variable
           - model_name: value
             tf_name: icmp_message
             conditional_attribute:
@@ -126,6 +133,15 @@ attributes:
             description: Destination IP prefix
             exclude_test: true
             example: 192.168.0.0/16
+          - model_name: vipVariableName
+            tf_name: destination_ip_variable
+            conditional_attribute:
+              name: type
+              value: destinationIp
+            type: String
+            description: Destination IP prefix variable
+            exclude_test: true
+            example: destination_ip_variable
           - model_name: ref
             tf_name: class_map_id
             conditional_attribute:
diff --git a/gen/definitions/generic/ipv4_device_acl_policy_definition.yaml b/gen/definitions/generic/ipv4_device_acl_policy_definition.yaml
@@ -90,6 +90,15 @@ attributes:
             description: Source IP prefix
             exclude_test: true
             example: 10.0.0.0/8
+          - model_name: vipVariableName
+            tf_name: source_ip_variable
+            conditional_attribute:
+              name: type
+              value: sourceIp
+            type: String
+            description: Source IP prefix variable
+            exclude_test: true
+            example: source_ip_variable
           - model_name: value
             tf_name: destination_ip
             conditional_attribute:
@@ -99,6 +108,15 @@ attributes:
             description: Destination IP prefix
             exclude_test: true
             example: 192.168.0.0/16
+          - model_name: vipVariableName
+            tf_name: destination_ip_variable
+            conditional_attribute:
+              name: type
+              value: destinationIp
+            type: String
+            description: Destination IP prefix variable
+            exclude_test: true
+            example: destination_ip_variable
           - model_name: value
             tf_name: source_ports
             conditional_attribute:
diff --git a/gen/definitions/generic/route_policy_definition.yaml b/gen/definitions/generic/route_policy_definition.yaml
@@ -81,6 +81,7 @@ attributes:
                 asPath,
                 advancedCommunity,
                 expandedCommunity,
+                expandedCommunityInline,
                 extCommunity,
                 localPreference,
                 metric,
@@ -154,6 +155,15 @@ attributes:
             description: Expanded community list ID
             example: 2081c2f4-3f9f-4fee-8078-dcc8904e368d
             exclude_test: true
+          - model_name: vipVariableName
+            tf_name: expanded_community_list_variable
+            conditional_attribute:
+              name: type
+              value: expandedCommunityInline
+            type: String
+            description: Expanded community list variable
+            exclude_test: true
+            example: expanded_community_list_variable
           - tf_name: expanded_community_list_version
             tf_only: true
             type: Version
@@ -349,6 +359,15 @@ attributes:
             description: Community value, e.g. `1000:10000` or `internet` or `local-AS`
             example: 1000:10000
             exclude_test: true
+          - model_name: vipVariableName
+            tf_name: community_variable
+            conditional_attribute:
+              name: type
+              value: community
+            type: String
+            description: Community variable
+            exclude_test: true
+            example: community_variable
           - model_name: value
             tf_name: community_additive
             conditional_attribute:
diff --git a/internal/provider/data_source_sdwan_ipv4_acl_policy_definition.go b/internal/provider/data_source_sdwan_ipv4_acl_policy_definition.go
@@ -108,14 +108,18 @@ func (d *IPv4ACLPolicyDefinitionDataSource) Schema(ctx context.Context, req data
 										MarkdownDescription: "Type of match entry",
 										Computed:            true,
 									},
-									"dscp": schema.Int64Attribute{
+									"dscp": schema.StringAttribute{
 										MarkdownDescription: "DSCP value",
 										Computed:            true,
 									},
 									"source_ip": schema.StringAttribute{
 										MarkdownDescription: "Source IP prefix",
 										Computed:            true,
 									},
+									"source_ip_variable": schema.StringAttribute{
+										MarkdownDescription: "Source IP prefix variable",
+										Computed:            true,
+									},
 									"icmp_message": schema.StringAttribute{
 										MarkdownDescription: "ICMP Message",
 										Computed:            true,
@@ -124,6 +128,10 @@ func (d *IPv4ACLPolicyDefinitionDataSource) Schema(ctx context.Context, req data
 										MarkdownDescription: "Destination IP prefix",
 										Computed:            true,
 									},
+									"destination_ip_variable": schema.StringAttribute{
+										MarkdownDescription: "Destination IP prefix variable",
+										Computed:            true,
+									},
 									"class_map_id": schema.StringAttribute{
 										MarkdownDescription: "Class map ID",
 										Computed:            true,
diff --git a/internal/provider/data_source_sdwan_ipv4_acl_policy_definition_test.go b/internal/provider/data_source_sdwan_ipv4_acl_policy_definition_test.go
@@ -70,7 +70,7 @@ func testAccDataSourceSdwanIPv4ACLPolicyDefinitionConfig() string {
 	config += `	  base_action = "accept"` + "\n"
 	config += `	  match_entries = [{` + "\n"
 	config += `		type = "dscp"` + "\n"
-	config += `		dscp = 16` + "\n"
+	config += `		dscp = "16"` + "\n"
 	config += `	}]` + "\n"
 	config += `	  action_entries = [{` + "\n"
 	config += `		type = "set"` + "\n"
diff --git a/internal/provider/data_source_sdwan_ipv4_device_acl_policy_definition.go b/internal/provider/data_source_sdwan_ipv4_device_acl_policy_definition.go
@@ -112,10 +112,18 @@ func (d *IPv4DeviceACLPolicyDefinitionDataSource) Schema(ctx context.Context, re
 										MarkdownDescription: "Source IP prefix",
 										Computed:            true,
 									},
+									"source_ip_variable": schema.StringAttribute{
+										MarkdownDescription: "Source IP prefix variable",
+										Computed:            true,
+									},
 									"destination_ip": schema.StringAttribute{
 										MarkdownDescription: "Destination IP prefix",
 										Computed:            true,
 									},
+									"destination_ip_variable": schema.StringAttribute{
+										MarkdownDescription: "Destination IP prefix variable",
+										Computed:            true,
+									},
 									"source_ports": schema.StringAttribute{
 										MarkdownDescription: "Source ports. Single value (0-65535) or ranges separated by spaces.",
 										Computed:            true,
diff --git a/internal/provider/data_source_sdwan_route_policy_definition.go b/internal/provider/data_source_sdwan_route_policy_definition.go
@@ -146,6 +146,10 @@ func (d *RoutePolicyDefinitionDataSource) Schema(ctx context.Context, req dataso
 										MarkdownDescription: "Expanded community list ID",
 										Computed:            true,
 									},
+									"expanded_community_list_variable": schema.StringAttribute{
+										MarkdownDescription: "Expanded community list variable",
+										Computed:            true,
+									},
 									"expanded_community_list_version": schema.Int64Attribute{
 										MarkdownDescription: "Expanded community list version",
 										Computed:            true,
@@ -226,6 +230,10 @@ func (d *RoutePolicyDefinitionDataSource) Schema(ctx context.Context, req dataso
 										MarkdownDescription: "Community value, e.g. `1000:10000` or `internet` or `local-AS`",
 										Computed:            true,
 									},
+									"community_variable": schema.StringAttribute{
+										MarkdownDescription: "Community variable",
+										Computed:            true,
+									},
 									"community_additive": schema.BoolAttribute{
 										MarkdownDescription: "Community additive",
 										Computed:            true,
diff --git a/internal/provider/model_sdwan_ipv4_acl_policy_definition.go b/internal/provider/model_sdwan_ipv4_acl_policy_definition.go
diff --git a/internal/provider/model_sdwan_ipv4_device_acl_policy_definition.go b/internal/provider/model_sdwan_ipv4_device_acl_policy_definition.go
diff --git a/internal/provider/model_sdwan_route_policy_definition.go b/internal/provider/model_sdwan_route_policy_definition.go
diff --git a/internal/provider/resource_sdwan_ipv4_acl_policy_definition.go b/internal/provider/resource_sdwan_ipv4_acl_policy_definition.go
diff --git a/internal/provider/resource_sdwan_ipv4_acl_policy_definition_test.go b/internal/provider/resource_sdwan_ipv4_acl_policy_definition_test.go
diff --git a/internal/provider/resource_sdwan_ipv4_device_acl_policy_definition.go b/internal/provider/resource_sdwan_ipv4_device_acl_policy_definition.go
diff --git a/internal/provider/resource_sdwan_route_policy_definition.go b/internal/provider/resource_sdwan_route_policy_definition.go

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ resource "sdwan_ipv4_acl_policy_definition" "example" {`
`10`	`10`	`match_entries = [`
`11`	`11`	`{`
`12`	`12`	`type = "dscp"`
`13`		`- dscp = 16`
	`13`	`+ dscp = "16"`
`14`	`14`	`}`
`15`	`15`	`]`
`16`	`16`	`action_entries = [`