Merge branch 'main' into feature/implement-support-ip-ssh-bulk-mode-in-terraform-provider

Author: camschaecisco

CHANGELOG.md

@@ -5,6 +5,8 @@
 - Add `iosxe_evpn_ethernet_segment` resource and data source for managing L2VPN EVPN Ethernet Segment configuration
 - Add `evpn_ethernet_segments` attribute to `iosxe_interface_ethernet` and `iosxe_interface_port_channel` resources and data sources
 - Add `ip_ssh_bulk_mode` and `ip_ssh_bulk_mode_window_size` attributes to `iosxe_system` resource and data source
+- Add `set_ip_next_hop_unchanged` attribute to `iosxe_route_map` resource and data source
+- Enhance `set_communities` attribute documentation in `iosxe_route_map` to clarify support for well-known BGP community values (internet, local-AS, no-advertise, no-export, gshut)
 
 ## 0.9.3
 

docs/data-sources/bgp_neighbor.md

@@ -47,6 +47,7 @@ data "iosxe_bgp_neighbor" "example" {
 - `fall_over_default_route_map` (String)
 - `fall_over_maximum_metric_route_map` (String)
 - `id` (String) The path of the retrieved object.
+- `inherit_peer_session` (String) Inherit a peer-session template
 - `local_as` (String)
 - `local_as_dual_as` (Boolean) Accept either real AS or local AS from the ebgp peer
 - `local_as_no_prepend` (Boolean) Do not prepend local-as to updates from ebgp peers

docs/data-sources/bgp_peer_session_template.md

@@ -0,0 +1,43 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "iosxe_bgp_peer_session_template Data Source - terraform-provider-iosxe"
+subcategory: "BGP"
+description: |-
+  This data source can read the BGP Peer Session Template configuration.
+---
+
+# iosxe_bgp_peer_session_template (Data Source)
+
+This data source can read the BGP Peer Session Template configuration.
+
+## Example Usage
+
+```terraform
+data "iosxe_bgp_peer_session_template" "example" {
+  asn           = "65000"
+  template_name = "PEER_SESSION_TEMPLATE_1"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `asn` (String)
+- `template_name` (String)
+
+### Optional
+
+- `device` (String) A device name from the provider configuration.
+
+### Read-Only
+
+- `description` (String) Neighbor specific description
+- `disable_connected_check` (Boolean) one-hop away EBGP peer using loopback address
+- `ebgp_multihop` (Boolean) Allow EBGP neighbors not on directly connected networks. For single-hop ebgp peers, delete ebgp-multihop directly.
+- `ebgp_multihop_max_hop` (Number)
+- `id` (String) The path of the retrieved object.
+- `inherit_peer_session` (String) Inherit a peer-session template
+- `remote_as` (String) Specify a BGP neighbor remote-as
+- `update_source_interface_loopback` (Number) Loopback interface

docs/data-sources/route_map.md

@@ -89,7 +89,7 @@ Read-Only:
 - `set_as_path_replace_as` (Attributes List) (see [below for nested schema](#nestedatt--entries--set_as_path_replace_as))
 - `set_as_path_tag` (Boolean) Set the tag as an AS-path attribute
 - `set_as_path_tag_legacy` (Boolean) Set the tag as an AS-path attribute (OBSOLETE - please use route-map configuration in Cisco-IOS-XE-bgp.yang)
-- `set_communities` (List of String)
+- `set_communities` (List of String) BGP community value - can be a number (AA:NN format) or well-known value (internet, local-AS, no-advertise, no-export, gshut)
 - `set_communities_additive` (Boolean)
 - `set_communities_additive_legacy` (Boolean)
 - `set_communities_legacy` (List of String)
@@ -119,6 +119,7 @@ Read-Only:
 - `set_ip_global_next_hop_address` (List of String)
 - `set_ip_next_hop_address` (List of String) IP address of next hop
 - `set_ip_next_hop_self` (Boolean) Use self address (for BGP only)
+- `set_ip_next_hop_unchanged` (Boolean) Propagate next hop unchanged
 - `set_ip_qos_group` (Number)
 - `set_ipv6_address` (List of String) IPv6 prefix-list
 - `set_ipv6_default_global_next_hop` (String) Next hop along path

docs/guides/changelog.md

@@ -14,6 +14,8 @@ description: |-
 - Add `iosxe_evpn_ethernet_segment` resource and data source for managing L2VPN EVPN Ethernet Segment configuration
 - Add `evpn_ethernet_segments` attribute to `iosxe_interface_ethernet` and `iosxe_interface_port_channel` resources and data sources
 - Add `ip_ssh_bulk_mode` and `ip_ssh_bulk_mode_window_size` attributes to `iosxe_system` resource and data source
+- Add `set_ip_next_hop_unchanged` attribute to `iosxe_route_map` resource and data source
+- Enhance `set_communities` attribute documentation in `iosxe_route_map` to clarify support for well-known BGP community values (internet, local-AS, no-advertise, no-export, gshut)
 
 ## 0.9.3
 

docs/resources/bgp_neighbor.md

@@ -65,6 +65,7 @@ resource "iosxe_bgp_neighbor" "example" {
 - `fall_over_default_enable` (Boolean)
 - `fall_over_default_route_map` (String)
 - `fall_over_maximum_metric_route_map` (String)
+- `inherit_peer_session` (String) Inherit a peer-session template
 - `local_as` (String)
 - `local_as_dual_as` (Boolean) Accept either real AS or local AS from the ebgp peer
 - `local_as_no_prepend` (Boolean) Do not prepend local-as to updates from ebgp peers

docs/resources/bgp_peer_session_template.md

@@ -0,0 +1,61 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "iosxe_bgp_peer_session_template Resource - terraform-provider-iosxe"
+subcategory: "BGP"
+description: |-
+  This resource can manage the BGP Peer Session Template configuration.
+---
+
+# iosxe_bgp_peer_session_template (Resource)
+
+This resource can manage the BGP Peer Session Template configuration.
+
+## Example Usage
+
+```terraform
+resource "iosxe_bgp_peer_session_template" "example" {
+  asn                              = "65000"
+  template_name                    = "PEER_SESSION_TEMPLATE_1"
+  remote_as                        = "65001"
+  description                      = "Peer Session Template Description"
+  disable_connected_check          = true
+  ebgp_multihop                    = true
+  ebgp_multihop_max_hop            = 10
+  update_source_interface_loopback = 100
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `asn` (String)
+- `template_name` (String)
+
+### Optional
+
+- `delete_mode` (String) Configure behavior when deleting/destroying the resource. Either delete the entire object (YANG container) being managed, or only delete the individual resource attributes configured explicitly and leave everything else as-is. Default value is `all`.
+  - Choices: `all`, `attributes`
+- `description` (String) Neighbor specific description
+- `device` (String) A device name from the provider configuration.
+- `disable_connected_check` (Boolean) one-hop away EBGP peer using loopback address
+- `ebgp_multihop` (Boolean) Allow EBGP neighbors not on directly connected networks. For single-hop ebgp peers, delete ebgp-multihop directly.
+- `ebgp_multihop_max_hop` (Number) - Range: `2`-`255`
+- `inherit_peer_session` (String) Inherit a peer-session template
+- `remote_as` (String) Specify a BGP neighbor remote-as
+- `update_source_interface_loopback` (Number) Loopback interface
+
+### Read-Only
+
+- `id` (String) The path of the object.
+
+## Import
+
+Import is supported using the following syntax:
+
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
+
+```shell
+terraform import iosxe_bgp_peer_session_template.example "<asn>,<template_name>"
+```

docs/resources/route_map.md

@@ -70,6 +70,7 @@ resource "iosxe_route_map" "example" {
       set_tag                                = 100
       set_as_path_prepend_as                 = "65001 65001"
       set_as_path_prepend_last_as            = 5
+      set_communities                        = ["no-export"]
       set_extcomunity_rt                     = ["10:10"]
       set_extcomunity_soo                    = "10:10"
       set_extcomunity_vpn_distinguisher      = "10:10"
@@ -157,7 +158,7 @@ Optional:
 - `set_as_path_replace_as` (Attributes List) (see [below for nested schema](#nestedatt--entries--set_as_path_replace_as))
 - `set_as_path_tag` (Boolean) Set the tag as an AS-path attribute
 - `set_as_path_tag_legacy` (Boolean) Set the tag as an AS-path attribute (OBSOLETE - please use route-map configuration in Cisco-IOS-XE-bgp.yang)
-- `set_communities` (List of String)
+- `set_communities` (List of String) BGP community value - can be a number (AA:NN format) or well-known value (internet, local-AS, no-advertise, no-export, gshut)
 - `set_communities_additive` (Boolean)
 - `set_communities_additive_legacy` (Boolean)
 - `set_communities_legacy` (List of String)
@@ -187,6 +188,7 @@ Optional:
 - `set_ip_global_next_hop_address` (List of String)
 - `set_ip_next_hop_address` (List of String) IP address of next hop
 - `set_ip_next_hop_self` (Boolean) Use self address (for BGP only)
+- `set_ip_next_hop_unchanged` (Boolean) Propagate next hop unchanged
 - `set_ip_qos_group` (Number) - Range: `0`-`99`
 - `set_ipv6_address` (List of String) IPv6 prefix-list
 - `set_ipv6_default_global_next_hop` (String) Next hop along path

examples/data-sources/iosxe_bgp_peer_session_template/data-source.tf

@@ -0,0 +1,4 @@
+data "iosxe_bgp_peer_session_template" "example" {
+  asn           = "65000"
+  template_name = "PEER_SESSION_TEMPLATE_1"
+}

examples/resources/iosxe_bgp_peer_session_template/import.sh

@@ -0,0 +1 @@
+terraform import iosxe_bgp_peer_session_template.example "<asn>,<template_name>"