From 34c502560f242f0ea9186f47507507406a4cbb1e Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 30 Sep 2013 16:21:23 -0400 Subject: [PATCH] storage: Drop unused static function This allows us to simplify the parameters for find_free_name --- tests/storage.py | 2 +- virtManager/createinterface.py | 6 ++--- virtManager/createvol.py | 5 ++-- virtManager/uihelpers.py | 6 ++--- virtinst/cli.py | 7 ++---- virtinst/distroinstaller.py | 2 +- virtinst/storage.py | 43 +++++----------------------------- 7 files changed, 17 insertions(+), 54 deletions(-) diff --git a/tests/storage.py b/tests/storage.py index c6a82fecc..7a8f0b0e5 100644 --- a/tests/storage.py +++ b/tests/storage.py @@ -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 diff --git a/virtManager/createinterface.py b/virtManager/createinterface.py index 49b0d87cb..c25990cfe 100644 --- a/virtManager/createinterface.py +++ b/virtManager/createinterface.py @@ -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: diff --git a/virtManager/createvol.py b/virtManager/createvol.py index 0a068ee9a..1cd53f0a5 100644 --- a/virtManager/createvol.py +++ b/virtManager/createvol.py @@ -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") diff --git a/virtManager/uihelpers.py b/virtManager/uihelpers.py index 3a8acd3e5..59d614f8e 100644 --- a/virtManager/uihelpers.py +++ b/virtManager/uihelpers.py @@ -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) diff --git a/virtinst/cli.py b/virtinst/cli.py index f6829e652..2c0775e1c 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -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) diff --git a/virtinst/distroinstaller.py b/virtinst/distroinstaller.py index c4930d33e..d9c997437 100644 --- a/virtinst/distroinstaller.py +++ b/virtinst/distroinstaller.py @@ -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) diff --git a/virtinst/storage.py b/virtinst/storage.py index 5baa9ae0e..fc19af93f 100644 --- a/virtinst/storage.py +++ b/virtinst/storage.py @@ -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)