Rename the Devices type to Builder, to let Device be what EM considers a Device
Graham Christensen committed
Jun 3, 2022 at 10:27 UTC
b2840fe53ce1432ee5574d1d6ca0f96f1d31edf3
1 file changed
+14
-14
hydra-packet-importer/import.py
+14
-14
@@ -23,7 +23,7 @@ class RemoteBuilder(TypedDict):
23
ssh_key: str
24
25
26
-class Device(TypedDict):
26
+class Builder(TypedDict):
27
hostname: str
28
address: str
29
type: str
@@ -40,8 +40,8 @@ def debug(*args: Any, **kwargs: Any) -> None:
40
print(*args, file=sys.stderr, **kwargs)
41
42
43
-def get_devices(manager: Any) -> List[Device]:
44
- devices: List[Device] = []
43
+def get_builders(manager: Any) -> List[Builder]:
44
+ builders: List[Builder] = []
45
46
page: Optional[str] = "projects/{}/devices?page={}".format(config["project_id"], 1)
47
while page is not None:
@@ -66,7 +66,7 @@ def get_devices(manager: Any) -> List[Device]:
66
if remote_builder_info is None:
67
continue
68
69
- devices.append(
69
+ builders.append(
70
{
71
"hostname": device["hostname"],
72
"address": "{}.packethost.net".format(device["short_id"]),
@@ -75,7 +75,7 @@ def get_devices(manager: Any) -> List[Device]:
75
}
76
)
77
78
- return devices
78
+ return builders
79
80
81
def get_remote_builder_info(manager, device_id: str) -> Union[RemoteBuilder, str, None]:
@@ -138,25 +138,25 @@ def main(config: Dict[str, Any]) -> None:
138
rows = []
139
manager = packet.Manager(auth_token=config["token"])
140
found = 0
141
- for device in get_devices(manager):
141
+ for builder in get_builders(manager):
142
found += 1
143
- debug("# {} ({})".format(device["hostname"], device["address"]))
144
- if device["type"] not in config["plans"]:
143
+ debug("# {} ({})".format(builder["hostname"], builder["address"]))
144
+ if builder["type"] not in config["plans"]:
145
debug(
146
"# Skipping {} (type {}) as it has no configured plan".format(
147
- device["hostname"], device["type"]
147
+ builder["hostname"], builder["type"]
148
)
149
)
150
continue
151
152
- builder_info = device["remote_builder_info"]
153
- default_stats = config["plans"][device["type"]]
154
- if device["hostname"] in config["name_overrides"]:
155
- specific_stats = config["name_overrides"][device["hostname"]]
152
+ builder_info = builder["remote_builder_info"]
153
+ default_stats = config["plans"][builder["type"]]
154
+ if builder["hostname"] in config["name_overrides"]:
155
+ specific_stats = config["name_overrides"][builder["hostname"]]
156
else:
157
specific_stats = {}
158
lookup = lambda key: specific_stats.get(
159
- key, device.get(key, default_stats.get(key))
159
+ key, builder.get(key, default_stats.get(key))
160
)
161
162
lookup_default = (