Feat: Add path-groups

aristanetworks · Dec 19, 2023 · 74ed1f3 · 74ed1f3
1 parent 4711478
commit 74ed1f3
Show file tree

Hide file tree

Showing 19 changed files with 232 additions and 30 deletions.
diff --git a/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge.cfg b/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge.cfg
@@ -10,7 +10,24 @@ hostname autovpn-edge
 !
 router path-selection
    !
+   path-group INET id 500
+      ipsec profile AUTOVPN
+      !
+      local interface Ethernet1
+         stun server-profile autovpn-rr1-INET-0 autovpn-rr2-INET-0
+      !
+      peer dynamic
+      !
+      peer static router-ip 192.168.31.1
+         name autovpn-rr1
+         ipv4 address 10.7.7.7
+      !
+      peer static router-ip 192.168.31.2
+         name autovpn-rr2
+         ipv4 address 10.8.8.8
+   !
    load-balance policy LBPOLICY
+      path-group INET
    !
    policy dps-policy-default
       default-match

diff --git a/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr1.cfg b/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr1.cfg
@@ -11,7 +11,13 @@ hostname autovpn-rr1
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 500
+      ipsec profile AUTOVPN
+      !
+      local interface Ethernet1
+   !
    load-balance policy LBPOLICY
+      path-group INET
    !
    policy dps-policy-default
       default-match

diff --git a/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr2.cfg b/...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr2.cfg
@@ -11,7 +11,13 @@ hostname autovpn-rr2
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 500
+      ipsec profile AUTOVPN
+      !
+      local interface Ethernet1
+   !
    load-balance policy LBPOLICY
+      path-group INET
    !
    policy dps-policy-default
       default-match

diff --git a/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg b/...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg
@@ -19,7 +19,20 @@ hostname cv-pathfinder-edge
 !
 router path-selection
    !
+   path-group INET id 500
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+         stun server-profile cv-pathfinder-pathfinder-INET-0
+      !
+      peer dynamic
+      !
+      peer static router-ip 192.168.44.1
+         name cv-pathfinder-pathfinder
+         ipv4 address 10.7.7.7
+   !
    load-balance policy LBPOLICY
+      path-group INET
 !
 router adaptive-virtual-topology
    topology role edge

diff --git a/.../arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg b/.../arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg
@@ -20,7 +20,13 @@ hostname cv-pathfinder-pathfinder
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 500
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+   !
    load-balance policy LBPOLICY
+      path-group INET
 !
 router adaptive-virtual-topology
    topology role pathfinder

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg
@@ -20,7 +20,13 @@ hostname cv-pathfinder-pathfinder1
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 500
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+   !
    load-balance policy LBPOLICY
+      path-group INET
 !
 router adaptive-virtual-topology
    topology role pathfinder

diff --git a/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg b/...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg
@@ -20,7 +20,13 @@ hostname cv-pathfinder-pathfinder2
 router path-selection
    peer dynamic source stun
    !
+   path-group INET id 500
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+   !
    load-balance policy LBPOLICY
+      path-group INET
 !
 router adaptive-virtual-topology
    topology role pathfinder

diff --git a/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit.cfg b/...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit.cfg
@@ -19,7 +19,20 @@ hostname cv-pathfinder-transit
 !
 router path-selection
    !
+   path-group INET id 500
+      ipsec profile CP-PROFILE
+      !
+      local interface Ethernet1
+         stun server-profile cv-pathfinder-pathfinder-INET-0
+      !
+      peer dynamic
+      !
+      peer static router-ip 192.168.44.1
+         name cv-pathfinder-pathfinder
+         ipv4 address 10.7.7.7
+   !
    load-balance policy LBPOLICY
+      path-group INET
 !
 router adaptive-virtual-topology
    topology role transit region

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml
@@ -92,8 +92,31 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+      stun:
+        server_profiles:
+        - autovpn-rr1-INET-0
+        - autovpn-rr2-INET-0
+    dynamic_peers:
+      enabled: true
+    static_peers:
+    - router_ip: 192.168.31.1
+      name: autovpn-rr1
+      ipv4_addresses:
+      - 10.7.7.7
+    - router_ip: 192.168.31.2
+      name: autovpn-rr2
+      ipv4_addresses:
+      - 10.8.8.8
+    ipsec_profile: AUTOVPN
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
   policies:
   - name: dps-policy-default
     default_match:

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml
@@ -107,8 +107,16 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+    ipsec_profile: AUTOVPN
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
   policies:
   - name: dps-policy-default
     default_match:

diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml
@@ -107,8 +107,16 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+    ipsec_profile: AUTOVPN
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
   policies:
   - name: dps-policy-default
     default_match:

diff --git a/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml b/...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml
@@ -142,8 +142,26 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+      stun:
+        server_profiles:
+        - cv-pathfinder-pathfinder-INET-0
+    dynamic_peers:
+      enabled: true
+    static_peers:
+    - router_ip: 192.168.44.1
+      name: cv-pathfinder-pathfinder
+      ipv4_addresses:
+      - 10.7.7.7
+    ipsec_profile: CP-PROFILE
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
 stun:
   client:
     server_profiles:

diff --git a/.../molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml b/.../molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml
@@ -140,8 +140,16 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+    ipsec_profile: CP-PROFILE
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
   peer_dynamic_source: stun
 stun:
   server:

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml
@@ -166,8 +166,16 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+    ipsec_profile: CP-PROFILE
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
   peer_dynamic_source: stun
 stun:
   server:

diff --git a/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml b/...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml
@@ -166,8 +166,16 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+    ipsec_profile: CP-PROFILE
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
   peer_dynamic_source: stun
 stun:
   server:

diff --git a/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit.yml b/...avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit.yml
@@ -142,8 +142,26 @@ router_bfd:
     min_rx: 300
     multiplier: 3
 router_path_selection:
+  path_groups:
+  - name: INET
+    id: 500
+    local_interfaces:
+    - name: Ethernet1
+      stun:
+        server_profiles:
+        - cv-pathfinder-pathfinder-INET-0
+    dynamic_peers:
+      enabled: true
+    static_peers:
+    - router_ip: 192.168.44.1
+      name: cv-pathfinder-pathfinder
+      ipv4_addresses:
+      - 10.7.7.7
+    ipsec_profile: CP-PROFILE
   load_balance_policies:
   - name: LBPOLICY
+    path_groups:
+    - name: INET
 stun:
   client:
     server_profiles:

diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_facts/eos_designs_facts.py b/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_facts/eos_designs_facts.py
@@ -13,8 +13,8 @@
 from .overlay import OverlayMixin
 from .short_esi import ShortEsiMixin
 from .uplinks import UplinksMixin
-from .wan import WanMixin
 from .vlans import VlansMixin
+from .wan import WanMixin
 
 
 class EosDesignsFacts(AvdFacts, MlagMixin, ShortEsiMixin, OverlayMixin, WanMixin, UplinksMixin, VlansMixin):

diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/wan.py b/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/wan.py
@@ -90,7 +90,7 @@ def wan_local_path_groups(self: SharedUtils) -> list:
                 "name",
                 iface_path_group,
                 required=True,
-                custom_error_msg=f"WAN path_group {iface_path_group} is not in the available path_groups defined in `wan_path_groupes`",
+                custom_error_msg=f"WAN path_group {iface_path_group} is not in the available path_groups defined in `wan_path_groups`",
             )
             local_path_groups.append(path_group)