convert instance names to lowercase
ci/woodpecker/pr/woodpecker Pipeline failed
Details
ci/woodpecker/pr/woodpecker Pipeline failed
Details
Fixes: https://gitea.gna.org/Hostea/dashboard/issues/69 Signed-off-by: Loïc Dachary <loic@dachary.org>
parent
0f1003dbe8
commit
f30a609eed
|
@ -198,11 +198,21 @@ class CreateInstance(TestCase):
|
|||
register_util(t=self, username="createinstance_user")
|
||||
create_configurations(t=self)
|
||||
|
||||
|
||||
def test_sanitize_vm_name(self):
|
||||
self.assertEqual(sanitize_vm_name(vm_name="LOWERname"), "lowername")
|
||||
|
||||
with self.assertRaises(VmException):
|
||||
sanitize_vm_name(vm_name="12345452131324234234234234")
|
||||
|
||||
with self.assertRaises(VmException):
|
||||
sanitize_vm_name(vm_name="122342$#34234")
|
||||
|
||||
|
||||
@override_settings(
|
||||
HOSTEA=infra_custom_config(test_name="test_create_instance_util")
|
||||
)
|
||||
def test_create_instance_util(self):
|
||||
vm_name = "test_create_instance_renders"
|
||||
configuration = self.instance_config[0].name
|
||||
|
||||
with self.assertRaises(VmException):
|
||||
|
@ -212,13 +222,6 @@ class CreateInstance(TestCase):
|
|||
user=self.user,
|
||||
)
|
||||
|
||||
with self.assertRaises(VmException):
|
||||
create_instance(
|
||||
vm_name="122342$#34234",
|
||||
configuration_name=configuration,
|
||||
user=self.user,
|
||||
)
|
||||
|
||||
@override_settings(
|
||||
HOSTEA=infra_custom_config(test_name="test_create_instance_renders")
|
||||
)
|
||||
|
|
|
@ -43,11 +43,13 @@ class VmException(Exception):
|
|||
return self.error
|
||||
|
||||
|
||||
def create_instance(vm_name: str, configuration_name: str, user: User) -> Instance:
|
||||
def sanitize_vm_name(vm_name: str) -> str:
|
||||
"""
|
||||
Create instance view
|
||||
Sanity checks and normalization of the vm name
|
||||
"""
|
||||
|
||||
vm_name = vm_name.lower()
|
||||
|
||||
if len(vm_name) > 20:
|
||||
raise VmException(code=VmErrors.NAME_TOO_LONG)
|
||||
if not str.isalnum(vm_name):
|
||||
|
@ -56,6 +58,16 @@ def create_instance(vm_name: str, configuration_name: str, user: User) -> Instan
|
|||
if Instance.objects.filter(name=vm_name).exists():
|
||||
raise VmException(code=VmErrors.NAME_EXISTS)
|
||||
|
||||
return vm_name
|
||||
|
||||
|
||||
def create_instance(vm_name: str, configuration_name: str, user: User) -> Instance:
|
||||
"""
|
||||
Create instance view
|
||||
"""
|
||||
|
||||
vm_name = sanitize_vm_name(vm_name)
|
||||
|
||||
if not InstanceConfiguration.objects.filter(name=configuration_name).exists():
|
||||
raise VmException(code=VmErrors.NO_CONFIG)
|
||||
|
||||
|
|
Loading…
Reference in New Issue