Fix route policy definition next hop entries

CiscoDevNet · Dec 22, 2023 · 6422122 · 6422122
1 parent e622915
commit 6422122
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.3 (unreleased)
+
+- Fix next hop action and match entry of `sdwan_route_policy_definition` resource and data source
+
 ## 0.3.2
 
 - BREAKING CHANGE: Rename `source_port` attribute to `source_ports` of `sdwan_ipv4_acl_policy_definition` resource and data source

diff --git a/docs/data-sources/route_policy_definition.md b/docs/data-sources/route_policy_definition.md
@@ -60,8 +60,7 @@ Read-Only:
 - `local_preference` (Number) Local preference
 - `metric` (Number) Metric
 - `metric_type` (String) Metric type
-- `next_hop_prefix_list_id` (String) Next hop prefix list ID
-- `next_hop_prefix_list_version` (Number) Next hop prefix list version
+- `next_hop` (String) Next hop IP
 - `omp_tag` (Number) OMP tag
 - `origin` (String) Origin
 - `originator` (String) Originator IP
@@ -86,7 +85,8 @@ Read-Only:
 - `extended_community_list_version` (Number) Extended community list version
 - `local_preference` (Number) Local preference
 - `metric` (Number) Metric
-- `next_hop` (String) Next hop IP
+- `next_hop_prefix_list_id` (String) Next hop prefix list ID
+- `next_hop_prefix_list_version` (Number) Next hop prefix list version
 - `omp_tag` (Number) OMP tag
 - `origin` (String) Origin
 - `ospf_tag` (Number) OSPF tag

diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -7,6 +7,10 @@ description: |-
 
 # Changelog
 
+## 0.3.3 (unreleased)
+
+- Fix next hop action and match entry of `sdwan_route_policy_definition` resource and data source
+
 ## 0.3.2
 
 - BREAKING CHANGE: Rename `source_port` attribute to `source_ports` of `sdwan_ipv4_acl_policy_definition` resource and data source

diff --git a/docs/resources/route_policy_definition.md b/docs/resources/route_policy_definition.md
@@ -34,6 +34,7 @@ resource "sdwan_route_policy_definition" "example" {
           type                  = "aggregator"
           aggregator            = 10
           aggregator_ip_address = "10.1.2.3"
+          next_hop              = "10.1.1.5"
         }
       ]
     }
@@ -102,8 +103,7 @@ Optional:
   - Range: `0`-`4294967295`
 - `metric_type` (String) Metric type
   - Choices: `type1`, `type2`
-- `next_hop_prefix_list_id` (String) Next hop prefix list ID
-- `next_hop_prefix_list_version` (Number) Next hop prefix list version
+- `next_hop` (String) Next hop IP
 - `omp_tag` (Number) OMP tag
   - Range: `0`-`4294967295`
 - `origin` (String) Origin
@@ -139,7 +139,8 @@ Optional:
   - Range: `0`-`4294967295`
 - `metric` (Number) Metric
   - Range: `0`-`4294967295`
-- `next_hop` (String) Next hop IP
+- `next_hop_prefix_list_id` (String) Next hop prefix list ID
+- `next_hop_prefix_list_version` (Number) Next hop prefix list version
 - `omp_tag` (Number) OMP tag
   - Range: `0`-`4294967295`
 - `origin` (String) Origin

diff --git a/examples/resources/sdwan_route_policy_definition/resource.tf b/examples/resources/sdwan_route_policy_definition/resource.tf
@@ -19,6 +19,7 @@ resource "sdwan_route_policy_definition" "example" {
           type                  = "aggregator"
           aggregator            = 10
           aggregator_ip_address = "10.1.2.3"
+          next_hop              = "10.1.1.5"
         }
       ]
     }

diff --git a/gen/definitions/generic/route_policy_definition.yaml b/gen/definitions/generic/route_policy_definition.yaml
@@ -193,14 +193,19 @@ attributes:
             min_int: 0
             max_int: 4294967295
             example: 100
-          - model_name: value
-            tf_name: next_hop
+          - model_name: ref
+            tf_name: next_hop_prefix_list_id
             conditional_attribute:
               name: type
               value: nextHop
             type: String
-            description: Next hop IP
-            example: 10.1.1.5
+            description: Next hop prefix list ID
+            example: 2081c2f4-3f9f-4fee-8078-dcc8904e368d
+            exclude_test: true
+          - tf_name: next_hop_prefix_list_version
+            tf_only: true
+            type: Version
+            description: Next hop prefix list version
             exclude_test: true
           - model_name: value
             tf_name: origin
@@ -395,20 +400,14 @@ attributes:
             description: Metric type
             example: type2
             exclude_test: true
-          - model_name: ref
-            tf_name: next_hop_prefix_list_id
+          - model_name: value
+            tf_name: next_hop
             conditional_attribute:
               name: type
               value: nextHop
             type: String
-            description: Next hop prefix list ID
-            example: 2081c2f4-3f9f-4fee-8078-dcc8904e368d
-            exclude_test: true
-          - tf_name: next_hop_prefix_list_version
-            tf_only: true
-            type: Version
-            description: Next hop prefix list version
-            exclude_test: true
+            description: Next hop IP
+            example: 10.1.1.5
           - model_name: value
             tf_name: omp_tag
             conditional_attribute:

diff --git a/internal/provider/data_source_sdwan_route_policy_definition.go b/internal/provider/data_source_sdwan_route_policy_definition.go
diff --git a/internal/provider/data_source_sdwan_route_policy_definition_test.go b/internal/provider/data_source_sdwan_route_policy_definition_test.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_route_policy_definition.go b/internal/provider/resource_sdwan_route_policy_definition.go
diff --git a/internal/provider/resource_sdwan_route_policy_definition_test.go b/internal/provider/resource_sdwan_route_policy_definition_test.go
diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl
@@ -7,6 +7,10 @@ description: |-
 
 # Changelog
 
+## 0.3.3 (unreleased)
+
+- Fix next hop action and match entry of `sdwan_route_policy_definition` resource and data source
+
 ## 0.3.2
 
 - BREAKING CHANGE: Rename `source_port` attribute to `source_ports` of `sdwan_ipv4_acl_policy_definition` resource and data source