From e8e40e1f51baf196115e58ad581e66bf3ff31490 Mon Sep 17 00:00:00 2001 From: Allen Ting Date: Mon, 28 Apr 2025 20:01:48 +0000 Subject: [PATCH 1/2] add graceful restart to bgp model --- models/enterprise_sonic/bgp/sonic_bgp.yaml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/models/enterprise_sonic/bgp/sonic_bgp.yaml b/models/enterprise_sonic/bgp/sonic_bgp.yaml index eea7259d7..9206b2b88 100644 --- a/models/enterprise_sonic/bgp/sonic_bgp.yaml +++ b/models/enterprise_sonic/bgp/sonic_bgp.yaml @@ -46,6 +46,29 @@ DOCUMENTATION: | description: - Enable/disable logging neighbor up/down and reset reason. type: bool + graceful_restart: + description: + - Configure graceful restart + type: dict + suboptions: + enabled: + description: + - Enable graceful restart + type: bool + restart_time: + description: + - Configures restart-time. + - The range is from 0 to 3600. + type: int + stale_routes_time: + description: + - Configures stale-routes-time + - The range is from 0 to 3600. + type: int + preserve_fw_state: + description: + - Configures preserve-fw-state + type: bool bestpath: description: - Configures the BGP bestpath. From 01bb574b3e6c3dbc46221b32f6bff96f49190e4e Mon Sep 17 00:00:00 2001 From: Allen Ting Date: Tue, 29 Apr 2025 17:25:30 +0000 Subject: [PATCH 2/2] updated examples --- models/enterprise_sonic/bgp/deleted_example_01.txt | 7 +++++++ models/enterprise_sonic/bgp/deleted_example_02.txt | 1 + models/enterprise_sonic/bgp/merged_example_01.txt | 5 +++++ models/enterprise_sonic/bgp/sonic_bgp.yaml | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/models/enterprise_sonic/bgp/deleted_example_01.txt b/models/enterprise_sonic/bgp/deleted_example_01.txt index d5b438f85..00a9bc0da 100644 --- a/models/enterprise_sonic/bgp/deleted_example_01.txt +++ b/models/enterprise_sonic/bgp/deleted_example_01.txt @@ -16,6 +16,9 @@ #! #router bgp 4 # router-id 10.2.2.4 +# graceful-restart enable +# graceful-restart restart-time 1 +# graceful-restart stalepath-time 500 # bestpath as-path ignore # bestpath as-path confed # bestpath med missing-as-worst confed @@ -28,6 +31,9 @@ # - bgp_as: 4 # router_id: 10.2.2.4 # log_neighbor_changes: False +# graceful_restart: +# stale_routes_time: 500 +# restart_time: 1 # bestpath: # as_path: # confed: True @@ -67,6 +73,7 @@ # bestpath compare-routerid #! #router bgp 4 +# graceful-restart enable # log-neighbor-changes # bestpath compare-routerid #! diff --git a/models/enterprise_sonic/bgp/deleted_example_02.txt b/models/enterprise_sonic/bgp/deleted_example_02.txt index 5a7d84ff7..87129c293 100644 --- a/models/enterprise_sonic/bgp/deleted_example_02.txt +++ b/models/enterprise_sonic/bgp/deleted_example_02.txt @@ -9,6 +9,7 @@ # log-neighbor-changes #! #router bgp 11 vrf VrfCheck2 +# graceful-restart enable # log-neighbor-changes # bestpath as-path ignore # bestpath med missing-as-worst confed diff --git a/models/enterprise_sonic/bgp/merged_example_01.txt b/models/enterprise_sonic/bgp/merged_example_01.txt index 53d1b0818..be14a1311 100644 --- a/models/enterprise_sonic/bgp/merged_example_01.txt +++ b/models/enterprise_sonic/bgp/merged_example_01.txt @@ -14,6 +14,9 @@ # - bgp_as: 4 # router_id: 10.2.2.4 # log_neighbor_changes: False +# graceful_restart: +# enabled: True +# preserve_fw_state: True # bestpath: # as_path: # confed: True @@ -58,6 +61,8 @@ #! #router bgp 4 # router-id 10.2.2.4 +# graceful-restart enable +# graceful-restart preserve-fw-state # bestpath as-path ignore # bestpath as-path confed # bestpath med missing-as-worst confed diff --git a/models/enterprise_sonic/bgp/sonic_bgp.yaml b/models/enterprise_sonic/bgp/sonic_bgp.yaml index 9206b2b88..ddd1f1002 100644 --- a/models/enterprise_sonic/bgp/sonic_bgp.yaml +++ b/models/enterprise_sonic/bgp/sonic_bgp.yaml @@ -58,12 +58,12 @@ DOCUMENTATION: | restart_time: description: - Configures restart-time. - - The range is from 0 to 3600. + - The range is from 1 to 3600. type: int stale_routes_time: description: - Configures stale-routes-time - - The range is from 0 to 3600. + - The range is from 1 to 3600. type: int preserve_fw_state: description: