service-capacity-modeling 0.3.66__py3-none-any.whl → 0.3.68__py3-none-any.whl

service_capacity_modeling/interface.py

@@ -876,7 +876,22 @@ class CapacityDesires(ExcludeUnsetModel):
 
     @property
     def reference_shape(self) -> Instance:
-        # TODO: this should use the shape from current clusters if it is there
+        if not self.current_clusters:
+            return default_reference_shape
+
+        zonal, regional = (self.current_clusters.zonal, self.current_clusters.regional)
+        if zonal and regional:
+            raise ValueError(
+                "The current cluster should not have both "
+                "zonal and regional instances. They're mutually exclusive."
+            )
+
+        if zonal and zonal[0].cluster_instance:
+            return zonal[0].cluster_instance
+
+        if regional and regional[0].cluster_instance:
+            return regional[0].cluster_instance
+
         return default_reference_shape
 
     def merge_with(self, defaults: "CapacityDesires") -> "CapacityDesires":

service_capacity_modeling/models/common.py

@@ -900,7 +900,7 @@ def zonal_requirements_from_current(
             mem_gib=certain_float(needed_memory_gib),
             disk_gib=certain_float(needed_disk_gib),
             network_mbps=certain_float(needed_network_mbps),
-            reference_shape=current_capacity.cluster_instance,
+            reference_shape=reference_shape,
         )
     else:
         raise ValueError("Please check if current_cluster is populated correctly.")

service_capacity_modeling/models/org/netflix/cassandra.py

@@ -164,7 +164,6 @@ def _estimate_cassandra_requirement(  # pylint: disable=too-many-positional-argu
         capacity_requirement = zonal_requirements_from_current(
             desires.current_clusters, desires.buffers, instance, reference_shape
         )
-        reference_shape = capacity_requirement.reference_shape
         disk_scale, _ = derived_buffer_for_component(
             desires.buffers.derived, ["storage", "disk"]
         )

service_capacity_modeling/models/org/netflix/evcache.py

@@ -115,7 +115,12 @@ def calculate_vitals_for_capacity_planner(
     needed_memory_gib = get_memory_from_current_capacity(
         current_capacity, desires.buffers
     )
-    needed_disk_gib = get_disk_from_current_capacity(current_capacity, desires.buffers)
+    if current_capacity.cluster_drive is None:
+        needed_disk_gib = 0.0
+    else:
+        needed_disk_gib = get_disk_from_current_capacity(
+            current_capacity, desires.buffers
+        )
     return needed_cores, needed_network_mbps, needed_memory_gib, needed_disk_gib
 
 
@@ -250,6 +255,10 @@ def _estimate_evcache_cluster_zonal(  # noqa: C901,E501 pylint: disable=too-many
         copies_per_region=copies_per_region,
     )
 
+    # reject instances without ephemeral drives is the requirements need disk
+    if requirement.disk_gib.mid > 0.0 and instance.drive is None:
+        return None
+
     # Account for sidecars and base system memory
     base_mem = (
         desires.data_shape.reserved_instance_app_mem_gib

{service_capacity_modeling-0.3.66.dist-info → service_capacity_modeling-0.3.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: service-capacity-modeling
-Version: 0.3.66
+Version: 0.3.68
 Summary: Contains utilities for modeling capacity for pluggable workloads
 Author: Joseph Lynch
 Author-email: josephl@netflix.com

{service_capacity_modeling-0.3.66.dist-info → service_capacity_modeling-0.3.68.dist-info}/RECORD

@@ -1,6 +1,6 @@
 service_capacity_modeling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 service_capacity_modeling/capacity_planner.py,sha256=B6e0esOAvV6qMkEeLIO9rEveTftRG_Ut_d9gYgSIM0w,31914
-service_capacity_modeling/interface.py,sha256=eJRahrVv-JMbalwd6gqVLbtvCoBhZSLyG-mm8asOBD4,36993
+service_capacity_modeling/interface.py,sha256=-nwCW67LBoxR9I_FZxkMmB0n4VS21gqrdfDCskZ0w7E,37493
 service_capacity_modeling/stats.py,sha256=8HIPwVnmvbauBwXhn6vbNYO7-CzWPuymnq0eX7ZA1_w,5849
 service_capacity_modeling/hardware/__init__.py,sha256=kzIHnIymwnf4qQYDpfIChIAxTF8b87XtnBg1TwF_J9E,8974
 service_capacity_modeling/hardware/profiles/__init__.py,sha256=7-y3JbCBkgzaAjFla2RIymREcImdZ51HTl3yn3vzoGw,1602
@@ -40,19 +40,19 @@ service_capacity_modeling/hardware/profiles/shapes/aws/manual_drives.json,sha256
 service_capacity_modeling/hardware/profiles/shapes/aws/manual_instances.json,sha256=i611n6d7hsjd7L8aSEDzfaTMS2jVs-Jc38-vl-NKfs4,18013
 service_capacity_modeling/hardware/profiles/shapes/aws/manual_services.json,sha256=h63675KKmu5IrI3BORDN8fiAqLjAyYHArErKbC7-T30,776
 service_capacity_modeling/models/__init__.py,sha256=XK7rTBW8ZXQY5L9Uy2FwjuFN_KBW3hKw7IrhG1piajs,13567
-service_capacity_modeling/models/common.py,sha256=f2M3ZpQopENexwwDeoMyH57oktenz88advR2XQoNTys,33567
+service_capacity_modeling/models/common.py,sha256=P4NrPbAdgNKqvVNFUfpocG44Dw8ai9jEDuYIGzRGCRM,33549
 service_capacity_modeling/models/headroom_strategy.py,sha256=QIkP_K_tK2EGAjloaGfXeAPH5M0UDCN8FlAtwV9xxTA,651
 service_capacity_modeling/models/utils.py,sha256=0F__wz9KAGhPIQfvNp-FTtTANW6-sO4FsyddnuXqSJc,2161
 service_capacity_modeling/models/org/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 service_capacity_modeling/models/org/netflix/__init__.py,sha256=m7IaQbo85NEbDvfoPJREIznpzg0YHTCrKP5C1GvnOYM,2378
 service_capacity_modeling/models/org/netflix/aurora.py,sha256=Mi9zd48k64GkKIjAs3J1S2qThguNvyWIy2dUmhwrVhc,12883
-service_capacity_modeling/models/org/netflix/cassandra.py,sha256=BsMx9QYSGSh4wKdJm_dR5rBHdbYlE7NMNWiYIQ0oU4w,34632
+service_capacity_modeling/models/org/netflix/cassandra.py,sha256=TetxgkoZ0hTprXX1GxWpBbOWZdHPtk9VqOi1B6ZeNnw,34569
 service_capacity_modeling/models/org/netflix/counter.py,sha256=hOVRRCgCPU-A5TdLKQXc_mWTQpkKOWRNjOeECdDP7kA,9205
 service_capacity_modeling/models/org/netflix/crdb.py,sha256=AlHdGFpR1RmwQSZsiuiHLR2wTrnmtguT2MMYBDHfdiM,19697
 service_capacity_modeling/models/org/netflix/ddb.py,sha256=GDoXVIpDDY6xDB0dsiaz7RAPPj-qffTrM9N6w5-5ndg,26311
 service_capacity_modeling/models/org/netflix/elasticsearch.py,sha256=746WYY_WSeMgY-Go7wvWGYOxfFV8ryupNThvDZHPbGo,23685
 service_capacity_modeling/models/org/netflix/entity.py,sha256=M0vzwhf8UAbVxnXspAkN4GEbq3rix6yoky6W2oDG6a0,8648
-service_capacity_modeling/models/org/netflix/evcache.py,sha256=i2SWTUTIMVqNMJpJ_xQQT7NsWqHubZJEwoGz5vq-3gk,24968
+service_capacity_modeling/models/org/netflix/evcache.py,sha256=isONE5UF-b8gCgdGB1iMYOrwgKAHghYJiyoBfcYJ1ac,25246
 service_capacity_modeling/models/org/netflix/graphkv.py,sha256=iS5QDDv9_hNY6nIgdL-umB439qP7-jN-n6_Tl6d-ZSo,8557
 service_capacity_modeling/models/org/netflix/iso_date_math.py,sha256=CPGHLmbGeNqkcYcmCkLKhPZcAU-yTJ2HjvuXdnNyCYc,996
 service_capacity_modeling/models/org/netflix/kafka.py,sha256=FiuBml8uWOVfPFZ37NvZW13nMVtFE4VDf_SZIFdw4sA,25515
@@ -69,9 +69,9 @@ service_capacity_modeling/tools/auto_shape.py,sha256=41pfR40BN-xJS8js4BWSoqT67Jh
 service_capacity_modeling/tools/fetch_pricing.py,sha256=JkgJPTE0SVj8sdGQvo0HN-Hdv3nfA2tu7C_Arad5aX8,3762
 service_capacity_modeling/tools/generate_missing.py,sha256=uvr9fQanx3bm4KTneH-x7EOQvO7cVV0i9gdQvArPCuY,2947
 service_capacity_modeling/tools/instance_families.py,sha256=e9JWSIdljSmHI8Nb2MI5Ld9JqQ7WdOtPtV7g3oR7ZiU,7764
-service_capacity_modeling-0.3.66.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-service_capacity_modeling-0.3.66.dist-info/METADATA,sha256=xN74RWMASA0EBx63YjFvgBIPjk2Dept2Yr_PngF_ovM,10214
-service_capacity_modeling-0.3.66.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-service_capacity_modeling-0.3.66.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
-service_capacity_modeling-0.3.66.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
-service_capacity_modeling-0.3.66.dist-info/RECORD,,
+service_capacity_modeling-0.3.68.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+service_capacity_modeling-0.3.68.dist-info/METADATA,sha256=6Dp2jy5MMYu0UuOser41xX75P0Nov_6tC65J8l4wHEs,10214
+service_capacity_modeling-0.3.68.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+service_capacity_modeling-0.3.68.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
+service_capacity_modeling-0.3.68.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
+service_capacity_modeling-0.3.68.dist-info/RECORD,,