Cut(eos_cli_config_gen): Remove deprecated key MIB_family_name from s…

…nmp_server data model (#4289)
aristanetworks · Jul 31, 2024 · 7ca118c · 7ca118c
1 parent 01b863e
commit 7ca118c
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 32 deletions.
diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
@@ -81,7 +81,7 @@ The following data model keys have been removed from `eos_cli_config_gen` in v5.
 | old key 9.6(router_bgp) | new key(TODO) |
 | old key 10.1(router_isis) | new key(TODO) |
 | old key 10.2(router_isis) | new key(TODO) |
-| old key 11(snmp_server) | new key(TODO) |
+| snmp_server.views.MIB_family_name | snmp_server.views.mib_family_name |
 | stun.server.local_interface | stun.server.local_interfaces |
 | old key 13.1(vlan_interfaces) | new key(TODO) |
 | old key 13.2(vlan_interfaces) | new key(TODO) |
diff --git a/.../avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md b/.../avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md
@@ -348,7 +348,7 @@ logging policy match match-list molecule discard
 
 | View | MIB Family Name | Status |
 | ---- | --------------- | ------ |
-| VW-WRITE | iso | Included |
+| VW-WRITE | - | Included |
 
 #### SNMP Communities
 
@@ -365,7 +365,7 @@ logging policy match match-list molecule discard
 snmp-server vrf MGMT local-interface Management1
 snmp-server local-interface Loopback0
 snmp-server vrf Tenant_A_APP_Zone local-interface Loopback12
-snmp-server view VW-WRITE iso included
+snmp-server view VW-WRITE included
 snmp-server community <removed> ro onur
 snmp-server community <removed> view VW-READ rw ipv6 SNMP-MGMT SNMP-MGMT
 snmp-server community <removed> ro

diff --git a/...ections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg b/...ections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg
@@ -83,7 +83,7 @@ qos profile test
 snmp-server vrf MGMT local-interface Management1
 snmp-server local-interface Loopback0
 snmp-server vrf Tenant_A_APP_Zone local-interface Loopback12
-snmp-server view VW-WRITE iso included
+snmp-server view VW-WRITE included
 snmp-server community SNMP-COMMUNITY-1 ro onur
 snmp-server community SNMP-COMMUNITY-2 view VW-READ rw ipv6 SNMP-MGMT SNMP-MGMT
 snmp-server community SNMP-COMMUNITY-3 ro

diff --git a/...inventory/host_vars/host1/snmp-server.yml → ...inventory/host_vars/host1/snmp_server.yml b/...inventory/host_vars/host1/snmp-server.yml → ...inventory/host_vars/host1/snmp_server.yml
@@ -26,7 +26,4 @@ snmp_server:
       vrf: Tenant_A_APP_Zone
   views:
     - name: VW-WRITE
-      # Testing deprecated upper-case key name
-      # Deprecated in 4.0.0 in favor of lower case variant. To be removed in 5.0.0
-      MIB_family_name: iso
       included: true
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/snmp-server.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/snmp-server.md
diff --git a/...ollections/arista/avd/roles/eos_designs/docs/tables/management-snmp-settings.md b/...ollections/arista/avd/roles/eos_designs/docs/tables/management-snmp-settings.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/snmp-server.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/snmp-server.j2
@@ -119,7 +119,7 @@
 | ---- | --------------- | ------ |
 {%         for view in snmp_server.views %}
 {%             set row_view = view.name | arista.avd.default('default') %}
-{%             set row_mib_family_name = view.mib_family_name | arista.avd.default(view.MIB_family_name, '-') %}
+{%             set row_mib_family_name = view.mib_family_name | arista.avd.default('-') %}
 {%             if view.included | arista.avd.default(false) %}
 {%                 set row_status = 'Included' %}
 {%             else %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/snmp-server.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/snmp-server.j2
@@ -60,8 +60,8 @@ snmp-server location {{ snmp_server.location }}
 {%             if view.name is arista.avd.defined %}
 {%                 set view_cli = "snmp-server view " ~ view.name %}
 {%             endif %}
-{%             if view.mib_family_name | arista.avd.default(view.MIB_family_name) is arista.avd.defined %}
-{%                 set view_cli = view_cli ~ " " ~ view.mib_family_name | arista.avd.default(view.MIB_family_name) %}
+{%             if view.mib_family_name is arista.avd.defined %}
+{%                 set view_cli = view_cli ~ " " ~ view.mib_family_name %}
 {%             endif %}
 {%             if view.included is arista.avd.defined(true) %}
 {%                 set view_cli = view_cli ~ " included" %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/snmp_server.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/snmp_server.schema.yml
@@ -126,6 +126,7 @@ keys:
             MIB_family_name:
               deprecation:
                 warning: true
+                removed: true
                 remove_in_version: 5.0.0
                 new_key: mib_family_name
               type: str

diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json b/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json