Merge pull request #16 from brandenm-nag/c398_master

milliams · web-flow · commit e2be197a599a · 2021-01-27T09:17:46.000Z
Add cluster_group identification to AWS and GCP instance type info
diff --git a/citc/aws.py b/citc/aws.py
@@ -102,6 +102,7 @@ def get_types_info(client: EC2Client) -> Dict[str, NodeTypeInfo]:
             ),
             "threads_per_core": d["VCpuInfo"].get("DefaultThreadsPerCore", 1),
             "arch": d["ProcessorInfo"]["SupportedArchitectures"][0],
+            "cluster_group": 'cluster' in d["PlacementGroupInfo"]["SupportedStrategies"]
         }
         for s, d in instances.items()
     }
diff --git a/citc/google.py b/citc/google.py
@@ -106,6 +106,7 @@ def get_types_info(client, nodespace):
             "memory": int(math.pow(mt["memoryMb"], 0.7) * 0.9 + 500),
             "cores_per_socket": mt["guestCpus"],
             "threads_per_core": "1",
+            "cluster_group": mt["name"].startswith("c2-") # only C2 currently support compact placement groups
         }
         for mt in machine_types
     }

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ def get_types_info(client: EC2Client) -> Dict[str, NodeTypeInfo]:`
`102`	`102`	`),`
`103`	`103`	`"threads_per_core": d["VCpuInfo"].get("DefaultThreadsPerCore", 1),`
`104`	`104`	`"arch": d["ProcessorInfo"]["SupportedArchitectures"][0],`
	`105`	`+ "cluster_group": 'cluster' in d["PlacementGroupInfo"]["SupportedStrategies"]`
`105`	`106`	`}`
`106`	`107`	`for s, d in instances.items()`
`107`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ def get_types_info(client, nodespace):`
`106`	`106`	`"memory": int(math.pow(mt["memoryMb"], 0.7) * 0.9 + 500),`
`107`	`107`	`"cores_per_socket": mt["guestCpus"],`
`108`	`108`	`"threads_per_core": "1",`
	`109`	`+ "cluster_group": mt["name"].startswith("c2-") # only C2 currently support compact placement groups`
`109`	`110`	`}`
`110`	`111`	`for mt in machine_types`
`111`	`112`	`}`