Skip to content
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
11 changes: 9 additions & 2 deletions server/src/uds/core/services/generics/fixed/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,16 @@ def initialize(self, values: 'types.core.ValuesType') -> None:
if not self.machines.value:
raise exceptions.ui.ValidationError(gettext('We need at least a machine'))

# Remove machines not in values from "assigned" set
# Do not allow removing machines that still have assigned user services.
# (their UserService rows would linger, counting against userservices_limit)
with self._assigned_access() as assigned_vms:
assigned_vms &= set(self.machines.as_list())
removed_assigned = assigned_vms - set(self.machines.as_list())
if removed_assigned:
raise exceptions.ui.ValidationError(
gettext('Cannot remove machines with assigned services: {}').format(
', '.join(sorted(removed_assigned))
)
)
self.token.value = self.token.value.strip()

@contextlib.contextmanager
Expand Down
Loading