Skip to content

Commit 8967f2f

Browse files
networmixnetwormix
committed
adding SlimFly and other improvements
1 parent 55ee6f2 commit 8967f2f

File tree

9 files changed

+737
-55
lines changed

9 files changed

+737
-55
lines changed

‎examples/small_test_baseline.yml‎

Lines changed: 23 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,21 @@ build:
1717
intra_metro_link:
1818
capacity: 12_800
1919
cost: 1
20-
attrs:
21-
link_type: intra_metro
22-
match:
23-
conditions:
24-
- attr: role
25-
operator: "=="
26-
value: core
27-
- attr: role
28-
operator: "=="
29-
value: leaf
20+
attrs: { link_type: intra_metro }
21+
role_pairs: ["core|leaf"]
3022
inter_metro_link:
3123
capacity: 3_200
3224
cost: 1
33-
attrs:
34-
link_type: inter_metro_corridor
35-
match:
36-
conditions:
37-
- attr: role
38-
operator: "=="
39-
value: core
40-
- attr: role
41-
operator: "=="
42-
value: leaf
43-
logic: "or"
25+
attrs: { link_type: inter_metro_corridor }
26+
role_pairs: ["core|leaf"]
4427
dc_to_pop_link:
4528
capacity: 25_600
4629
cost: 1
47-
attrs:
48-
link_type: dc_to_pop
49-
match:
50-
conditions:
51-
- attr: role
52-
operator: "=="
53-
value: core
54-
- attr: role
55-
operator: "=="
56-
value: dc
57-
- attr: role
58-
operator: "=="
59-
value: leaf
60-
logic: "or"
30+
attrs: { link_type: dc_to_pop }
31+
role_pairs: ["dc|core", "dc|leaf"]
6132
build_overrides:
6233
- metros: [new-york-jersey-city-newark, columbus, washington-arlington]
34+
site_blueprint: SingleRouter
6335
dc_regions_per_metro: 1
6436
dc_region_blueprint: DCRegion
6537

@@ -75,13 +47,18 @@ build:
7547
respect_min_base_capacity: true
7648

7749
components:
78-
assignments:
79-
core:
80-
hw_component: CoreRouter
81-
leaf:
82-
hw_component: LeafRouter
83-
spine:
84-
hw_component: SpineRouter
50+
hw_component:
51+
core: CoreRouter
52+
leaf: LeafRouter
53+
spine: SpineRouter
54+
dc: {}
55+
optics:
56+
core|core: 800G-ZR+
57+
leaf|leaf: 800G-ZR+
58+
core|leaf: 800G-ZR+
59+
leaf|dc: 800G-ZR+
60+
leaf|spine: 800G-DR4
61+
spine|leaf: 1600G-2xDR4
8562

8663
failure_policies:
8764
assignments:
@@ -98,10 +75,12 @@ visualization:
9875
traffic:
9976
enabled: true
10077
model: gravity
101-
gbps_per_mw: 250.0
102-
mw_per_dc_region: 500.0
78+
gbps_per_mw: 400.0
79+
mw_per_dc_region: 400.0
10380
priority_ratios:
10481
0: 1
82+
flow_policy_config:
83+
0: TE_UCMP_UNLIM
10584
matrix_name: baseline_traffic_matrix
10685
gravity:
10786
alpha: 1.0

‎examples/small_test_clos.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ traffic:
7979
mw_per_dc_region: 400.0
8080
priority_ratios:
8181
0: 1
82+
flow_policy_config:
83+
0: TE_UCMP_UNLIM
8284
matrix_name: baseline_traffic_matrix
8385
gravity:
8486
alpha: 1.0

