mirror of
https://github.com/retspen/webvirtcloud
synced 2024-12-24 15:15:22 +00:00
Cleaning libxml2 artifact.convert to lxml and variable name correcition
This commit is contained in:
parent
8b347c1024
commit
8b2451284f
1 changed files with 4 additions and 4 deletions
|
@ -10,9 +10,9 @@ def get_rbd_storage_data(stg):
|
||||||
xml = stg.XMLDesc(0)
|
xml = stg.XMLDesc(0)
|
||||||
ceph_user = util.get_xml_path(xml, "/pool/source/auth/@username")
|
ceph_user = util.get_xml_path(xml, "/pool/source/auth/@username")
|
||||||
|
|
||||||
def get_ceph_hosts(ctx):
|
def get_ceph_hosts(doc):
|
||||||
hosts = []
|
hosts = []
|
||||||
for host in ctx.xpathEval("/pool/source/host"):
|
for host in doc.xpath("/pool/source/host"):
|
||||||
name = host.prop("name")
|
name = host.prop("name")
|
||||||
if name:
|
if name:
|
||||||
hosts.append({'name': name, 'port': host.prop("port")})
|
hosts.append({'name': name, 'port': host.prop("port")})
|
||||||
|
@ -53,7 +53,7 @@ class wvmCreate(wvmConnect):
|
||||||
"""Get guest capabilities"""
|
"""Get guest capabilities"""
|
||||||
return util.get_xml_path(self.get_cap_xml(), "/capabilities/host/cpu/arch")
|
return util.get_xml_path(self.get_cap_xml(), "/capabilities/host/cpu/arch")
|
||||||
|
|
||||||
def create_volume(self, storage, name, size, format=image_format, metadata=False, image_extension=image_extension):
|
def create_volume(self, storage, name, size, image_format=image_format, metadata=False, image_extension=image_extension):
|
||||||
size = int(size) * 1073741824
|
size = int(size) * 1073741824
|
||||||
stg = self.get_storage(storage)
|
stg = self.get_storage(storage)
|
||||||
storage_type = util.get_xml_path(stg.XMLDesc(0), "/pool/@type")
|
storage_type = util.get_xml_path(stg.XMLDesc(0), "/pool/@type")
|
||||||
|
@ -71,7 +71,7 @@ class wvmCreate(wvmConnect):
|
||||||
<target>
|
<target>
|
||||||
<format type='%s'/>
|
<format type='%s'/>
|
||||||
</target>
|
</target>
|
||||||
</volume>""" % (name, size, alloc, format)
|
</volume>""" % (name, size, alloc, image_format)
|
||||||
stg.createXML(xml, metadata)
|
stg.createXML(xml, metadata)
|
||||||
try:
|
try:
|
||||||
stg.refresh(0)
|
stg.refresh(0)
|
||||||
|
|
Loading…
Reference in a new issue