Skip to content

chore: refactor openstack instantiation [DO NOT MERGE WITHOUT CHANGING BASE TO MAIN] #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Aug 13, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def __init__(
super().__init__(message, extra_data)


@dataclass
@dataclass(frozen=True)
class OpenstackInstance:
"""Represents an OpenStack instance.

Expand All @@ -120,26 +120,32 @@ class OpenstackInstance:
status: str
metadata: RunnerMetadata

def __init__(self, server: OpenstackServer, prefix: str):
@classmethod
def from_openstack_server(cls, server: OpenstackServer, prefix: str) -> "OpenstackInstance":
"""Construct the object.

Args:
server: The OpenStack server.
prefix: The name prefix for the servers.

Returns:
The OpenstackInstance.
"""
self.addresses = [
address["addr"]
for network_addresses in server.addresses.values()
for address in network_addresses
]
self.created_at = datetime.strptime(server.created_at, "%Y-%m-%dT%H:%M:%SZ").replace(
tzinfo=timezone.utc
return cls(
addresses=[
address["addr"]
for network_addresses in server.addresses.values()
for address in network_addresses
],
created_at=datetime.strptime(server.created_at, "%Y-%m-%dT%H:%M:%SZ").replace(
tzinfo=timezone.utc
),
instance_id=InstanceID.build_from_name(prefix, server.name),
server_id=server.id,
status=server.status,
# To be backwards compatible, we need a default RunnerMetadata.
metadata=RunnerMetadata(**server.metadata) if server.metadata else RunnerMetadata(),
)
self.instance_id = InstanceID.build_from_name(prefix, server.name)
self.server_id = server.id
self.status = server.status
# To be backwards compatible, we need a default RunnerMetadata.
self.metadata = RunnerMetadata(**server.metadata) if server.metadata else RunnerMetadata()


P = ParamSpec("P")
Expand Down Expand Up @@ -320,7 +326,7 @@ def launch_instance(
)
raise OpenStackError(f"Failed to create openstack server {instance_id}") from err

return OpenstackInstance(server, self.prefix)
return OpenstackInstance.from_openstack_server(server, self.prefix)

@_catch_openstack_errors
def get_instance(self, instance_id: InstanceID) -> OpenstackInstance | None:
Expand All @@ -337,7 +343,7 @@ def get_instance(self, instance_id: InstanceID) -> OpenstackInstance | None:
with self._get_openstack_connection() as conn:
server: OpenstackServer = conn.get_server(name_or_id=instance_id.name)
if server is not None:
return OpenstackInstance(server, self.prefix)
return OpenstackInstance.from_openstack_server(server, self.prefix)
return None

@staticmethod
Expand Down Expand Up @@ -526,7 +532,7 @@ def get_instances(self) -> tuple[OpenstackInstance, ...]:
for name in server_names
]
return tuple(
OpenstackInstance(server, self.prefix)
OpenstackInstance.from_openstack_server(server, self.prefix)
for server in server_list
if server is not None
)
Expand Down
Loading