Change in vdsm[master]: cleanup: drop several unused local variables

Thursday, 24 October 2013

Antoni Segura Puimedon has uploaded a new change for review.

Change subject: cleanup: drop several unused local variables
......................................................................

cleanup: drop several unused local variables

Change-Id: Ib81c292f900154819e8852c21ae389c323034999
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
---
M client/vdsClient.py
M lib/vdsm/netinfo.py
M lib/yajsonrpc/protonReactor.py
M tests/functional/networkTests.py
M tests/functional/virtTests.py
M tests/hookValidation.py
M tests/hooksTests.py
M tests/jsonRpcTests.py
M tests/miscTests.py
M tests/testValidation.py
M tests/vmTests.py
M vds_bootstrap/setup
M vds_bootstrap/vds_bootstrap.py
M vds_bootstrap/vds_bootstrap_complete.py
M vdsm/storage/hsm.py
M vdsm/storage/iscsi.py
M vdsm/storage/misc.py
M vdsm/storage/remoteFileHandler.py
M vdsm/storage/resourceManager.py
M vdsm/storage/sp.py
M vdsm/storage/task.py
M vdsm/vm.py
M vdsm_api/Bridge.py
M vdsm_api/process-schema.py
M vdsm_api/vdsmapi.py
25 files changed, 23 insertions(+), 49 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/20535/1

diff --git a/client/vdsClient.py b/client/vdsClient.py
index 37dd7cb..4c09546 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -842,7 +842,6 @@
         masterDom = args[3]
         domList = args[4].split(",")
         mVer = int(args[5])
