projects
/
invirt/packages/invirt-database.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1) reworking of lvm stuff into a single python script rather than a pile of shell...
[invirt/packages/invirt-database.git]
/
client
/
etc
/
xen
/
sipb-database
diff --git
a/client/etc/xen/sipb-database
b/client/etc/xen/sipb-database
index
451762d
..
54c1b74
100644
(file)
--- a/
client/etc/xen/sipb-database
+++ b/
client/etc/xen/sipb-database
@@
-2,16
+2,17
@@
import sipb_xen_database.models as models
from sipb_xen_database import connect
import re
import sipb_xen_database.models as models
from sipb_xen_database import connect
import re
-import sys
connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+prefix = "d_"
# 'machine_name', and optionally 'cdrom_image', should get passed in
# from the xm create call
def check(b):
if not b:
# 'machine_name', and optionally 'cdrom_image', should get passed in
# from the xm create call
def check(b):
if not b:
- exit(1)
+ import sys
+ sys.exit(1)
machine = models.Machine.get_by(name=machine_name)
check(machine is not None)
machine = models.Machine.get_by(name=machine_name)
check(machine is not None)
@@
-20,7
+21,7
@@
machine_type = models.Type.get_by(type_id=machine.type_id)
memory = machine.memory
maxmem = memory
check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
memory = machine.memory
maxmem = memory
check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
-name = machine.name
+name = prefix + machine.name
check(re.match('^[0-9a-f-]+$', machine.uuid))
uuid = machine.uuid
check(re.match('^[0-9a-f-]+$', machine.uuid))
uuid = machine.uuid
@@
-58,7
+59,7
@@
disk = []
for d in machine.disks:
check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
for d in machine.disks:
check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
- device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name
+ device = '/dev/xenvg/' + prefix + machine.name + '_' + d.guest_device_name
dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
disk.append(dspec)
dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
disk.append(dspec)