allow existing tests to work with updated model, including C instance and 1.15xIPC for m6i

Author: jasonk000

tests/netflix/test_cassandra.py

@@ -61,7 +61,7 @@ def test_capacity_small_fast():
         )[0]
         small_result = cap_plan.candidate_clusters.zonal[0]
         # We really should just pay for CPU here
-        assert small_result.instance.name.startswith("m")
+        assert small_result.instance.name.startswith("c")
 
         cores = small_result.count * small_result.instance.cpu
         assert 30 <= cores <= 80
@@ -158,7 +158,7 @@ def test_capacity_high_writes():
         extra_model_arguments={"copies_per_region": 2},
     )[0]
     high_writes_result = cap_plan.candidate_clusters.zonal[0]
-    assert high_writes_result.instance.family.startswith("m")
+    assert high_writes_result.instance.family.startswith("c")
     assert high_writes_result.count > 4
 
     num_cpus = high_writes_result.instance.cpu * high_writes_result.count

tests/netflix/test_cassandra_uncertain.py

@@ -108,7 +108,7 @@ def test_increasing_qps_simple():
         )
 
     # We should generally want cheap CPUs
-    assert all(r[0][0] in ("r", "m", "i") for r in result)
+    assert all(r[0][0] in ("r", "m", "i", "c") for r in result)
 
     # Should have more capacity as requirement increases
     x = [r[1] for r in result]
@@ -209,9 +209,7 @@ def test_worn_dataset_ebs():
         <= lr.candidate_clusters.annual_costs["cassandra.zonal-clusters"]
         < 1_000_000
     )
-    assert lr_cluster.instance.name.startswith(
-        "m5."
-    ) or lr_cluster.instance.name.startswith("r5.")
+    assert lr_cluster.instance.family in ("m5", "r5", "r6a")
     assert lr_cluster.attached_drives[0].name == "gp3"
     # gp2 should not provision massive drives, prefer to upcolor
     assert lr_cluster.attached_drives[0].size_gib < 9000

tests/netflix/test_counter.py

@@ -69,7 +69,7 @@ def test_counter_increasing_qps_simple():
     # We should generally want cheap CPUs for Cassandra
     zonal_families = {r[0] for r in zonal_result}
     assert all(
-        family[0] in ("r", "m", "i") for family in zonal_families
+        family[0] in ("r", "m", "c") for family in zonal_families
     ), f"{zonal_families}"
 
     # We just want ram and cpus for a java app

tests/netflix/test_crdb.py

@@ -33,7 +33,7 @@ def test_crdb_basic():
     lr_cluster = lr.candidate_clusters.zonal[0]
 
     # Resulting cluster should not be too expensive
-    assert 2000 < lr.candidate_clusters.total_annual_cost < 10_000
+    assert 1900 < lr.candidate_clusters.total_annual_cost < 10_000
 
     # Should have enough disk space for around 80GiB of data in a single
     # replica (compression). Also that drive should be ephemeral

tests/netflix/test_elasticsearch.py

@@ -40,7 +40,7 @@ def test_es_increasing_qps_simple():
         for zonal in cap_plan.least_regret[0].candidate_clusters.zonal:
             zonal_result[zonal.cluster_type].append(zonal_summary(zonal))
 
-    expected_families = {"r", "m", "i"}
+    expected_families = {"r", "m", "c", "i"}
     for cluster_type in list(zonal_result.keys()):
         zonal_by_increasing_qps = zonal_result[cluster_type]
 

tests/netflix/test_evcache.py

@@ -68,8 +68,10 @@ def test_evcache_inmemory_low_latency_reads_cpu():
             * candidate.candidate_clusters.zonal[0].instance.cpu_ghz
         )
 
-        assert total_cpu_power > 1100
-
+        assert total_cpu_power > 1000, (f"CPU power is not sufficient for low latency reads, with"
+                                        f" {candidate.candidate_clusters.zonal[0].count} *"
+                                        f" {candidate.candidate_clusters.zonal[0].instance.name},"
+                                        f" total= {total_cpu_power}.")
 
 class BufferComponents:
     pass

tests/netflix/test_java_app.py

@@ -65,7 +65,7 @@ def test_java_app_small_but_high_qps():
     cores = java_result.count * java_result.instance.cpu
     assert_similar_compute(
         expected_shape=shape("m6i.xlarge"),
-        expected_count=50,
+        expected_count=43,
         actual_shape=java_result.instance,
         actual_count=java_result.count,
         # Don't care about memory