‎examples/small_test_slimfly.yml‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
output:
2+
scenario_metadata:
3+
title: "Small Test: East Coast, SlimFly_16x4"
4+
5+
formatting:
6+
json_indent: 2
7+
yaml_anchors: true
8+
9+
scenario_seed: 42
10+
11+
build:
12+
build_defaults:
13+
pop_per_metro: 2
14+
site_blueprint: SingleRouter
15+
dc_regions_per_metro: 0
16+
dc_region_blueprint: DCRegion
17+
intra_metro_link:
18+
capacity: 12_800
19+
cost: 1
20+
attrs: { link_type: intra_metro }
21+
role_pairs: ["core|leaf"]
22+
inter_metro_link:
23+
capacity: 3_200
24+
cost: 1
25+
attrs: { link_type: inter_metro_corridor }
26+
role_pairs: ["core|leaf"]
27+
dc_to_pop_link:
28+
capacity: 25_600
29+
cost: 1
30+
attrs: { link_type: dc_to_pop }
31+
role_pairs: ["dc|core", "dc|leaf"]
32+
build_overrides:
33+
- metros: [new-york-jersey-city-newark, columbus, washington-arlington]
34+
site_blueprint: SlimFly_16x4
35+
dc_regions_per_metro: 1
36+
dc_region_blueprint: DCRegion
37+
38+
tm_sizing:
39+
enabled: true
40+
matrix_name: baseline_traffic_matrix
41+
quantum_gbps: 3200.0
42+
headroom: 1.3
43+
alpha_dc_to_pop: 1.2
44+
beta_intra_pop: 0.8
45+
flow_placement: EQUAL_BALANCED
46+
edge_select: ALL_MIN_COST
47+
respect_min_base_capacity: true
48+
49+
components:
50+
hw_component:
51+
core: CoreRouter
52+
leaf: LeafRouter
53+
spine: SpineRouter
54+
dc: {}
55+
optics:
56+
core|core: 800G-ZR+
57+
leaf|leaf: 800G-ZR+
58+
core|leaf: 800G-ZR+
59+
leaf|dc: 800G-ZR+
60+
leaf|spine: 800G-DR4
61+
spine|leaf: 1600G-2xDR4
62+
63+
failure_policies:
64+
assignments:
65+
default: "mc_baseline"
66+
67+
workflows:
68+
assignments:
69+
default: "capacity_analysis"
70+
71+
visualization:
72+
corridors:
73+
use_real_geometry: true
74+
75+
traffic:
76+
enabled: true
77+
model: gravity
78+
gbps_per_mw: 400.0
79+
mw_per_dc_region: 400.0
80+
priority_ratios:
81+
0: 1
82+
flow_policy_config:
83+
0: TE_UCMP_UNLIM
84+
matrix_name: baseline_traffic_matrix
85+
gravity:
86+
alpha: 1.0
87+
beta: 0.8
88+
min_distance_km: 200.0
89+
exclude_same_metro: false
90+
distance_metric: euclidean_km
91+
emission: explicit_pairs
92+
jitter_stddev: 0.0
93+
rounding_gbps: 100.0
94+
95+
data_sources:
96+
uac_polygons: "data/tl_2020_us_uac20.zip"
97+
tiger_roads: "data/tl_2024_us_primaryroads.zip"
98+
conus_boundary: "data/cb_2024_us_state_500k.zip"
99+
100+
projection:
101+
target_crs: "EPSG:5070"
102+
103+
clustering:
104+
metro_clusters: 5
105+
max_uac_radius_km: 100.0
106+
export_clusters: false
107+
export_integrated_graph: true
108+
109+
override_metro_clusters:
110+
- "New York"
111+
- "Washington"
112+
- "Chicago"
113+
- "Atlanta"
114+
- "Columbus"
115+
116+
coordinate_precision: 1
117+
area_precision: 2
118+
119+
highway_processing:
120+
min_edge_length_km: 0.0
121+
snap_precision_m: 150.0
122+
highway_classes: ["S1100"]
123+
min_cycle_nodes: 3
124+
filter_largest_component: true
125+
validation_sample_size: 5
126+
127+
corridors:
128+
k_paths: 1
129+
k_nearest: 6
130+
max_edge_km: 1000.0
131+
max_corridor_distance_km: 1500.0
132+
133+
risk_groups:
134+
enabled: true
135+
group_prefix: "corridor_risk"
136+
exclude_metro_radius_shared: true
137+
138+
validation:
139+
max_metro_highway_distance_km: 50.0
140+
require_connected: true
141+
max_degree_threshold: 1000
142+
high_degree_warning: 20
143+
min_largest_component_fraction: 0.5

