tdm
/
vmm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not require macaddr, vncpass, uuid to be in VM dict 

Also cleanup and fix a few things.
This commit is contained in:
Tom Marshall 2021-05-13 13:16:43 -07:00
parent f3a2fdf8d7
commit 19a25fb269
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vmmd
View File

@ -795,7 +795,7 @@ class VirtualMachine(DbObject):
def __init__(self, row): def __init__(self, row):
DbObject.__init__(self, row) DbObject.__init__(self, row)
self._lock = threading.Lock() self._lock = threading.Lock()
if self['macaddr'] is None: if self.get('macaddr', None) is None:
found = False found = False
while not found: while not found:
b4 = int(random.random() * 256) b4 = int(random.random() * 256)
@ -807,9 +807,9 @@ class VirtualMachine(DbObject):
if not row: if not row:
found = True found = True
self['macaddr'] = macaddr self['macaddr'] = macaddr
if self['vncpass'] is None: if self.get('vncpass', None) is None:
self['vncpass'] = pwgen(8) self['vncpass'] = pwgen(8)
if self['uuid'] is None: if self.get('uuid', None) is None:
f1 = "%08x" % (int(random.random() * (1 << 32))) f1 = "%08x" % (int(random.random() * (1 << 32)))
f2 = "%04x" % (int(random.random() * (1 << 16))) f2 = "%04x" % (int(random.random() * (1 << 16)))
f3 = "%04x" % (int(random.random() * (1 << 16))) f3 = "%04x" % (int(random.random() * (1 << 16)))
@ -836,7 +836,7 @@ class VirtualMachine(DbObject):
cmd_run(argv) cmd_run(argv)
return VirtualMachine({'name': name, 'owner': owner['name'], return VirtualMachine({'name': name, 'owner': owner['name'],
'arch': arch, 'cpus': cpus, 'mem': mem, 'arch': arch, 'cpus': cpus, 'mem': mem,
'diskpath': diskpath, 'macaddr': None, 'vncpass': None}) 'diskpath': diskpath})
@staticmethod @staticmethod
def create_from_image(name, owner, arch, cpus, mem, image_id): def create_from_image(name, owner, arch, cpus, mem, image_id):
@ -853,14 +853,12 @@ class VirtualMachine(DbObject):
acp_queue(img['pathname'], diskpath) acp_queue(img['pathname'], diskpath)
return VirtualMachine({'name': name, 'owner': owner['name'], return VirtualMachine({'name': name, 'owner': owner['name'],
'arch': arch, 'cpus': cpus, 'mem': mem, 'arch': arch, 'cpus': cpus, 'mem': mem,
'vncpass': None, 'macaddr': None,
'diskpath': diskpath}) 'diskpath': diskpath})
@staticmethod @staticmethod
def create_from_local(name, owner, arch, cpus, mem, pathname): def create_from_local(name, owner, arch, cpus, mem, pathname):
return VirtualMachine({'name': name, 'owner': owner['name'], return VirtualMachine({'name': name, 'owner': owner['name'],
'arch': arch, 'cpus': cpus, 'mem': mem, 'arch': arch, 'cpus': cpus, 'mem': mem,
'vncpass': None, 'macaddr': None,
'diskpath': pathname}) 'diskpath': pathname})
@staticmethod @staticmethod
@ -880,7 +878,7 @@ class VirtualMachine(DbObject):
diskpath = VirtualMachine.pathname_for_disk(owner.name(), name, ext) diskpath = VirtualMachine.pathname_for_disk(owner.name(), name, ext)
if os.path.exists(diskpath): if os.path.exists(diskpath):
raise RuntimeError("Disk already exists") raise RuntimeError("Disk already exists")
vm = VirtualMachine(None, name, owner, arch, cpus, mem, None, None, diskpath) vm = VirtualMachine.create_from_local(name, owner, arch, cpus, mem, diskpath)
acp_queue(image_url, diskpath) acp_queue(image_url, diskpath)
return vm return vm