Skip to content
Merged
Show file tree
Hide file tree
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
16 changes: 12 additions & 4 deletions src/maasserver/models/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -5850,11 +5850,19 @@ def start(
node=self,
status=NODE_STATUS.ALLOCATED,
)
from maasserver.models import ScriptSet
# Ephemeral deployments don't involve deployment scripts.
if not self.ephemeral_deploy:
from maasserver.models import ScriptSet

self.current_deployment_script_set = (
ScriptSet.objects.create_deployment_script_set(self)
)
self.current_deployment_script_set = (
ScriptSet.objects.create_deployment_script_set(self)
)
else:
# A previously aborted standard deployment leaves the node in
# ALLOCATED without clearing current_deployment_script_set.
# Clear it so an ephemeral deployment doesn't point at a stale
# script set.
self.current_deployment_script_set = None
Comment thread
r00ta marked this conversation as resolved.

# Bug #1630361: Make sure that there is a maas_facing_server_address in
# the same address family as our configured interfaces.
Expand Down
38 changes: 38 additions & 0 deletions src/maasserver/models/tests/test_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -9607,6 +9607,44 @@ def test_no_ValidationError_if_ephemeral_deployment_ubuntu(self):
node.start(admin)
self.assertEqual(NODE_STATUS.DEPLOYING, node.status)

def test_ephemeral_deploy_does_not_create_deployment_script_set(self):
load_builtin_scripts()
admin = factory.make_admin()
with transaction.atomic():
factory.make_RegionController()
factory.make_usable_boot_resource(
name="ubuntu/focal",
architecture="amd64/ga-20.04",
rtype=BOOT_RESOURCE_TYPE.SYNCED,
)
node = self.make_acquired_node_with_interface(
admin,
power_type="manual",
with_boot_disk=False,
ephemeral_deploy=True,
architecture="amd64/generic",
)
node.osystem = "ubuntu"
node.distro_series = "focal"
# Simulate a leftover deployment script set from a previously aborted
# standard deployment to verify it gets cleared.
leftover_script_set = factory.make_ScriptSet(
node=node, result_type=RESULT_TYPE.DEPLOYMENT
)
node.current_deployment_script_set = leftover_script_set
Comment thread
r00ta marked this conversation as resolved.
node.start(admin)

self.assertIsNone(node.current_deployment_script_set)
# No new deployment script set is created; only the leftover remains.
self.assertEqual(
[leftover_script_set.id],
list(
ScriptSet.objects.filter(
node=node, result_type=RESULT_TYPE.DEPLOYMENT
).values_list("id", flat=True)
),
)

def test_doesnt_raise_network_validation_when_all_dhcp(self):
admin = factory.make_admin()
node = self.make_acquired_node_with_interface(
Expand Down
Loading