diff --git a/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py b/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py index cafaad8d4..eae13b3d6 100644 --- a/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py +++ b/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py @@ -159,9 +159,10 @@ def _process_physical_hosts(self, workspace): "w+", ) as f: if len(level0_groups) > 0: - f.write(f"Level 0 groups = {len(level0_groups)}\n") - f.write(f"Level 1 groups = {len(level1_groups)}\n") - f.write(f"Level 2 groups = {len(level2_groups)}\n") + # The group level name comes from https://cloud.google.com/compute/docs/instances/use-compact-placement-policies#verify-vm-location. + f.write(f"Level 0 groups (cluster) = {len(level0_groups)}\n") + f.write(f"Level 1 groups (rack) = {len(level1_groups)}\n") + f.write(f"Level 2 groups (host) = {len(level2_groups)}\n") f.write(f'All hosts = {",".join(all_hosts)}\n') def _prepare_analysis(self, workspace): @@ -205,8 +206,8 @@ def _prepare_analysis(self, workspace): ) figure_of_merit( - "Level {level_num} Groups", - fom_regex="Level (?P[0-9]) groups = (?P[0-9]+)", + "Level {level_num} Groups ({level_name})", + fom_regex=r"Level (?P[0-9]) groups \((?P[\w]+)\) = (?P[0-9]+)", log_file="{experiment_run_dir}/gcp-metadata.topology_summary.log", group_name="num_groups", units="",