Feat: Add default loab balance policies per VRF

aristanetworks · Dec 20, 2023 · 4a2356e · 4a2356e
1 parent 9d248e6
commit 4a2356e
Show file tree

Hide file tree

Showing 17 changed files with 94 additions and 0 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
@@ -29,6 +29,9 @@ router path-selection
    load-balance policy it_it_lb
       path-group INET priority 2
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+   !
    load-balance policy voice_voice_lb
       path-group INET priority 1
    !

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
@@ -19,6 +19,9 @@ router path-selection
    load-balance policy it_it_lb
       path-group INET priority 2
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+   !
    load-balance policy voice_voice_lb
       path-group INET priority 1
    !

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
@@ -19,6 +19,9 @@ router path-selection
    load-balance policy it_it_lb
       path-group INET priority 2
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+   !
    load-balance policy voice_voice_lb
       path-group INET priority 1
    !

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
@@ -41,6 +41,10 @@ router path-selection
       path-group INET priority 1
       path-group MPLS priority 1
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+      path-group MPLS priority 2
+   !
    load-balance policy voice_voice_lb
       path-group MPLS priority 1
       path-group INET priority 2

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
@@ -33,6 +33,10 @@ router path-selection
       path-group INET priority 1
       path-group MPLS priority 1
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+      path-group MPLS priority 2
+   !
    load-balance policy voice_voice_lb
       path-group MPLS priority 1
       path-group INET priority 2

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
@@ -29,6 +29,10 @@ router path-selection
       path-group INET priority 1
       path-group MPLS priority 1
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+      path-group MPLS priority 2
+   !
    load-balance policy voice_voice_lb
       path-group MPLS priority 1
       path-group INET priority 2

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
@@ -29,6 +29,10 @@ router path-selection
       path-group INET priority 1
       path-group MPLS priority 1
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+      path-group MPLS priority 2
+   !
    load-balance policy voice_voice_lb
       path-group MPLS priority 1
       path-group INET priority 2

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
@@ -46,6 +46,10 @@ router path-selection
       path-group INET priority 1
       path-group MPLS priority 1
    !
+   load-balance policy voice_default_lb
+      path-group INET priority 1
+      path-group MPLS priority 2
+   !
    load-balance policy voice_voice_lb
       path-group MPLS priority 1
       path-group INET priority 2

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
@@ -124,6 +124,10 @@ router_path_selection:
     path_groups:
     - name: INET
       priority: 1
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
   - name: it_it_lb
     path_groups:
     - name: INET

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
@@ -119,6 +119,10 @@ router_path_selection:
     path_groups:
     - name: INET
       priority: 1
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
   - name: it_it_lb
     path_groups:
     - name: INET

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
@@ -119,6 +119,10 @@ router_path_selection:
     path_groups:
     - name: INET
       priority: 1
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
   - name: it_it_lb
     path_groups:
     - name: INET

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
@@ -200,6 +200,12 @@ router_path_selection:
       priority: 1
     - name: INET
       priority: 2
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
+    - name: MPLS
+      priority: 2
   - name: it_it_lb
     path_groups:
     - name: INET

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
@@ -181,6 +181,12 @@ router_path_selection:
       priority: 1
     - name: INET
       priority: 2
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
+    - name: MPLS
+      priority: 2
   - name: it_it_lb
     path_groups:
     - name: INET

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
@@ -203,6 +203,12 @@ router_path_selection:
       priority: 1
     - name: INET
       priority: 2
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
+    - name: MPLS
+      priority: 2
   - name: it_it_lb
     path_groups:
     - name: INET

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
@@ -203,6 +203,12 @@ router_path_selection:
       priority: 1
     - name: INET
       priority: 2
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
+    - name: MPLS
+      priority: 2
   - name: it_it_lb
     path_groups:
     - name: INET

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
@@ -208,6 +208,12 @@ router_path_selection:
       priority: 1
     - name: INET
       priority: 2
+  - name: voice_default_lb
+    path_groups:
+    - name: INET
+      priority: 1
+    - name: MPLS
+      priority: 2
   - name: it_it_lb
     path_groups:
     - name: INET

diff --git a/ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/utils.py b/ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/utils.py
@@ -368,4 +368,27 @@ def _wan_load_balance_policies(self) -> list:
                 # TODO implement also the jitter / ...
                 wan_load_balance_policies.append(wan_load_balance_policy)
 
+            if default_policy := get(avt_policy, "default_policy"):
+                name = get(default_policy, "name", default=f"{avt_policy['name']}_default")
+                wan_load_balance_policy = {"name": f"{name}_lb"}
+
+                # TODO add LAN_HA with prio 1 when HA is implemented
+                # TODO for now hardcoding priorities as requested by team
+                for path_group in get(default_policy, "preferred_path_groups", []):
+                    wan_load_balance_policy.setdefault("path_groups", []).append(
+                        {
+                            "name": path_group,
+                            "priority": 1,
+                        }
+                    )
+                for path_group in get(default_policy, "alternate_path_groups", []):
+                    wan_load_balance_policy.setdefault("path_groups", []).append(
+                        {
+                            "name": path_group,
+                            "priority": 2,
+                        }
+                    )
+
+                wan_load_balance_policies.append(wan_load_balance_policy)
+
         return wan_load_balance_policies