diff --git a/service_capacity_modeling/capacity_planner.py b/service_capacity_modeling/capacity_planner.py index a5318ae..41eb892 100644 --- a/service_capacity_modeling/capacity_planner.py +++ b/service_capacity_modeling/capacity_planner.py @@ -189,13 +189,25 @@ def _set_instance_objects( ): if desires.current_clusters: for zonal_cluster_capacity in desires.current_clusters.zonal: - zonal_cluster_capacity.cluster_instance = hardware.instances[ - zonal_cluster_capacity.cluster_instance_name - ] + if zonal_cluster_capacity.cluster_instance_name in hardware.instances: + zonal_cluster_capacity.cluster_instance = hardware.instances[ + zonal_cluster_capacity.cluster_instance_name + ] + else: + raise ValueError( + f"Model not trained to right size cass clusters that are of " + f"instance types {zonal_cluster_capacity.cluster_instance_name}" + ) for regional_cluster_capacity in desires.current_clusters.regional: - regional_cluster_capacity.cluster_instance = hardware.instances[ - regional_cluster_capacity.cluster_instance_name - ] + if regional_cluster_capacity.cluster_instance_name in hardware.instances: + regional_cluster_capacity.cluster_instance = hardware.instances[ + regional_cluster_capacity.cluster_instance_name + ] + else: + raise ValueError( + f"Model not trained to right size cass clusters that are of " + f"instance types {regional_cluster_capacity.cluster_instance_name}" + ) def _allow_instance( diff --git a/service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved.json b/service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved.json index d9eb4c6..0046f05 100644 --- a/service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved.json +++ b/service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved.json @@ -7,6 +7,7 @@ "m5.2xlarge": {"annual_cost": 1264.6}, "m5.4xlarge": {"annual_cost": 2529.7}, "m5.8xlarge": {"annual_cost": 5059.33}, + "m5.12xlarge": {"annual_cost": 7589.1}, "m6i.large": {"annual_cost": 332.0}, "m6i.xlarge": {"annual_cost": 664.0}, "m6i.2xlarge": {"annual_cost": 1328.00}, @@ -45,7 +46,6 @@ "m5d.2xlarge": {"annual_cost": 1488.6}, "m5d.4xlarge": {"annual_cost": 2977.7}, "m5d.8xlarge": {"annual_cost": 5955}, - "m5d.12xlarge": {"annual_cost": 8933.1}, "m6id.large": {"annual_cost": 390.67}, "m6id.xlarge": {"annual_cost": 781.66}, "m6id.2xlarge": {"annual_cost": 1563.32},