mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-09-15 14:31:18 +03:00
Merge pull request #2696 from yueguobin/fix/rfc1123-error-message
fix: improve hostname validation error messages with allowed characters
This commit is contained in:
commit
b87ab8f86f
@ -188,7 +188,7 @@ class DockerVM(BaseNode):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if not is_rfc1123_hostname_valid(new_name):
|
if not is_rfc1123_hostname_valid(new_name):
|
||||||
raise DockerError(f"'{new_name}' is an invalid name to rename Docker container '{self._name}'")
|
raise DockerError(f"'{new_name}' is an invalid name to rename Docker container '{self._name}'. Allowed characters: letters (a-z, A-Z), digits (0-9), and hyphens (-). The name cannot start or end with a hyphen.")
|
||||||
super(DockerVM, DockerVM).name.__set__(self, new_name)
|
super(DockerVM, DockerVM).name.__set__(self, new_name)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
@ -1682,7 +1682,7 @@ class Router(BaseNode):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if not is_ios_hostname_valid(new_name):
|
if not is_ios_hostname_valid(new_name):
|
||||||
raise DynamipsError(f"{new_name} is an invalid name to rename router '{self._name}'")
|
raise DynamipsError(f"{new_name} is an invalid name to rename router '{self._name}'. Allowed characters: letters (a-z, A-Z), digits (0-9), and hyphens (-). The name must start with a letter, end with a letter or digit, and be 63 characters or fewer.")
|
||||||
|
|
||||||
await self._hypervisor.send(f'vm rename "{self._name}" "{new_name}"')
|
await self._hypervisor.send(f'vm rename "{self._name}" "{new_name}"')
|
||||||
|
|
||||||
|
|||||||
@ -367,7 +367,7 @@ class IOUVM(BaseNode):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if not is_ios_hostname_valid(new_name):
|
if not is_ios_hostname_valid(new_name):
|
||||||
raise IOUError(f"'{new_name}' is an invalid name to rename IOU node '{self._name}'")
|
raise IOUError(f"'{new_name}' is an invalid name to rename IOU node '{self._name}'. Allowed characters: letters (a-z, A-Z), digits (0-9), and hyphens (-). The name must start with a letter, end with a letter or digit, and be 63 characters or fewer.")
|
||||||
if self.startup_config_file:
|
if self.startup_config_file:
|
||||||
content = self.startup_config_content
|
content = self.startup_config_content
|
||||||
content = re.sub(r"hostname .+$", "hostname " + new_name, content, flags=re.MULTILINE)
|
content = re.sub(r"hostname .+$", "hostname " + new_name, content, flags=re.MULTILINE)
|
||||||
|
|||||||
@ -197,7 +197,7 @@ class QemuVM(BaseNode):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if not is_rfc1123_hostname_valid(new_name):
|
if not is_rfc1123_hostname_valid(new_name):
|
||||||
raise QemuError(f"'{new_name}' is an invalid name to rename Qemu node '{self._name}'")
|
raise QemuError(f"'{new_name}' is an invalid name to rename Qemu node '{self._name}'. Allowed characters: letters (a-z, A-Z), digits (0-9), and hyphens (-). The name cannot start or end with a hyphen.")
|
||||||
super(QemuVM, QemuVM).name.__set__(self, new_name)
|
super(QemuVM, QemuVM).name.__set__(self, new_name)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user