cleanup

Author: networmix

examples/baseline.yml

@@ -78,9 +78,6 @@ build:
       dc_regions_per_metro: 1
       dc_region_blueprint: DCRegion
 
-  capacity_allocation:
-    enabled: false
-
 components:
   assignments:
     core:

examples/small_test_baseline.yml

@@ -63,9 +63,6 @@ build:
       dc_regions_per_metro: 1
       dc_region_blueprint: DCRegion
 
-  capacity_allocation:
-    enabled: false
-
   tm_sizing:
     enabled: true
     matrix_name: baseline_traffic_matrix

examples/small_test_clos.yml

@@ -35,9 +35,6 @@ build:
       dc_regions_per_metro: 1
       dc_region_blueprint: DCRegion
 
-  capacity_allocation:
-    enabled: false
-
   tm_sizing:
     enabled: true
     matrix_name: baseline_traffic_matrix

tests/test_components_scenario_builder.py

@@ -116,7 +116,7 @@ def test_build_blueprints_section_basic(self):
 
         core_group = single_router["groups"]["core"]
         assert "attrs" in core_group
-        assert core_group["attrs"]["hw_component"] == "CoreRouter"
+        assert core_group["attrs"].get("hardware", {}).get("component") == "CoreRouter"
 
     def test_build_blueprints_section_with_role_assignments(self):
         """Test building blueprints section uses role assignments only."""
@@ -142,9 +142,9 @@ def test_build_blueprints_section_with_role_assignments(self):
         spine_group = clos_blueprint["groups"]["spine"]
         leaf_group = clos_blueprint["groups"]["leaf"]
 
-        # Should use role-based components
-        assert spine_group["attrs"]["hw_component"] == "CoreRouter"
-        assert leaf_group["attrs"]["hw_component"] == "CoreRouter"
+        # Should use role-based hardware mapping
+        assert spine_group["attrs"].get("hardware", {}).get("component") == "CoreRouter"
+        assert leaf_group["attrs"].get("hardware", {}).get("component") == "CoreRouter"
 
     def test_build_blueprints_section_preserves_existing_attrs(self):
         """Test that building blueprints preserves existing node attributes."""
@@ -171,8 +171,8 @@ def test_build_blueprints_section_preserves_existing_attrs(self):
         assert spine_group["attrs"]["role"] == "spine"
         assert spine_group["attrs"]["tier"] == "spine"
 
-        # And add new component assignment
-        assert spine_group["attrs"]["hw_component"] == "CoreRouter"
+        # And add new hardware assignment
+        assert spine_group["attrs"].get("hardware", {}).get("component") == "CoreRouter"
 
     def test_build_blueprints_section_unknown_blueprint(self):
         """Test error when unknown blueprint is requested."""
@@ -191,9 +191,9 @@ def test_build_blueprints_section_no_role_assignment(self):
 
         assert "SingleRouter" in blueprints
 
-        # Should not add hw_component if no assignment
+        # Should not add hardware if no assignment
         core_group = blueprints["SingleRouter"]["groups"]["core"]
-        assert "hw_component" not in core_group["attrs"]
+        assert "hardware" not in core_group["attrs"]
 
     def test_build_blueprints_section_role_inference(self):
         """Test that role is correctly inferred from group name."""
@@ -208,7 +208,7 @@ def test_build_blueprints_section_role_inference(self):
         core_group = full_mesh["groups"]["core"]
 
         # Should use default core assignment since no override
-        assert core_group["attrs"]["hw_component"] == "CoreRouter"
+        assert core_group["attrs"].get("hardware", {}).get("component") == "CoreRouter"
 
     def test_components_section_includes_only_referenced(self):
         """Test that components section includes only referenced components."""

tests/test_site_graph_sot.py

@@ -34,13 +34,7 @@ def test_sites_section_includes_per_site_blueprint_and_components():
     cfg.build.build_defaults.site_blueprint = "SingleRouter"
     cfg.build.build_defaults.dc_region_blueprint = "DCRegion"
 
-    # Provide explicit role->component assignments to be serialized per site
-    cfg.components.hw_component = {
-        "core": "CoreRouter",
-        "leaf": "LeafRouter",
-        "spine": "SpineRouter",
-        "dc": "CoreRouter",
-    }
+    # Per-site assignments removed; blueprint-level hardware covers nodes
 
     yaml_str = build_scenario(graph, cfg)
     data = yaml.safe_load(yaml_str)

topogen/config.py

@@ -186,33 +186,11 @@ class BuildConfig:
 
     build_defaults: BuildDefaults = field(default_factory=BuildDefaults)
     build_overrides: dict[str, dict[str, Any]] = field(default_factory=dict)
-    # Capacity allocation policy
-    # Hardware-aware capacity allocation is disabled by default for
-    # strict backward compatibility.
-    capacity_allocation: "BuildCapacityAllocationConfig" = field(  # type: ignore[name-defined]
-        default_factory=lambda: BuildCapacityAllocationConfig()
-    )
     tm_sizing: "BuildTmSizingConfig" = field(  # type: ignore[name-defined]
         default_factory=lambda: BuildTmSizingConfig()
     )
 
 
-@dataclass
-class BuildCapacityAllocationConfig:
-    """Hardware-aware capacity allocation settings.
-
-    When enabled, capacity allocation for dc_to_pop, intra_metro, and
-    inter_metro links becomes aware of platform capacities. Base capacities
-    from configuration are treated as minimums. Remaining capacity is
-    allocated to inter-metro links in discrete increments.
-
-    Attributes:
-        enabled: Turn on HW-aware allocation. Default False.
-    """
-
-    enabled: bool = False
-
-
 @dataclass
 class BuildTmSizingConfig:
     """Traffic-matrix-based capacity sizing configuration.
@@ -626,17 +604,12 @@ def _from_dict(cls, config_dict: dict[str, Any]) -> TopologyConfig:
 
         build_defaults_dict = build_dict.get("build_defaults", {})
         build_overrides_list = build_dict.get("build_overrides", [])
-        capacity_alloc_dict = build_dict.get("capacity_allocation", {})
         tm_sizing_dict = build_dict.get("tm_sizing", {})
 
         if not isinstance(build_defaults_dict, dict):
             raise ValueError("'build_defaults' must be a dictionary")
         if not isinstance(build_overrides_list, list):
             raise ValueError("'build_overrides' must be a list of override entries")
-        if capacity_alloc_dict is None:
-            capacity_alloc_dict = {}
-        if not isinstance(capacity_alloc_dict, dict):
-            raise ValueError("'capacity_allocation' must be a dictionary if provided")
         if tm_sizing_dict is None:
             tm_sizing_dict = {}
         if not isinstance(tm_sizing_dict, dict):
@@ -698,18 +671,6 @@ def _from_dict(cls, config_dict: dict[str, Any]) -> TopologyConfig:
             inter_metro_link=inter_metro_link,
             dc_to_pop_link=dc_to_pop_link,
         )
-        # Capacity allocation configuration
-        # Strictly allow only the supported key 'enabled'
-        _allowed_ca_keys = {"enabled"}
-        _extra_keys = set(capacity_alloc_dict.keys()) - _allowed_ca_keys
-        if _extra_keys:
-            raise ValueError(
-                f"Unknown keys in 'build.capacity_allocation': {_extra_keys}. Allowed keys: {_allowed_ca_keys}"
-            )
-        capacity_allocation = BuildCapacityAllocationConfig(
-            enabled=bool(capacity_alloc_dict.get("enabled", False))
-        )
-
         # TM-based sizing configuration
         _allowed_tm_keys = {
             "enabled",
@@ -792,7 +753,6 @@ def _from_dict(cls, config_dict: dict[str, Any]) -> TopologyConfig:
         build = BuildConfig(
             build_defaults=build_defaults,
             build_overrides=normalized_overrides,
-            capacity_allocation=capacity_allocation,
             tm_sizing=tm_sizing,
         )
 

topogen/metro_clusters.py

@@ -456,7 +456,7 @@ def _export_cluster_files(metro_clusters: list[MetroCluster], target_crs: str) -
         df = pd.DataFrame(metro_data)
         metro_gdf = gpd.GeoDataFrame(df)
         metro_gdf = metro_gdf.set_crs(target_crs)
-        # Prefix not available here; use fixed filename for GeoJSON for backward compat
+        # Prefix not available here; use fixed filename for GeoJSON
         metro_path = output_dir / "metro_clusters.geojson"
         if metro_gdf is not None:
             metro_gdf.to_file(metro_path, driver="GeoJSON")