From 8d23c059a394557b1728e60f910779b9a8776e6d Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Mon, 21 Apr 2025 20:25:50 -0400 Subject: [PATCH 1/8] evpn esi multihome model --- .../evpn_esi_multihome/deleted_example_01.txt | 28 +++++++++++ .../evpn_esi_multihome/merged_example_01.txt | 23 +++++++++ .../overridden_example_01.txt | 27 +++++++++++ .../replaced_example_01.txt | 29 ++++++++++++ .../sonic_evpn_esi_multihome.yml | 47 +++++++++++++++++++ 5 files changed, 154 insertions(+) create mode 100644 models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt create mode 100644 models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt create mode 100644 models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt create mode 100644 models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt create mode 100644 models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml diff --git a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt new file mode 100644 index 00000000..8b9307b2 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt @@ -0,0 +1,28 @@ +# Using deleted +# +# Before state: +#--------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 300 +# + +- name: Delete soecific option from evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + mac-holdtime: 1080 + state: deleted + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# neigh-holdtime 1080 +# startup-delay 300 +# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt new file mode 100644 index 00000000..9f70f627 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt @@ -0,0 +1,23 @@ +# Using Merged +# +# Before state: +#--------------- +# +# show running-configuration evpn-mh +# +# +# + +- name: Merge specific option from evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + startup-delay: 300 + state: merged + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# startup-delay 300 \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt new file mode 100644 index 00000000..61a16697 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt @@ -0,0 +1,27 @@ +# Using overridden +# +# Before state: +#---------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 300 +# + +- name: Override specific option from sonic_evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + startup-delay: 200 + state: overridden + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# startup-delay 200 +# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt new file mode 100644 index 00000000..67120b21 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt @@ -0,0 +1,29 @@ +# Using replaced +# +# Before state: +#---------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 300 +# + +- name: Replace specific option from sonic_evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + startup-delay: 200 + state: replaced + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 200 +# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml new file mode 100644 index 00000000..d0b5806a --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml @@ -0,0 +1,47 @@ +--- +GENERATOR_VERSION: '1.0' +ANSIBLE_METADATA: | + { + 'metadata_version': '1.1', + 'status': ['preview'], + 'supported_by': 'community' + } +NETWORK_OS: sonic +RESOURCE: snmp +COPYRIGHT: Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved. +DOCUMENTATION: | + module: sonic_evpn_esi_multihome + version_added: 4.5 + short_description: Manage SNMP configuration on SONiC + description: + - This module provides configuration management of SNMP for devices running SONiC + author: Aida Shumburo (@aida-shumburo) + options: + config: + description: + - evpn esi multihome configuration + type: dict + suboptions: + mac-holdtime: + description: + - mac holdtime + type: int + neigh-holdtime: + description: + - neigh holdtime + type: int + startup-delay: + description: + - startup delay + type: int + state: + description: + - The state of the configuration after module completion + type: str + choices: ['merged', 'deleted', 'replaced', 'overridden'] + default: merged +EXAMPLES: + - deleted_example_01.txt + - merged_example_01.txt + - replaced_example_01.txt + - overridden_example_01.txt \ No newline at end of file From 0aeba6c5fa5a8b294b36ebec706f8db3cb2b4aa2 Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Tue, 22 Apr 2025 16:18:58 -0400 Subject: [PATCH 2/8] update model --- .../evpn_esi_multihome/deleted_example_02.txt | 29 +++++++++++ .../evpn_esi_multihome/merged_example_02.txt | 23 +++++++++ .../overridden_example_02.txt | 27 ++++++++++ .../replaced_example_01.txt | 2 - .../replaced_example_02.txt | 27 ++++++++++ .../sonic_evpn_esi_multihome.yml | 49 ++++++++++++++----- 6 files changed, 143 insertions(+), 14 deletions(-) create mode 100644 models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt create mode 100644 models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt create mode 100644 models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt create mode 100644 models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt diff --git a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt new file mode 100644 index 00000000..84d14205 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt @@ -0,0 +1,29 @@ +# Using deleted +# +# Before state: +#--------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 300 +# df-election 3 + +- name: Delete soecific option from evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + df-election: 3 + state: deleted + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 300 +# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt new file mode 100644 index 00000000..348b0616 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt @@ -0,0 +1,23 @@ +# Using Merged +# +# Before state: +#--------------- +# +# show running-configuration evpn-mh +# +# +# + +- name: Merge specific option from evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + es-activation-delay: 3000 + state: merged + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# es-activation-delay 3000 \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt new file mode 100644 index 00000000..427c8ab4 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt @@ -0,0 +1,27 @@ +# Using overridden +# +# Before state: +#---------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 300 +# + +- name: Override specific option from sonic_evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + mac_holdtime: 500 + state: overridden + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac_holdtime 500 +# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt index 67120b21..eb6a617c 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt @@ -23,7 +23,5 @@ # show running-configuration evpn-mh # # evpn esi-multihoming -# mac-holdtime 1080 -# neigh-holdtime 1080 # startup-delay 200 # \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt new file mode 100644 index 00000000..6170eac7 --- /dev/null +++ b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt @@ -0,0 +1,27 @@ +# Using replaced +# +# Before state: +#---------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# mac-holdtime 1080 +# neigh-holdtime 1080 +# startup-delay 300 +# + +- name: Replace specific option from sonic_evpn_esi_multihome configuration + sonic_evpn_esi_multihome: + config: + neigh-holdtime: 200 + state: replaced + +# After State: +#-------------- +# +# show running-configuration evpn-mh +# +# evpn esi-multihoming +# neigh-holdtime 200 +# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml index d0b5806a..11fc4253 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml +++ b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml @@ -7,32 +7,53 @@ ANSIBLE_METADATA: | 'supported_by': 'community' } NETWORK_OS: sonic -RESOURCE: snmp +RESOURCE: evpn_esi_multihome COPYRIGHT: Copyright 2025 Dell Inc. or its subsidiaries. All Rights Reserved. DOCUMENTATION: | module: sonic_evpn_esi_multihome - version_added: 4.5 - short_description: Manage SNMP configuration on SONiC + version_added: 3.1.0 + short_description: Manage EVPN ESI multihoming configuration on SONiC description: - - This module provides configuration management of SNMP for devices running SONiC + - This module provides configuration management of EVPN ESI multihoming for devices running SONiC author: Aida Shumburo (@aida-shumburo) options: config: description: - - evpn esi multihome configuration + - EVPN ESI multihoming configuration type: dict suboptions: - mac-holdtime: + df_election: description: - - mac holdtime + - Election timer value in seconds + - Has a range between 0 and 86400 + - Default is 3 type: int - neigh-holdtime: + es_activation_delay: description: - - neigh holdtime + - Activation delay in seconds + - Has a range between 0 and 1200000 + - Default is 0 type: int - startup-delay: + mac_holdtime: description: - - startup delay + - MAC hold time in seconds + - Has a range between 0 and 86400 + - Default is 1080 + - Enter 0 to disable MAC hold time + type: int + neigh_holdtime: + description: + - Neighbor hold time in seconds + - Has a range between 0 and 86400 + - Default is 1080 + - Enter 0 to disable neighbor hold time + type: int + startup_delay: + description: + - Startup delay + - Has a range between 0 and 3600 + - Default is 300 + - Enter 0 to disable startup delay type: int state: description: @@ -42,6 +63,10 @@ DOCUMENTATION: | default: merged EXAMPLES: - deleted_example_01.txt + - deleted_example_02.txt - merged_example_01.txt + - merged_example_02.txt - replaced_example_01.txt - - overridden_example_01.txt \ No newline at end of file + - replaced_example_02.txt + - overridden_example_01.txt + - overridden_example_02.txt \ No newline at end of file From 9c69eaf5ce4cdd22fe1f3369e62b05a135e963e8 Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Tue, 22 Apr 2025 17:02:05 -0400 Subject: [PATCH 3/8] update model examples --- .../evpn_esi_multihome/deleted_example_02.txt | 7 ++--- .../evpn_esi_multihome/merged_example_01.txt | 13 ++++----- .../evpn_esi_multihome/merged_example_02.txt | 23 ---------------- .../overridden_example_01.txt | 3 ++- .../overridden_example_02.txt | 27 ------------------- .../replaced_example_01.txt | 9 ++++--- .../replaced_example_02.txt | 27 ------------------- .../sonic_evpn_esi_multihome.yml | 11 +++----- 8 files changed, 20 insertions(+), 100 deletions(-) delete mode 100644 models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt delete mode 100644 models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt delete mode 100644 models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt diff --git a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt index 84d14205..56f5f33b 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt @@ -13,8 +13,7 @@ - name: Delete soecific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: - config: - df-election: 3 + config: {} state: deleted # After State: @@ -23,7 +22,5 @@ # show running-configuration evpn-mh # # evpn esi-multihoming -# mac-holdtime 1080 -# neigh-holdtime 1080 -# startup-delay 300 +# # \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt index 9f70f627..db6f8fdb 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt @@ -6,13 +6,13 @@ # show running-configuration evpn-mh # # -# - name: Merge specific option from evpn_esi_multihome configuration - sonic_evpn_esi_multihome: - config: - startup-delay: 300 - state: merged + sonic_evpn_esi_multihome: + config: + startup-delay: 300 + es-activation-delay: 3000 + state: merged # After State: #-------------- @@ -20,4 +20,5 @@ # show running-configuration evpn-mh # # evpn esi-multihoming -# startup-delay 300 \ No newline at end of file +# startup-delay 300 +# es-activation-delay 3000 \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt deleted file mode 100644 index 348b0616..00000000 --- a/models/enterprise_sonic/evpn_esi_multihome/merged_example_02.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Using Merged -# -# Before state: -#--------------- -# -# show running-configuration evpn-mh -# -# -# - -- name: Merge specific option from evpn_esi_multihome configuration - sonic_evpn_esi_multihome: - config: - es-activation-delay: 3000 - state: merged - -# After State: -#-------------- -# -# show running-configuration evpn-mh -# -# evpn esi-multihoming -# es-activation-delay 3000 \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt index 61a16697..6d7764f0 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt @@ -15,6 +15,7 @@ sonic_evpn_esi_multihome: config: startup-delay: 200 + mac_holdtime: 500 state: overridden # After State: @@ -24,4 +25,4 @@ # # evpn esi-multihoming # startup-delay 200 -# \ No newline at end of file +# mac_holdtime: 500 \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt deleted file mode 100644 index 427c8ab4..00000000 --- a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_02.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Using overridden -# -# Before state: -#---------------- -# -# show running-configuration evpn-mh -# -# evpn esi-multihoming -# mac-holdtime 1080 -# neigh-holdtime 1080 -# startup-delay 300 -# - -- name: Override specific option from sonic_evpn_esi_multihome configuration - sonic_evpn_esi_multihome: - config: - mac_holdtime: 500 - state: overridden - -# After State: -#-------------- -# -# show running-configuration evpn-mh -# -# evpn esi-multihoming -# mac_holdtime 500 -# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt index eb6a617c..4f5c8d73 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt @@ -9,12 +9,13 @@ # mac-holdtime 1080 # neigh-holdtime 1080 # startup-delay 300 -# +# df-election: 3 - name: Replace specific option from sonic_evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: - startup-delay: 200 + neigh-holdtime: 200 + df-election: 600 state: replaced # After State: @@ -23,5 +24,5 @@ # show running-configuration evpn-mh # # evpn esi-multihoming -# startup-delay 200 -# \ No newline at end of file +# neigh-holdtime 200 +# df-election: 600 \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt deleted file mode 100644 index 6170eac7..00000000 --- a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_02.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Using replaced -# -# Before state: -#---------------- -# -# show running-configuration evpn-mh -# -# evpn esi-multihoming -# mac-holdtime 1080 -# neigh-holdtime 1080 -# startup-delay 300 -# - -- name: Replace specific option from sonic_evpn_esi_multihome configuration - sonic_evpn_esi_multihome: - config: - neigh-holdtime: 200 - state: replaced - -# After State: -#-------------- -# -# show running-configuration evpn-mh -# -# evpn esi-multihoming -# neigh-holdtime 200 -# \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml index 11fc4253..99841c89 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml +++ b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml @@ -39,21 +39,21 @@ DOCUMENTATION: | - MAC hold time in seconds - Has a range between 0 and 86400 - Default is 1080 - - Enter 0 to disable MAC hold time + - Specify 0 to disable MAC hold time type: int neigh_holdtime: description: - Neighbor hold time in seconds - Has a range between 0 and 86400 - Default is 1080 - - Enter 0 to disable neighbor hold time + - Specify 0 to disable neighbor hold time type: int startup_delay: description: - Startup delay - Has a range between 0 and 3600 - Default is 300 - - Enter 0 to disable startup delay + - Specify 0 to disable startup delay type: int state: description: @@ -65,8 +65,5 @@ EXAMPLES: - deleted_example_01.txt - deleted_example_02.txt - merged_example_01.txt - - merged_example_02.txt - replaced_example_01.txt - - replaced_example_02.txt - - overridden_example_01.txt - - overridden_example_02.txt \ No newline at end of file + - overridden_example_01.txt \ No newline at end of file From b593afbbe6592c456a857706614836ac67bc5731 Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Tue, 22 Apr 2025 17:05:24 -0400 Subject: [PATCH 4/8] updated delete all example --- .../enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt index 56f5f33b..253d9379 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt @@ -21,6 +21,5 @@ # # show running-configuration evpn-mh # -# evpn esi-multihoming # # \ No newline at end of file From abf987c01b75a764e1aa4f86c22da04bb244874e Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Tue, 22 Apr 2025 17:06:47 -0400 Subject: [PATCH 5/8] update description for startup delay --- .../evpn_esi_multihome/sonic_evpn_esi_multihome.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml index 99841c89..8935303f 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml +++ b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml @@ -50,7 +50,7 @@ DOCUMENTATION: | type: int startup_delay: description: - - Startup delay + - Startup delay in seconds - Has a range between 0 and 3600 - Default is 300 - Specify 0 to disable startup delay From d12bae46393ba086bc23184e800c7de063703551 Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Tue, 22 Apr 2025 17:10:59 -0400 Subject: [PATCH 6/8] update description of playbooks in examples --- .../evpn_esi_multihome/overridden_example_01.txt | 2 +- .../enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt index 6d7764f0..6bc1c1a9 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt @@ -11,7 +11,7 @@ # startup-delay 300 # -- name: Override specific option from sonic_evpn_esi_multihome configuration +- name: Override specific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: startup-delay: 200 diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt index 4f5c8d73..e914da3a 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt @@ -11,7 +11,7 @@ # startup-delay 300 # df-election: 3 -- name: Replace specific option from sonic_evpn_esi_multihome configuration +- name: Replace specific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: neigh-holdtime: 200 From 59f02eb682ed24f9ed459e92b031192beb2deefc Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Mon, 28 Apr 2025 12:02:57 -0400 Subject: [PATCH 7/8] change 'df-election' to df-election-time' --- .../evpn_esi_multihome/deleted_example_02.txt | 2 +- .../evpn_esi_multihome/replaced_example_01.txt | 6 +++--- .../evpn_esi_multihome/sonic_evpn_esi_multihome.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt index 253d9379..19c113d6 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_02.txt @@ -9,7 +9,7 @@ # mac-holdtime 1080 # neigh-holdtime 1080 # startup-delay 300 -# df-election 3 +# df-election-time 3 - name: Delete soecific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt index e914da3a..476ae28a 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt @@ -9,13 +9,13 @@ # mac-holdtime 1080 # neigh-holdtime 1080 # startup-delay 300 -# df-election: 3 +# df-election-time: 3 - name: Replace specific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: neigh-holdtime: 200 - df-election: 600 + df-election_time: 600 state: replaced # After State: @@ -25,4 +25,4 @@ # # evpn esi-multihoming # neigh-holdtime 200 -# df-election: 600 \ No newline at end of file +# df-election-time: 600 \ No newline at end of file diff --git a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml index 8935303f..f28c8c0c 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml +++ b/models/enterprise_sonic/evpn_esi_multihome/sonic_evpn_esi_multihome.yml @@ -22,7 +22,7 @@ DOCUMENTATION: | - EVPN ESI multihoming configuration type: dict suboptions: - df_election: + df_election_time: description: - Election timer value in seconds - Has a range between 0 and 86400 From 5e7faf9a0433864196d30f6348cf4e1082dc5a71 Mon Sep 17 00:00:00 2001 From: Aida Shumburo Date: Wed, 30 Apr 2025 16:26:05 -0400 Subject: [PATCH 8/8] change hyphens to underscores in the ansible playbook option names in examples --- .../evpn_esi_multihome/deleted_example_01.txt | 2 +- .../enterprise_sonic/evpn_esi_multihome/merged_example_01.txt | 4 ++-- .../evpn_esi_multihome/overridden_example_01.txt | 2 +- .../evpn_esi_multihome/replaced_example_01.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt index 8b9307b2..a73ee770 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/deleted_example_01.txt @@ -14,7 +14,7 @@ - name: Delete soecific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: - mac-holdtime: 1080 + mac_holdtime: 1080 state: deleted # After State: diff --git a/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt index db6f8fdb..28a565e3 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/merged_example_01.txt @@ -10,8 +10,8 @@ - name: Merge specific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: - startup-delay: 300 - es-activation-delay: 3000 + startup_delay: 300 + es_activation_delay: 3000 state: merged # After State: diff --git a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt index 6bc1c1a9..95542eec 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/overridden_example_01.txt @@ -14,7 +14,7 @@ - name: Override specific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: - startup-delay: 200 + startup_delay: 200 mac_holdtime: 500 state: overridden diff --git a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt index 476ae28a..c41ce204 100644 --- a/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt +++ b/models/enterprise_sonic/evpn_esi_multihome/replaced_example_01.txt @@ -14,8 +14,8 @@ - name: Replace specific option from evpn_esi_multihome configuration sonic_evpn_esi_multihome: config: - neigh-holdtime: 200 - df-election_time: 600 + neigh_holdtime: 200 + df_election_time: 600 state: replaced # After State: