projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish sipb_xen_database -> invirt.database in web
[invirt/packages/invirt-web.git]
/
code
/
validation.py
diff --git
a/code/validation.py
b/code/validation.py
index
e69559a
..
817c2cf
100644
(file)
--- a/
code/validation.py
+++ b/
code/validation.py
@@
-4,7
+4,7
@@
import cache_acls
import getafsgroups
import re
import string
import getafsgroups
import re
import string
-from sipb_xen_database import Machine, NIC, Type, Disk, CDROM, Autoinstall
+from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
from webcommon import InvalidInput
MAX_MEMORY_TOTAL = 512
from webcommon import InvalidInput
MAX_MEMORY_TOTAL = 512
@@
-269,7
+269,7
@@
def testName(user, name, machine=None):
return None
if not Machine.select_by(name=name):
if not validMachineName(name):
return None
if not Machine.select_by(name=name):
if not validMachineName(name):
- raise InvalidInput('name', name, 'You must provide a machine name. Max 22 chars, alnum plus \'-\' and \'_\'.')
+ raise InvalidInput('name', name, 'You must provide a machine name. Max 63 chars, alnum plus \'-\', does not begin or end with \'-\'.')
return name
raise InvalidInput('name', name, "Name is already taken.")
return name
raise InvalidInput('name', name, "Name is already taken.")