NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Drop unused static function

Browse Source 
This allows us to simplify the parameters for find_free_name
This commit is contained in:
Cole Robinson 2013-09-30 16:21:23 -04:00
parent 01577d3d88
commit 34c502560f
7 changed files with 17 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/storage.py
View File

@ -47,7 +47,7 @@ def _findFreePoolName(conn, namebase):
while True:
poolname = namebase + "-%d" % i
try:
StorageVolume.lookup_pool_by_name(conn=conn, pool_name=poolname)
conn.storagePoolLookupByName(poolname)
i += 1
except:
return poolname

6
virtManager/createinterface.py
View File

@ -549,11 +549,9 @@ class vmmCreateInterface(vmmGObjectUI):
name = _("No interface selected")
if itype == Interface.INTERFACE_TYPE_BRIDGE:
name = Interface.find_free_name(self.conn.get_backend(),
"br")
name = Interface.find_free_name(self.conn.get_backend(), "br")
elif itype == Interface.INTERFACE_TYPE_BOND:
name = Interface.find_free_name(self.conn.get_backend(),
"bond")
name = Interface.find_free_name(self.conn.get_backend(), "bond")
else:
ifaces = self.get_config_selected_interfaces()
if len(ifaces) > 0:

5
virtManager/createvol.py
View File

@ -104,9 +104,8 @@ class vmmCreateVolume(vmmGObjectUI):
suffix = self.default_suffix()
ret = ""
try:
ret = StorageVolume.find_free_name(self.name_hint,
pool_object=self.parent_pool.get_backend(),
suffix=suffix)
ret = StorageVolume.find_free_name(
self.parent_pool.get_backend(), self.name_hint, suffix=suffix)
except:
logging.exception("Error finding a default vol name")

6
virtManager/uihelpers.py
View File

@ -1174,9 +1174,9 @@ def get_default_path(conn, name, collidelist=None):
if c and os.path.dirname(c) == pool.get_target_path():
newcollidelist.append(os.path.basename(c))
path = virtinst.StorageVolume.find_free_name(name,
pool_object=pool.get_backend(), suffix=suffix,
collidelist=newcollidelist)
path = virtinst.StorageVolume.find_free_name(
pool.get_backend(), name,
suffix=suffix, collidelist=newcollidelist)
path = os.path.join(target, path)

7
virtinst/cli.py
View File

@ -1354,11 +1354,8 @@ def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse):
poolobj = guest.conn.storagePoolLookupByName(pool)
vname = virtinst.StorageVolume.find_free_name(conn=guest.conn,
pool_object=poolobj,
name=guest.name,
suffix=".img",
start_num=_disk_counter.next())
vname = virtinst.StorageVolume.find_free_name(
poolobj, guest.name, suffix=".img", start_num=_disk_counter.next())
volinst = virtinst.VirtualDisk.build_vol_install(
guest.conn, vname, poolobj, size, sparse)

2
virtinst/distroinstaller.py
View File

@ -109,7 +109,7 @@ def _upload_file(conn, meter, destpool, src):
xmlobj = StoragePool(conn, parsexml=destpool.XMLDesc(0))
poolpath = xmlobj.target_path
name = StorageVolume.find_free_name(basename, pool_object=destpool)
name = StorageVolume.find_free_name(destpool, basename)
if name != basename:
logging.debug("Generated non-colliding volume name %s", name)

43
virtinst/storage.py
View File

@ -461,11 +461,11 @@ class StorageVolume(_StorageObject):
Base class for building and installing libvirt storage volume xml
"""
@staticmethod
def find_free_name(name, pool_object=None, pool_name=None, conn=None,
def find_free_name(pool_object, basename,
suffix="", collidelist=None, start_num=0):
"""
Finds a name similar (or equal) to passed 'name' that is not in use
by another pool
Finds a name similar (or equal) to passed 'basename' that is not
in use by another pool
This function scans the list of existing Volumes on the passed or
looked up pool object for a collision with the passed name. If the
@ -482,42 +482,11 @@ class StorageVolume(_StorageObject):
@rtype: C{str}
"""
collidelist = collidelist or []
pool_object = StorageVolume.lookup_pool_by_name(
pool_object=pool_object,
pool_name=pool_name,
conn=conn)
pool_object.refresh(0)
return util.generate_name(name, pool_object.storageVolLookupByName,
suffix, collidelist=collidelist,
start_num=start_num)
@staticmethod
def lookup_pool_by_name(pool_object=None, pool_name=None, conn=None):
"""
Returns pool object determined from passed parameters.
Largely a convenience function for the other static functions.
"""
if pool_object is None and pool_name is None:
raise ValueError(_("Must specify pool_object or pool_name"))
if pool_name is not None and pool_object is None:
if conn is None:
raise ValueError(_("'conn' must be specified with 'pool_name'"))
if not conn.check_conn_support(conn.SUPPORT_CONN_STORAGE):
raise ValueError(_("Connection does not support storage "
"management."))
try:
pool_object = conn.storagePoolLookupByName(pool_name)
except Exception, e:
raise ValueError(_("Couldn't find storage pool '%s': %s" %
(pool_name, str(e))))
if not isinstance(pool_object, libvirt.virStoragePool):
raise ValueError(_("pool_object must be a virStoragePool"))
return pool_object
return util.generate_name(basename, pool_object.storageVolLookupByName,
suffix, collidelist=collidelist,
start_num=start_num)
TYPE_FILE = getattr(libvirt, "VIR_STORAGE_VOL_FILE", 0)
TYPE_BLOCK = getattr(libvirt, "VIR_STORAGE_VOL_BLOCK", 1)