addressing comments

aristanetworks · Oct 17, 2024 · 3e124d8 · 3e124d8
1 parent 9ed0ed1
commit 3e124d8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md
@@ -508,6 +508,7 @@ interface Port-Channel10
    switchport trunk allowed vlan 110-111,210-211
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01

diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg
@@ -162,6 +162,7 @@ interface Port-Channel10
    switchport trunk allowed vlan 110-111,210-211
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01

diff --git a/...s_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml b/...s_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
@@ -1087,7 +1087,7 @@ cvp_configlets:
     trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n
     \  switchport mode trunk\n   switchport\n   mlag 7\n!\ninterface Port-Channel10\n
     \  description SERVER_server03_ESI\n   no shutdown\n   switchport trunk allowed
-    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   evpn ethernet-segment\n
+    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   !\n   evpn ethernet-segment\n
     \     identifier 0000:0000:0303:0202:0101\n      route-target import 03:03:02:02:01:01\n
     \  lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n   description P2P_DC1-SPINE1_Ethernet4\n
     \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.25/31\n!\ninterface

diff --git a/...d/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml b/...d/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
@@ -1087,7 +1087,7 @@ cvp_configlets:
     trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n
     \  switchport mode trunk\n   switchport\n   mlag 7\n!\ninterface Port-Channel10\n
     \  description SERVER_server03_ESI\n   no shutdown\n   switchport trunk allowed
-    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   evpn ethernet-segment\n
+    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   !\n   evpn ethernet-segment\n
     \     identifier 0000:0000:0303:0202:0101\n      route-target import 03:03:02:02:01:01\n
     \  lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n   description P2P_DC1-SPINE1_Ethernet4\n
     \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.25/31\n!\ninterface

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/system.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/system.md
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/system.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/system.schema.yml
@@ -39,10 +39,10 @@ keys:
                   type: str
                   convert_types:
                     - int
-                  description: Keys `vrf` and `ingress_default` are mutual exclusive.
+                  description: Keys `vrf` and `ingress_default` are mutually exclusive.
                 ingress_default:
                   type: bool
-                  description: Keys `vrf` and `ingress_default` are mutual exclusive.
+                  description: Keys `vrf` and `ingress_default` are mutually exclusive.
           ipv6_access_groups:
             type: list
             unique_keys:
@@ -57,10 +57,10 @@ keys:
                   type: str
                   convert_types:
                     - int
-                  description: "'vrf' and 'ingress_default' are mutual exclusive."
+                  description: "'vrf' and 'ingress_default' are mutually exclusive."
                 ingress_default:
                   type: bool
-                  description: "'vrf' and 'ingress_default' are mutual exclusive."
+                  description: "'vrf' and 'ingress_default' are mutually exclusive."
       l1:
         type: dict
         keys: