X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/blobdiff_plain/f0eb3ae48da89a4970a0ed5836797e1a926d1d1c..d2146877b1b2ff7830351ffaf3f4a6ae70a98b66:/invirt-database?ds=sidebyside diff --git a/invirt-database b/invirt-database index e4eed03..6008c7a 100644 --- a/invirt-database +++ b/invirt-database @@ -14,18 +14,18 @@ def check(b): import sys sys.exit(1) -machine = models.Machine.query().filter_by(name=machine_name).one() +machine = models.Machine.query.filter_by(name=machine_name).one() check(machine is not None) machine_type = machine.type cdrom = None if 'cdrom_image' in locals(): - cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one() + cdrom = models.CDROM.query.filter_by(cdrom_id=cdrom_image).one() check(cdrom is not None) memory = machine.memory maxmem = '2048' check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name)) -name = prefix + machine.name +name = prefix + machine_name check(re.match('^[0-9a-f-]+$', machine.uuid)) uuid = machine.uuid