fixed optics in scenarios

networmix · networmix · commit fbcbdd819bc1 · 2025-08-14T04:48:00.000+01:00
diff --git a/examples/backbone_baseline.yml b/examples/backbone_baseline.yml
@@ -69,6 +69,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/examples/backbone_clos.yml b/examples/backbone_clos.yml
@@ -69,6 +69,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/examples/backbone_slimfly.yml b/examples/backbone_slimfly.yml
@@ -69,6 +69,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/examples/backbone_slimfly_spine.yml b/examples/backbone_slimfly_spine.yml
@@ -69,6 +69,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/examples/small_test_baseline.yml b/examples/small_test_baseline.yml
@@ -57,6 +57,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/examples/small_test_clos.yml b/examples/small_test_clos.yml
@@ -57,6 +57,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/examples/small_test_slimfly.yml b/examples/small_test_slimfly.yml
@@ -57,6 +57,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/examples/small_test_slimfly_spine.yml b/examples/small_test_slimfly_spine.yml
@@ -57,6 +57,7 @@ components:
     leaf|leaf: 800G-ZR+
     core|leaf: 800G-ZR+
     leaf|dc: 800G-ZR+
+    core|dc: 800G-ZR+
     leaf|spine: 800G-DR4
     spine|leaf: 1600G-2xDR4
 
diff --git a/topogen/traffic_matrix.py b/topogen/traffic_matrix.py
@@ -527,7 +527,7 @@ def _distance_km(m1: str, m2: str) -> float:
                     "mode": "pairwise",
                     "priority": int(priority),
                     "demand": demand_each,
-                    "attrs": {"euclidean_km": float(dist_km)},
+                    "attrs": {"euclidean_km": int(math.ceil(float(dist_km)))},
                 }
             )
             # Optional per-priority flow policy config passthrough
@@ -542,7 +542,7 @@ def _distance_km(m1: str, m2: str) -> float:
                     "mode": "pairwise",
                     "priority": int(priority),
                     "demand": demand_each,
-                    "attrs": {"euclidean_km": float(dist_km)},
+                    "attrs": {"euclidean_km": int(math.ceil(float(dist_km)))},
                 }
             )
             if isinstance(getattr(traffic_cfg, "flow_policy_config", {}), dict):

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ def _distance_km(m1: str, m2: str) -> float:`
`527`	`527`	`"mode": "pairwise",`
`528`	`528`	`"priority": int(priority),`
`529`	`529`	`"demand": demand_each,`
`530`		`- "attrs": {"euclidean_km": float(dist_km)},`
	`530`	`+ "attrs": {"euclidean_km": int(math.ceil(float(dist_km)))},`
`531`	`531`	`}`
`532`	`532`	`)`
`533`	`533`	`# Optional per-priority flow policy config passthrough`
`@@ -542,7 +542,7 @@ def _distance_km(m1: str, m2: str) -> float:`
`542`	`542`	`"mode": "pairwise",`
`543`	`543`	`"priority": int(priority),`
`544`	`544`	`"demand": demand_each,`
`545`		`- "attrs": {"euclidean_km": float(dist_km)},`
	`545`	`+ "attrs": {"euclidean_km": int(math.ceil(float(dist_km)))},`
`546`	`546`	`}`
`547`	`547`	`)`
`548`	`548`	`if isinstance(getattr(traffic_cfg, "flow_policy_config", {}), dict):`