‎examples/small_test_slimfly_spine.yml‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
output:
2+
scenario_metadata:
3+
title: "Small Test: East Coast, SlimFly_16x4_2S"
4+
5+
formatting:
6+
json_indent: 2
7+
yaml_anchors: true
8+
9+
scenario_seed: 42
10+
11+
build:
12+
build_defaults:
13+
pop_per_metro: 2
14+
site_blueprint: SingleRouter
15+
dc_regions_per_metro: 0
16+
dc_region_blueprint: DCRegion
17+
intra_metro_link:
18+
capacity: 12_800
19+
cost: 1
20+
attrs: { link_type: intra_metro }
21+
role_pairs: ["core|leaf"]
22+
inter_metro_link:
23+
capacity: 3_200
24+
cost: 1
25+
attrs: { link_type: inter_metro_corridor }
26+
role_pairs: ["core|leaf"]
27+
dc_to_pop_link:
28+
capacity: 25_600
29+
cost: 1
30+
attrs: { link_type: dc_to_pop }
31+
role_pairs: ["dc|core", "dc|leaf"]
32+
build_overrides:
33+
- metros: [new-york-jersey-city-newark, columbus, washington-arlington]
34+
site_blueprint: SlimFly_16x4_2S
35+
dc_regions_per_metro: 1
36+
dc_region_blueprint: DCRegion
37+
38+
tm_sizing:
39+
enabled: true
40+
matrix_name: baseline_traffic_matrix
41+
quantum_gbps: 3200.0
42+
headroom: 1.3
43+
alpha_dc_to_pop: 1.2
44+
beta_intra_pop: 0.8
45+
flow_placement: EQUAL_BALANCED
46+
edge_select: ALL_MIN_COST
47+
respect_min_base_capacity: true
48+
49+
components:
50+
hw_component:
51+
core: CoreRouter
52+
leaf: LeafRouter
53+
spine: SpineRouter
54+
dc: {}
55+
optics:
56+
core|core: 800G-ZR+
57+
leaf|leaf: 800G-ZR+
58+
core|leaf: 800G-ZR+
59+
leaf|dc: 800G-ZR+
60+
leaf|spine: 800G-DR4
61+
spine|leaf: 1600G-2xDR4
62+
63+
failure_policies:
64+
assignments:
65+
default: "mc_baseline"
66+
67+
workflows:
68+
assignments:
69+
default: "capacity_analysis"
70+
71+
visualization:
72+
corridors:
73+
use_real_geometry: true
74+
75+
traffic:
76+
enabled: true
77+
model: gravity
78+
gbps_per_mw: 400.0
79+
mw_per_dc_region: 400.0
80+
priority_ratios:
81+
0: 1
82+
flow_policy_config:
83+
0: TE_UCMP_UNLIM
84+
matrix_name: baseline_traffic_matrix
85+
gravity:
86+
alpha: 1.0
87+
beta: 0.8
88+
min_distance_km: 200.0
89+
exclude_same_metro: false
90+
distance_metric: euclidean_km
91+
emission: explicit_pairs
92+
jitter_stddev: 0.0
93+
rounding_gbps: 100.0
94+
95+
data_sources:
96+
uac_polygons: "data/tl_2020_us_uac20.zip"
97+
tiger_roads: "data/tl_2024_us_primaryroads.zip"
98+
conus_boundary: "data/cb_2024_us_state_500k.zip"
99+
100+
projection:
101+
target_crs: "EPSG:5070"
102+
103+
clustering:
104+
metro_clusters: 5
105+
max_uac_radius_km: 100.0
106+
export_clusters: false
107+
export_integrated_graph: true
108+
109+
override_metro_clusters:
110+
- "New York"
111+
- "Washington"
112+
- "Chicago"
113+
- "Atlanta"
114+
- "Columbus"
115+
116+
coordinate_precision: 1
117+
area_precision: 2
118+
119+
highway_processing:
120+
min_edge_length_km: 0.0
121+
snap_precision_m: 150.0
122+
highway_classes: ["S1100"]
123+
min_cycle_nodes: 3
124+
filter_largest_component: true
125+
validation_sample_size: 5
126+
127+
corridors:
128+
k_paths: 1
129+
k_nearest: 6
130+
max_edge_km: 1000.0
131+
max_corridor_distance_km: 1500.0
132+
133+
risk_groups:
134+
enabled: true
135+
group_prefix: "corridor_risk"
136+
exclude_metro_radius_shared: true
137+
138+
validation:
139+
max_metro_highway_distance_km: 50.0
140+
require_connected: true
141+
max_degree_threshold: 1000
142+
high_degree_warning: 20
143+
min_largest_component_fraction: 0.5

0 commit comments

Comments
 (0)