From 4dea4cf0359962a54440ebbc3d45253582a16ae9 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 11 Jul 2022 02:59:45 +0200
Subject: [PATCH] switch-b3: distribute bonds across both stacked switches in
 the hope for enhanced redundancy

---
 config/switch.nix | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/config/switch.nix b/config/switch.nix
index 73e0207..fd59bbe 100644
--- a/config/switch.nix
+++ b/config/switch.nix
@@ -53,30 +53,44 @@
         serv.ports = [
           "ge-0/0/22"
         ];
-        c3d2.ports = [ "ge-0/0/5" "ge-0/0/6" "ge-0/0/7" "ge-0/0/8" ];
+        c3d2.ports = [ "ge-0/0/5" "ge-0/0/8" ];
         # server1 had g46,g47,g48 too but this switch has too few
         # port-channel groups
         server1.ports = [ "ge-0/0/24" ];
         server2 = {
           group = "1";
-          ports = [ "ge-0/0/12" "ge-0/0/38" "ge-0/0/39" "ge-0/0/40" ];
+          ports = [
+            "ge-0/0/38" "ge-0/0/39"
+            "ge-1/0/32" "ge-1/0/33"
+          ];
         };
         hydra = {
           group = "7";
           trunk = false;
-          ports = [ "ge-0/0/9" "ge-0/0/11" "ge-0/0/14" "ge-0/0/15" ];
+          ports = [
+            "ge-0/0/14" "ge-0/0/15"
+            "ge-1/0/14" "ge-1/0/15"
+          ];
         };
         server10 = {
           group = "5";
-          ports = [ "ge-0/0/13" "ge-0/0/35" "ge-0/0/36" "ge-0/0/37" ];
+          ports = [
+            "ge-0/0/36" "ge-0/0/37"
+            "ge-1/0/36" "ge-1/0/37"
+          ];
         };
         switch-c1 = {
           group = "2";
-          ports = [ "ge-0/0/29" "ge-0/0/30" "ge-0/0/31" "ge-0/0/32" ];
+          ports = [ "ge-0/0/30" "ge-0/0/31" "ge-1/0/30" "ge-1/0/31" ];
         };
         switch-c3d2-main = {
           group = "4";
-          ports = [ "ge-0/0/41" "ge-0/0/42" "ge-0/0/43" "ge-0/0/44" ];
+          ports = [
+            "ge-0/0/26"
+            "ge-0/0/27"
+            "ge-1/0/26"
+            "ge-1/0/27"
+          ];
         };
         switch-d1.ports = [ "ge-0/0/34" ];
 
@@ -86,17 +100,17 @@
         ap18.ports = [ "ge-1/0/18" ];
         ap24.ports = [ "ge-1/0/34" ];
         ap25.ports = [ "ge-1/0/35" ];
-        ap29.ports = [ "ge-1/0/36" ];
+        ap29.ports = [ "ge-0/0/46" ];
         ap30.ports = [ "ge-1/0/22" ];
         ap35.ports = [ "ge-1/0/23" ];
         ap37.ports = [ "ge-1/0/39" ];
         ap39.ports = [ "ge-1/0/17" ];
         ap40.ports = [ "ge-1/0/21" ];
-        ap41.ports = [ "ge-1/0/37" ];
+        ap41.ports = [ "ge-0/0/47" ];
         ap42.ports = [ "ge-1/0/6" ];
         ap5.ports = [ "ge-1/0/7" ];
         ap51.ports = [ "ge-1/0/13" ];
-        ap53.ports = [ "ge-1/0/15" ];
+        ap53.ports = [ "ge-0/0/7" ];
         ap54.ports = [ "ge-1/0/38" ];
         ap55.ports = [ "ge-1/0/19" ];
         ap56.ports = [ "ge-1/0/9" ];
@@ -124,7 +138,7 @@
         priv1.ports = [ "ge-1/0/3" ];
         priv19.ports = [ "ge-1/0/40" ];
         priv2.ports = [ "ge-1/0/4" ];
-        priv24.ports = [ "ge-1/0/14" "ge-1/0/16" ];
+        priv24.ports = [ "ge-0/0/6" "ge-1/0/16" ];
         priv3.ports = [ "ge-1/0/5" ];
         pub.ports = [
           "ge-1/0/11"
@@ -133,10 +147,10 @@
         server9 = {
           group = "10";
           ports = [
-            "ge-1/0/2"
+            "ge-0/0/28"
+            "ge-0/0/29"
+            "ge-1/0/28"
             "ge-1/0/29"
-            "ge-1/0/32"
-            "ge-1/0/33"
           ];
         };
       };