Fixed pyflakes issues.

Change-Id: Ifa63142b5587846e6c61c9337a9b85489e0f8b87

devstack-vm-delete.py

@@ -21,9 +21,7 @@
 import json
 import os
 import sys
-import getopt
 from statsd import statsd
-import time
 import traceback
 import urllib
 

devstack-vm-give.py

@@ -21,8 +21,6 @@
 
 import os
 import sys
-import time
-import getopt
 import commands
 import json
 import urllib2

devstack-vm-inprogress.py

@@ -20,15 +20,11 @@
 
 import os
 import sys
-import time
-import getopt
-import traceback
 import ConfigParser
 
 import myjenkins
 import vmdatabase
 import utils
-import novaclient
 import re
 
 NODE_NAME = sys.argv[1]

devstack-vm-launch.py

@@ -21,9 +21,7 @@
 
 import os
 import sys
-import getopt
 import time
-import paramiko
 import traceback
 import ConfigParser
 from statsd import statsd

devstack-vm-reap.py

@@ -21,7 +21,6 @@
 import os
 import sys
 import time
-import getopt
 import traceback
 import ConfigParser
 

devstack-vm-update-image.py

@@ -21,11 +21,9 @@
 
 import sys
 import os
-import commands
 import time
 import subprocess
 import traceback
-import socket
 import pprint
 
 import vmdatabase
@@ -242,7 +240,6 @@ def configure_server(server, branches):
     client.ssh('clear workspace', 'rm -rf ~/workspace-cache')
     client.ssh('make workspace', 'mkdir -p ~/workspace-cache')
     for project in PROJECTS:
-        sp = project.split('/')[0]
         client.ssh('clone %s' % project,
             'cd ~/workspace-cache && '
             'git clone https://review.openstack.org/p/%s' % project)
@@ -305,7 +302,7 @@ def build_image(provider, client, base_image, image,
         except:
             print "Exception encountered deleting server:"
             traceback.print_exc()
-    except Exception, real_error:
+    except Exception:
         # Something went wrong, try our best to mark the server in error
         # then delete the server, then delete the db record for it.
         # If any of this fails, the reap script should catch it.  But
@@ -315,10 +312,10 @@ def build_image(provider, client, base_image, image,
             try:
                 utils.delete_server(server)
                 snap_image.delete()
-            except Exception, delete_error:
+            except Exception:
                 print "Exception encountered deleting server:"
                 traceback.print_exc()
-        except Execption, database_error:
+        except Exception:
             print "Exception encountered marking server in error:"
             traceback.print_exc()
         # Raise the important exception that started this
@@ -353,10 +350,10 @@ def main():
             remote_snap_image_name = (
                 '%sdevstack-%s-%s.template.openstack.org' %
                 (DEVSTACK_GATE_PREFIX, base_image.name, str(timestamp)))
-            remote_snap_image = build_image(provider, client, base_image,
-                                            remote_base_image, flavor,
-                                            remote_snap_image_name,
-                                            branches, timestamp)
+            build_image(provider, client, base_image,
+                        remote_base_image, flavor,
+                        remote_snap_image_name,
+                        branches, timestamp)
 
 
 if __name__ == '__main__':

tests/test_vmdatabase.py

@@ -50,12 +50,12 @@ class TestVMDatabase(testtools.TestCase):
         self.test_add_provider()
 
         provider = self.db.getProvider('rackspace')
-        base_image1 = provider.newBaseImage('oneiric', 1)
-        base_image2 = provider.newBaseImage('precise', 2)
+        provider.newBaseImage('oneiric', 1)
+        provider.newBaseImage('precise', 2)
 
         provider = self.db.getProvider('hpcloud')
-        base_image1 = provider.newBaseImage('oneiric', 1)
-        base_image2 = provider.newBaseImage('precise', 2)
+        provider.newBaseImage('oneiric', 1)
+        provider.newBaseImage('precise', 2)
 
     def test_add_snap_image(self):
         self.test_add_base_image()
@@ -70,9 +70,9 @@ class TestVMDatabase(testtools.TestCase):
         hp_provider = self.db.getProvider('hpcloud')
         hp_base_image1 = hp_provider.getBaseImage('oneiric')
         hp_base_image2 = hp_provider.getBaseImage('precise')
-        hp_snapshot_image1 = hp_base_image1.newSnapshotImage(
+        hp_base_image1.newSnapshotImage(
             'oneiric-1331683549', 1331929410, 211, 311)
-        hp_snapshot_image2 = hp_base_image2.newSnapshotImage(
+        hp_base_image2.newSnapshotImage(
             'precise-1331683549', 1331929410, 212, 311)
 
         self.db.print_state()
@@ -108,8 +108,8 @@ class TestVMDatabase(testtools.TestCase):
         provider = self.db.getProvider('rackspace')
         base_image1 = provider.getBaseImage('oneiric')
         base_image2 = provider.getBaseImage('precise')
-        snapshot_image1 = base_image1.current_snapshot
-        snapshot_image2 = base_image2.current_snapshot
+        base_image1.current_snapshot
+        base_image2.current_snapshot
         assert(len(provider.machines) == 0)
         assert(len(provider.ready_machines) == 0)
         assert(len(provider.building_machines) == 0)
@@ -180,8 +180,6 @@ class TestVMDatabase(testtools.TestCase):
         hp_provider = self.db.getProvider('hpcloud')
         hp_base_image1 = hp_provider.getBaseImage('oneiric')
         hp_base_image2 = hp_provider.getBaseImage('precise')
-        hp_snapshot_image1 = hp_base_image1.current_snapshot
-        hp_snapshot_image2 = hp_base_image2.current_snapshot
         hp_machine1 = hp_base_image1.newMachine(
             '%s-1331683551' % hp_base_image1.name,
             '21000021', '2.2.3.4', 'hpuuid1')

tox.ini

@@ -18,4 +18,4 @@ commands =
 [flake8]
 exclude = .git,.tox,dist,*egg,build,v1_0
 show-source = True
-ignore = E12,F,H
+ignore = E12,H

utils.py

@@ -22,7 +22,6 @@ import novaclient
 from novaclient.v1_1 import client as Client11
 from v1_0 import client as Client10
 import time
-import os
 import traceback
 import paramiko
 import socket

vmdatabase.py

@@ -18,7 +18,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sqlite3
 import os
 import time
 
@@ -45,8 +44,8 @@ RESULT_FAILURE = 2
 RESULT_TIMEOUT = 3
 
 from sqlalchemy import Table, Column, Boolean, Integer, String, \
-                       MetaData, ForeignKey, UniqueConstraint, Index, \
-                       create_engine, and_, or_
+                       MetaData, ForeignKey, \
+                       create_engine, and_
 from sqlalchemy.orm import mapper, relation
 from sqlalchemy.orm.session import Session, sessionmaker
 
@@ -407,7 +406,6 @@ class VMDatabase(object):
     def getMachineForUse(self, image_name):
         """Atomically find a machine that is ready for use, and update
         its state."""
-        image = None
         for machine in self.session.query(Machine).filter(
             machine_table.c.state == READY).order_by(
             machine_table.c.state_time):