j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-24 23:25:24 +00:00
Code Issues Projects Releases Wiki Activity

Storage.py upper constant variable names. make mode and suffix variables a parameter

Browse source
This commit is contained in:
catborise 2019-12-19 12:03:25 +03:00
parent 28ea64cd16
commit ff96ce6648
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vrtManager/storage.py
View file

@ -1,6 +1,6 @@
from vrtManager import util from vrtManager import util
from vrtManager.connection import wvmConnect from vrtManager.connection import wvmConnect
from webvirtcloud.settings import INSTANCE_VOLUME_DEFAULT_OWNER as owner from webvirtcloud.settings import INSTANCE_VOLUME_DEFAULT_OWNER as OWNER
class wvmStorages(wvmConnect): class wvmStorages(wvmConnect):
@ -49,6 +49,8 @@ class wvmStorages(wvmConnect):
stg.create(0) stg.create(0)
stg.setAutostart(1) stg.setAutostart(1)
return stg
def create_storage_ceph(self, stg_type, name, ceph_pool, ceph_host, ceph_user, secret): def create_storage_ceph(self, stg_type, name, ceph_pool, ceph_host, ceph_user, secret):
xml = """ xml = """
<pool type='%s'> <pool type='%s'>
@ -84,6 +86,8 @@ class wvmStorages(wvmConnect):
stg.create(0) stg.create(0)
stg.setAutostart(1) stg.setAutostart(1)
return stg
class wvmStorage(wvmConnect): class wvmStorage(wvmConnect):
def __init__(self, host, login, passwd, conn, pool): def __init__(self, host, login, passwd, conn, pool):
@ -206,7 +210,7 @@ class wvmStorage(wvmConnect):
) )
return vol_list return vol_list
def create_volume(self, name, size, vol_fmt='qcow2', metadata=False, owner=owner): def create_volume(self, name, size, vol_fmt='qcow2', metadata=False, owner=OWNER):
size = int(size) * 1073741824 size = int(size) * 1073741824
storage_type = self.get_type() storage_type = self.get_type()
alloc = size alloc = size
@ -243,17 +247,18 @@ class wvmStorage(wvmConnect):
self._createXML(xml, metadata) self._createXML(xml, metadata)
return name return name
def clone_volume(self, name, target_file, vol_fmt=None, metadata=False, owner=owner): def clone_volume(self, name, target_file, vol_fmt=None, metadata=False, mode='0644', file_suffix='img', owner=OWNER):
vol = self.get_volume(name) vol = self.get_volume(name)
if not vol_fmt: if not vol_fmt:
vol_fmt = self.get_volume_type(name) vol_fmt = self.get_volume_type(name)
storage_type = self.get_type() storage_type = self.get_type()
if storage_type == 'dir': if storage_type == 'dir':
if vol_fmt in ('qcow', 'qcow2'): if vol_fmt in ['qcow', 'qcow2']:
target_file += '.' + vol_fmt target_file += '.' + vol_fmt
else: else:
target_file += '.img' suffix = '.' + file_suffix
target_file += suffix if len(suffix) > 1 else ''
xml = """ xml = """
<volume> <volume>
@ -265,9 +270,9 @@ class wvmStorage(wvmConnect):
<permissions> <permissions>
<owner>%s</owner> <owner>%s</owner>
<group>%s</group> <group>%s</group>
<mode>0644</mode> <mode>%s</mode>
<label>virt_image_t</label> <label>virt_image_t</label>
</permissions>""" % (target_file, vol_fmt, owner['uid'], owner['guid']) </permissions>""" % (target_file, vol_fmt, owner['uid'], owner['guid'], mode)
if vol_fmt == 'qcow2': if vol_fmt == 'qcow2':
xml += """ xml += """
<compat>1.1</compat> <compat>1.1</compat>