-        pool = None
         if len(args) > 6:
             pool = self.s.createStoragePool(poolType, spUUID,
                                             poolName, masterDom,
diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index e8f2b8d..cf70089 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -93,8 +93,6 @@
     The list of nics is built by filtering out nics defined
     as hidden, fake or hidden bonds (with related nics'slaves).
     """
-    res = []
-
     def isHiddenNic(device):
         """
         Returns boolean given the device name stating
@@ -397,7 +395,7 @@
     "Convert an integer to the corresponding ip address in the dot-notation"
     ip_address = []
 
-    for i in xrange(4):
+    for _ in xrange(4):
         ip_num, ip_val = divmod(ip_num, 256)
         ip_address.append(str(ip_val))
 
diff --git a/lib/yajsonrpc/protonReactor.py b/lib/yajsonrpc/protonReactor.py
index 557600c..7892e3c 100644
--- a/lib/yajsonrpc/protonReactor.py
+++ b/lib/yajsonrpc/protonReactor.py
@@ -376,7 +376,6 @@
                 proton.pn_link_advance(link)
 
     def createListener(self, address, acceptHandler):
-        host, port = address
         return self._scheduleOp(True, self._createListener, address,
                                 acceptHandler)
 
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index a9149be..ba93343 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -377,7 +377,7 @@
                      for index in range(VLAN_COUNT)]
         with dummyIf(1) as nics:
             firstVlan, firstVlanId = NET_VLANS[0]
-            status, msg = self.vdsm_net.addNetwork(firstVlan, vlan=firstVlanId,
+            _ = self.vdsm_net.addNetwork(firstVlan, vlan=firstVlanId,
                                                    bond=BONDING_NAME,
                                                    nics=nics, opts=opts)
             with nonChangingOperstate(BONDING_NAME):
diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py
index cdb695a..85781f7 100644
--- a/tests/functional/virtTests.py
+++ b/tests/functional/virtTests.py
@@ -83,7 +83,7 @@
 def _genInitramfs():
     fd, path = tempfile.mkstemp()
     cmd = [_mkinitrd.cmd, "-f", path, _kernelVer]
-    rc, out, err = execCmd(cmd, sudo=False)
+    _ = execCmd(cmd, sudo=False)
     os.chmod(path, 0o644)
     return path
 
diff --git a/tests/hookValidation.py b/tests/hookValidation.py
index 80e7239..208ed35 100644
--- a/tests/hookValidation.py
+++ b/tests/hookValidation.py
@@ -67,8 +67,6 @@
 
             cookie_file = _createHookScript(hook_path, hook_name, hook_script)
 
-            output = None
-
             try:
                 kwargs['hook_cookiefile'] = cookie_file
                 output = test_function(*args, **kwargs)
diff --git a/tests/hooksTests.py b/tests/hooksTests.py
index 1018a4e..ddb3530 100644
--- a/tests/hooksTests.py
+++ b/tests/hooksTests.py
@@ -42,7 +42,7 @@
 echo -n %s >> "$_hook_domxml"
         """
         scripts = [tempfile.NamedTemporaryFile(dir=dirName, delete=False)
-                   for n in xrange(Q)]
+                   for _ in xrange(Q)]
         scripts.sort(key=lambda f: f.name)
         for n, script in enumerate(scripts):
             script.write(code % n)
diff --git a/tests/jsonRpcTests.py b/tests/jsonRpcTests.py
index a7b565f..00025ae 100644
--- a/tests/jsonRpcTests.py
+++ b/tests/jsonRpcTests.py
@@ -85,7 +85,7 @@
         def serve(reactor):
             try:
                 reactor.process_requests()
-            except socket.error as e:
+            except socket.error:
                 pass
             except Exception as e:
                 self.log.error("Reactor died unexpectedly", exc_info=True)
diff --git a/tests/miscTests.py b/tests/miscTests.py
index c836e55..1a9a16c 100644
--- a/tests/miscTests.py
+++ b/tests/miscTests.py
@@ -432,7 +432,7 @@
         os.chmod(dstPath, 0o666)
 
         #Copy
-        rc, out, err = misc.ddWatchCopy(srcPath, dstPath, None, len(data))
+        _ = misc.ddWatchCopy(srcPath, dstPath, None, len(data))
 
         #Get copied data
         readData = open(dstPath).read()
@@ -448,7 +448,7 @@
         fd, path = tempfile.mkstemp()
 
         try:
-            for i in xrange(repetitions):
+            for _ in xrange(repetitions):
                 os.write(fd, data)
             self.assertEquals(os.stat(path).st_size, misc.MEGA)
         except:
@@ -474,7 +474,7 @@
             self.assertEquals(os.stat(path).st_size, misc.MEGA * 2)
 
             with open(path, "r") as f:
-                for i in xrange(repetitions):
+                for _ in xrange(repetitions):
                     self.assertEquals(f.read(len(data)), data)
         finally:
             os.unlink(path)
@@ -501,7 +501,7 @@
                               misc.MEGA * 2 + len(add_data))
 
             with open(path, "r") as f:
-                for i in xrange(repetitions):
+                for _ in xrange(repetitions):
                     self.assertEquals(f.read(len(data)), data)
                 # Checking the additional data
                 self.assertEquals(f.read(len(add_data)), add_data)
@@ -535,7 +535,7 @@
         os.chmod(dstPath, 0o666)
 
         #Copy
-        rc, out, err = misc.ddWatchCopy(srcPath, dstPath, None, len(data))
+        _ = misc.ddWatchCopy(srcPath, dstPath, None, len(data))
 
         #Get copied data
         readData = open(dstPath).read()
diff --git a/tests/testValidation.py b/tests/testValidation.py
index d370971..92790d9 100644
--- a/tests/testValidation.py
+++ b/tests/testValidation.py
@@ -110,7 +110,7 @@
     def wrapper(*args, **kwargs):
         if not os.path.exists('/sys/module/dummy'):
             cmd_modprobe = [modprobe.cmd, "dummy"]
-            rc, out, err = utils.execCmd(cmd_modprobe, sudo=True)
+            _ = utils.execCmd(cmd_modprobe, sudo=True)
         return f(*args, **kwargs)
     return wrapper
 
diff --git a/tests/vmTests.py b/tests/vmTests.py
index 1f69f0a..9d91723 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -390,7 +390,7 @@
         driveInput.update({'shared': 'UNKNOWN-VALUE'})
 
         with self.assertRaises(ValueError):
-            drive = vm.Drive({}, self.log, **driveInput)
+            _ = vm.Drive({}, self.log, **driveInput)
 
     def testDriveXML(self):
         SERIAL = '54-a672-23e5b495a9ea'
diff --git a/vds_bootstrap/setup b/vds_bootstrap/setup
index 778dc12..701df8b 100755
--- a/vds_bootstrap/setup
+++ b/vds_bootstrap/setup
@@ -63,7 +63,6 @@
         return False, HYPERVISOR_RELEASE_FILE + ", " + REDHAT_RELEASE_FILE
 
 def get_id_line():
-    line = ''
     RELEASE_FILE = None
 
     try:
@@ -193,7 +192,6 @@
     import calendar
 
     return_value = False
-    ticket = None
 
     try:
         time_struct = time.strptime(systime, '%Y-%m-%dT%H:%M:%S')
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index a9dc901..e45c8b6 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -289,7 +289,6 @@
         """
         status = "OK"
         message = 'Host properly registered with RHN/Satellite.'
-        rc = True
 
         try:
             rc = bool(deployUtil.yumListPackages(VDSM_NAME))
@@ -316,7 +315,6 @@
         """
         status = "OK"
         message = 'Available VDSM matches requirements'
-        rc = True
 
         try:
             rc = deployUtil.yumSearchVersion(VDSM_NAME, VDSM_MIN_VER)
@@ -393,7 +391,6 @@
         """
         os_status = "FAIL"
         kernel_status = "FAIL"
-        os_message = "Unsupported platform version"
         os_name = "Unknown OS"
         kernel_message = ''
         self.rc = True
@@ -741,8 +738,6 @@
         return self.rc
 
     def _addNetwork(self, vdcName, vdcPort):
-        fReturn = True
-
         #add management bridge
         try:
             fReturn = deployUtil.makeBridge(
@@ -859,9 +854,6 @@
         # TODO remove legacy
         if deployUtil.getBootstrapInterfaceVersion() == 1 and \
                 engine_ssh_key is None:
-            vdcAddress = None
-            vdcPort = None
-
             vdcAddress, vdcPort = deployUtil.getAddress(url)
             if vdcAddress is not None:
                 strKey = deployUtil.getAuthKeysFile(vdcAddress, vdcPort)
diff --git a/vds_bootstrap/vds_bootstrap_complete.py
b/vds_bootstrap/vds_bootstrap_complete.py
index fd18847..07c3610 100755
--- a/vds_bootstrap/vds_bootstrap_complete.py
+++ b/vds_bootstrap/vds_bootstrap_complete.py
@@ -101,7 +101,6 @@
     except:
         arg = 1
 
-    res = True
     try:
         res = deployUtil.instCert(rnum, VDSM_CONF_FILE)
         if res:
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 4579763..322ee8b 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -1095,7 +1095,7 @@
         misc.validateN(hostID, 'hostID')
         # already disconnected/or pool is just unknown - return OK
         try:
-            pool = self.getPool(spUUID)
+            _ = self.getPool(spUUID)
         except se.StoragePoolUnknown:
             self.log.warning("disconnect sp: %s failed. Known pools %s",
                              spUUID, self.pools)
@@ -1861,7 +1861,7 @@
         self.log.info("spUUID=%s master=%s", spUUID, masterDom)
 
         try:
-            pool = self.getPool(spUUID)
+            _ = self.getPool(spUUID)
         except se.StoragePoolUnknown:
             pool = sp.StoragePool(spUUID, self.domainMonitor, self.taskMng)
         else:
diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py
index 7da94ab..9976026 100644
--- a/vdsm/storage/iscsi.py
+++ b/vdsm/storage/iscsi.py
@@ -415,7 +415,7 @@
     log.debug("Performing SCSI scan, this will take up to %s seconds",
               maxTimeout)
     time.sleep(minTimeout)
-    for i in xrange(maxTimeout - minTimeout):
+    for _ in xrange(maxTimeout - minTimeout):
         for p in processes[:]:
             (hba, proc) = p
             if proc.wait(0):
@@ -429,7 +429,7 @@
             time.sleep(1)
     else:
         log.warning("Still waiting for scsi scan of hbas: %s",
-                    tuple(hba for p in processes))
+                    tuple(hba for _ in processes))
 
 
 def devIsiSCSI(dev):
diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index fc13a9c..5245264 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -484,7 +484,6 @@
     log.debug("dir: %s, prefixName: %s, versions: %s" %
               (directory, prefixName, gen))
     gen = int(gen)
-    files = os.listdir(directory)
     files = glob.glob("%s*" % prefixName)
     fd = {}
     for fname in files:
@@ -614,7 +613,6 @@
         return self.acquire(True)
 
     def acquire(self, exclusive):
-        currentEvent = None
         currentThread = threading.currentThread()
 
         # Handle reacquiring lock in the same thread
@@ -1081,7 +1079,7 @@
         maxthreads -= 1
 
     # waiting for rest threads to end
-    for i in xrange(threadsCount):
+    for _ in xrange(threadsCount):
         yield respQueue.get()
 
 
diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py
index 5b24053..accf51c 100644
--- a/vdsm/storage/remoteFileHandler.py
+++ b/vdsm/storage/remoteFileHandler.py
@@ -275,7 +275,7 @@
     def __init__(self, numOfHandlers):
         self._numOfHandlers = numOfHandlers
         self.handlers = [None] * numOfHandlers
-        self.occupied = [Lock() for i in xrange(numOfHandlers)]
+        self.occupied = [Lock() for _ in xrange(numOfHandlers)]
 
     def _isHandlerAvailable(self, poolHandler):
         if poolHandler is None:
diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py
index 14049dc..486ea18 100644
--- a/vdsm/storage/resourceManager.py
+++ b/vdsm/storage/resourceManager.py
@@ -926,7 +926,7 @@
             return req.wait(timeout)
 
         # req not found - check that it is not granted
-        for fullName in self.resources:
+        for _ in self.resources:
             return True
 
         # Note that there is a risk of another thread that is racing with us
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 38cd453..db66662 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -1326,7 +1326,6 @@
         self.log.info("spUUID=%s sdUUID=%s", self.spUUID, sdUUID)
         vms = self._getVMsPath(sdUUID)
         # We should exclude 'masterd' link from IMG_METAPATTERN globing
-        vmUUID = ovf = imgList = ''
         for vm in vmList:
             if not vm:
                 continue
diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py
index 4eff5c1..0532b02 100644
--- a/vdsm/storage/task.py
+++ b/vdsm/storage/task.py
@@ -872,10 +872,7 @@
 
     def _runJobs(self):
         result = ""
-        code = 100
-        message = "Unknown Error"
         i = 0
-        j = None
         try:
             if self.aborting():
                 raise se.TaskAborted("shutting down")
@@ -891,7 +888,6 @@
                 if result is None:
                     result = ""
                 i += 1
-            j = None
             self._updateResult(0, "%s jobs completed successfully" % i,
result)
             self._updateState(State.finished)
             self.log.debug('Task.run: exit - success: result %s' % result)
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 0c12334..5e1c7f1 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -3058,7 +3058,7 @@
             self._dom.attachDevice(nicXml)
         except libvirt.libvirtError as e:
             self.log.error("Hotplug failed", exc_info=True)
-            nicXml = hooks.after_nic_hotplug_fail(
+            _ = hooks.after_nic_hotplug_fail(
                 nicXml, self.conf, params=customProps)
             if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN:
                 return errCode['noVM']
@@ -3760,7 +3760,7 @@
                                "trying again without it (%s)", e)
                 try:
                     self._dom.snapshotCreateXML(snapxml, snapFlags)
-                except Exception as e:
+                except Exception:
                     self.log.error("Unable to take snapshot", exc_info=True)
                     if memoryParams:
                         self.cif.teardownVolumePath(memoryVol)
diff --git a/vdsm_api/Bridge.py b/vdsm_api/Bridge.py
index b9fdaf8..4812354 100644
--- a/vdsm_api/Bridge.py
+++ b/vdsm_api/Bridge.py
@@ -34,7 +34,6 @@
 
     def dispatch(self, name, argobj):
         methodName = name.replace('.', '_')
-        result = None
         try:
             fn = getattr(self, methodName)
         except AttributeError:
diff --git a/vdsm_api/process-schema.py b/vdsm_api/process-schema.py
index c4bda0d..307d498 100755
--- a/vdsm_api/process-schema.py
+++ b/vdsm_api/process-schema.py
@@ -255,12 +255,12 @@
         # Union member types
         names = strip_stars(s.get('data', []))
         types = filter_types(names)
-        details = [None for n in names]
+        details = [None for _ in names]
         attr_table('Types', names, types, details)
     elif 'enum' in s:
         # Enum values
         names = strip_stars(s.get('data', []))
-        types = [None for n in names]
+        types = [None for _ in names]
         details = [s['info_data'][n] for n in names]
         attr_table('Values', names, types, details)
     elif 'map' in s:
diff --git a/vdsm_api/vdsmapi.py b/vdsm_api/vdsmapi.py
index db29c13..c38ff01 100644
--- a/vdsm_api/vdsmapi.py
+++ b/vdsm_api/vdsmapi.py
@@ -92,7 +92,6 @@
 def parse_schema(fp):
     exprs = []
     expr = ''
-    expr_eval = None
 
     for line in fp:
         if line.startswith('#') or line == '\n':


-- 
To view, visit http://gerrit.ovirt.org/20535
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib81c292f900154819e8852c21ae389c323034999
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011