Switch to flake8 from pep8.

 * flake8 supports more checks than pep8 (e.g. detection of
   unused imports and variables), and has an extension mechanism.
   A plugin to support automatic HACKING validation is planned.
 * See: http://flake8.readthedocs.org/

Change-Id: I1cba551fadf87f3dbc40a002736c1009e7b9d5b5

7 files changed, 68 insertions, 74 deletions

diff --git a/tests/unit/lb/test_cli20_healthmonitor.py b/tests/unit/lb/test_cli20_healthmonitor.py
index ed0086a..56c753c 100644
--- a/tests/unit/lb/test_cli20_healthmonitor.py
+++ b/tests/unit/lb/test_cli20_healthmonitor.py
@@ -26,11 +26,12 @@ from tests.unit import test_cli20
 
 
 class CLITestV20LbHealthmonitor(test_cli20.CLITestV20Base):
-    def test_create_healthmonitor_with_all_params(self):
+    def test_create_healthmonitor_with_mandatory_params(self):
         """lb-healthmonitor-create with mandatory params only"""
         resource = 'health_monitor'
         cmd = healthmonitor.CreateHealthMonitor(test_cli20.MyApp(sys.stdout),
                                                 None)
+        admin_state_up = False
         delay = '60'
         max_retries = '2'
         timeout = '10'
@@ -45,7 +46,7 @@ class CLITestV20LbHealthmonitor(test_cli20.CLITestV20Base):
                 '--tenant-id', tenant_id]
         position_names = ['admin_state_up', 'delay', 'max_retries', 'timeout',
                           'type', 'tenant_id']
-        position_values = [True, delay, max_retries, timeout, type,
+        position_values = [admin_state_up, delay, max_retries, timeout, type,
                            tenant_id]
         self._test_create_resource(resource, cmd, '', my_id, args,
                                    position_names, position_values)
diff --git a/tests/unit/test_cli20_floatingips.py b/tests/unit/test_cli20_floatingips.py
index 854bf1e..e70d6bd 100644
--- a/tests/unit/test_cli20_floatingips.py
+++ b/tests/unit/test_cli20_floatingips.py
@@ -18,7 +18,6 @@
 
 import sys
 
-from quantumclient.common import exceptions
 from quantumclient.quantum.v2_0.floatingip import AssociateFloatingIP
 from quantumclient.quantum.v2_0.floatingip import CreateFloatingIP
 from quantumclient.quantum.v2_0.floatingip import DeleteFloatingIP
@@ -39,8 +38,8 @@ class CLITestV20FloatingIps(CLITestV20Base):
         args = [name]
         position_names = ['floating_network_id']
         position_values = [name]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
     def test_create_floatingip_and_port(self):
         """Create floatingip: fip1."""
@@ -52,14 +51,14 @@ class CLITestV20FloatingIps(CLITestV20Base):
         args = [name, '--port_id', pid]
         position_names = ['floating_network_id', 'port_id']
         position_values = [name, pid]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
         # Test dashed options
         args = [name, '--port-id', pid]
         position_names = ['floating_network_id', 'port_id']
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
     def test_create_floatingip_and_port_and_address(self):
         """Create floatingip: fip1 with a given port and address"""
@@ -72,13 +71,13 @@ class CLITestV20FloatingIps(CLITestV20Base):
         args = [name, '--port_id', pid, '--fixed_ip_address', addr]
         position_names = ['floating_network_id', 'port_id', 'fixed_ip_address']
         position_values = [name, pid, addr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
         # Test dashed options
         args = [name, '--port-id', pid, '--fixed-ip-address', addr]
         position_names = ['floating_network_id', 'port_id', 'fixed_ip_address']
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
     def test_list_floatingips(self):
         """list floatingips: -D."""
diff --git a/tests/unit/test_cli20_network.py b/tests/unit/test_cli20_network.py
index 18e3a2c..1c59b6f 100644
--- a/tests/unit/test_cli20_network.py
+++ b/tests/unit/test_cli20_network.py
@@ -17,7 +17,6 @@
 
 import sys
 
-import mox
 from mox import (ContainsKeyValue, IgnoreArg, IsA)
 
 from quantumclient.common import exceptions
@@ -182,7 +181,6 @@ class CLITestV20Network(CLITestV20Base):
 
     def test_list_nets_detail_tags(self):
         """List nets: -D -- --tags a b."""
-        resources = "networks"
         cmd = ListNetwork(MyApp(sys.stdout), None)
         self._test_list_networks(cmd, detail=True, tags=['a', 'b'])
 
@@ -198,7 +196,6 @@ class CLITestV20Network(CLITestV20Base):
                 headers=ContainsKeyValue(
                     'X-Auth-Token', test_cli20.TOKEN)).AndReturn(resp)
 
-        resources = "networks"
         cmd = ListNetwork(test_cli20.MyApp(sys.stdout), None)
         self.mox.StubOutWithMock(cmd, 'get_client')
         self.mox.StubOutWithMock(self.client.httpclient, 'request')
@@ -249,7 +246,6 @@ class CLITestV20Network(CLITestV20Base):
 
     def test_list_nets_fields(self):
         """List nets: --fields a --fields b -- --fields c d."""
-        resources = "networks"
         cmd = ListNetwork(MyApp(sys.stdout), None)
         self._test_list_networks(cmd,
                                  fields_1=['a', 'b'], fields_2=['c', 'd'])
diff --git a/tests/unit/test_cli20_nvpnetworkgateway.py b/tests/unit/test_cli20_nvpnetworkgateway.py
index 31f7e1a..bf95a6d 100644
--- a/tests/unit/test_cli20_nvpnetworkgateway.py
+++ b/tests/unit/test_cli20_nvpnetworkgateway.py
@@ -17,7 +17,6 @@
 
 import sys
 
-from quantumclient.common import exceptions
 from quantumclient.quantum.v2_0 import nvpnetworkgateway
 from tests.unit.test_cli20 import CLITestV20Base
 from tests.unit.test_cli20 import MyApp
@@ -34,8 +33,8 @@ class CLITestV20NetworkGateway(CLITestV20Base):
         args = [name, ]
         position_names = ['name', ]
         position_values = [name, ]
-        _str = self._test_create_resource(self.resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(self.resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
     def test_create_gateway_with_tenant(self):
         cmd = nvpnetworkgateway.CreateNetworkGateway(MyApp(sys.stdout), None)
@@ -44,9 +43,9 @@ class CLITestV20NetworkGateway(CLITestV20Base):
         args = ['--tenant_id', 'tenantid', name]
         position_names = ['name', ]
         position_values = [name, ]
-        _str = self._test_create_resource(self.resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(self.resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_gateway_with_device(self):
         cmd = nvpnetworkgateway.CreateNetworkGateway(MyApp(sys.stdout), None)
@@ -55,9 +54,9 @@ class CLITestV20NetworkGateway(CLITestV20Base):
         args = ['--device', 'device_id=test', name, ]
         position_names = ['name', ]
         position_values = [name, ]
-        _str = self._test_create_resource(self.resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          devices=[{'device_id': 'test'}])
+        self._test_create_resource(self.resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   devices=[{'device_id': 'test'}])
 
     def test_list_gateways(self):
         resources = '%ss' % self.resource
diff --git a/tests/unit/test_cli20_router.py b/tests/unit/test_cli20_router.py
index e9e661c..262ce64 100644
--- a/tests/unit/test_cli20_router.py
+++ b/tests/unit/test_cli20_router.py
@@ -41,8 +41,8 @@ class CLITestV20Router(CLITestV20Base):
         args = [name, ]
         position_names = ['name', ]
         position_values = [name, ]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
     def test_create_router_tenant(self):
         """Create router: --tenant_id tenantid myname."""
@@ -53,9 +53,9 @@ class CLITestV20Router(CLITestV20Base):
         args = ['--tenant_id', 'tenantid', name]
         position_names = ['name', ]
         position_values = [name, ]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_router_admin_state(self):
         """Create router: --admin_state_down myname."""
@@ -66,9 +66,9 @@ class CLITestV20Router(CLITestV20Base):
         args = ['--admin_state_down', name, ]
         position_names = ['name', ]
         position_values = [name, ]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          admin_state_up=False)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   admin_state_up=False)
 
     def test_list_routers_detail(self):
         """list routers: -D."""
diff --git a/tests/unit/test_cli20_securitygroup.py b/tests/unit/test_cli20_securitygroup.py
index 77cbdaf..3058f4d 100644
--- a/tests/unit/test_cli20_securitygroup.py
+++ b/tests/unit/test_cli20_securitygroup.py
@@ -236,7 +236,6 @@ class CLITestV20SecurityGroups(test_cli20.CLITestV20Base):
         expected['cols'] = expected.get('cols', _expected['cols'])
         expected['data'] = expected.get('data', _expected['data'])
 
-        resources = "security_group_rules"
         cmd = securitygroup.ListSecurityGroupRule(
             test_cli20.MyApp(sys.stdout), None)
         self.mox.StubOutWithMock(cmd, 'get_client')
diff --git a/tests/unit/test_cli20_subnet.py b/tests/unit/test_cli20_subnet.py
index 7bbe7ea..82b619a 100644
--- a/tests/unit/test_cli20_subnet.py
+++ b/tests/unit/test_cli20_subnet.py
@@ -40,8 +40,8 @@ class CLITestV20Subnet(CLITestV20Base):
         args = ['--gateway', gateway, netid, cidr]
         position_names = ['ip_version', 'network_id', 'cidr', 'gateway_ip']
         position_values = [4, netid, cidr, gateway]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
     def test_create_subnet_with_no_gateway(self):
         """Create subnet: --no-gateway netid cidr"""
@@ -54,8 +54,8 @@ class CLITestV20Subnet(CLITestV20Base):
         args = ['--no-gateway', netid, cidr]
         position_names = ['ip_version', 'network_id', 'cidr', 'gateway_ip']
         position_values = [4, netid, cidr, None]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values)
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
 
     def test_create_subnet_with_bad_gateway_option(self):
         """Create sbunet: --no-gateway netid cidr"""
@@ -70,8 +70,8 @@ class CLITestV20Subnet(CLITestV20Base):
         position_names = ['ip_version', 'network_id', 'cidr', 'gateway_ip']
         position_values = [4, netid, cidr, None]
         try:
-            _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                              position_names, position_values)
+            self._test_create_resource(resource, cmd, name, myid, args,
+                                       position_names, position_values)
         except:
             return
         self.fail('No exception for bad gateway option')
@@ -87,9 +87,9 @@ class CLITestV20Subnet(CLITestV20Base):
         args = ['--tenant_id', 'tenantid', netid, cidr]
         position_names = ['ip_version', 'network_id', 'cidr']
         position_values = [4, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_tags(self):
         """Create subnet: netid cidr --tags a b."""
@@ -102,9 +102,9 @@ class CLITestV20Subnet(CLITestV20Base):
         args = [netid, cidr, '--tags', 'a', 'b']
         position_names = ['ip_version', 'network_id', 'cidr']
         position_values = [4, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tags=['a', 'b'])
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tags=['a', 'b'])
 
     def test_create_subnet_allocation_pool(self):
         """Create subnet: --tenant_id tenantid <allocation_pool> netid cidr.
@@ -123,9 +123,9 @@ class CLITestV20Subnet(CLITestV20Base):
                           'cidr']
         pool = [{'start': '1.1.1.10', 'end': '1.1.1.20'}]
         position_values = [4, pool, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_allocation_pools(self):
         """Create subnet: --tenant-id tenantid <pools> netid cidr.
@@ -147,9 +147,9 @@ class CLITestV20Subnet(CLITestV20Base):
         pools = [{'start': '1.1.1.10', 'end': '1.1.1.20'},
                  {'start': '1.1.1.30', 'end': '1.1.1.40'}]
         position_values = [4, pools, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_host_route(self):
         """Create subnet: --tenant_id tenantid <host_route> netid cidr.
@@ -169,9 +169,9 @@ class CLITestV20Subnet(CLITestV20Base):
                           'cidr']
         route = [{'destination': '172.16.1.0/24', 'nexthop': '1.1.1.20'}]
         position_values = [4, route, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_host_routes(self):
         """Create subnet: --tenant-id tenantid <host_routes> netid cidr.
@@ -194,9 +194,9 @@ class CLITestV20Subnet(CLITestV20Base):
         routes = [{'destination': '172.16.1.0/24', 'nexthop': '1.1.1.20'},
                   {'destination': '172.17.7.0/24', 'nexthop': '1.1.1.40'}]
         position_values = [4, routes, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_dns_nameservers(self):
         """Create subnet: --tenant-id tenantid <dns-nameservers> netid cidr.
@@ -217,9 +217,9 @@ class CLITestV20Subnet(CLITestV20Base):
                           'cidr']
         nameservers = ['1.1.1.20', '1.1.1.40']
         position_values = [4, nameservers, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_with_disable_dhcp(self):
         """Create subnet: --tenant-id tenantid --disable-dhcp netid cidr."""
@@ -235,9 +235,9 @@ class CLITestV20Subnet(CLITestV20Base):
         position_names = ['ip_version', 'enable_dhcp', 'network_id',
                           'cidr']
         position_values = [4, False, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_merge_single_plurar(self):
         resource = 'subnet'
@@ -256,9 +256,9 @@ class CLITestV20Subnet(CLITestV20Base):
         pools = [{'start': '1.1.1.10', 'end': '1.1.1.20'},
                  {'start': '1.1.1.30', 'end': '1.1.1.40'}]
         position_values = [4, pools, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_merge_plurar(self):
         resource = 'subnet'
@@ -275,9 +275,9 @@ class CLITestV20Subnet(CLITestV20Base):
                           'cidr']
         pools = [{'start': '1.1.1.30', 'end': '1.1.1.40'}]
         position_values = [4, pools, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_create_subnet_merge_single_single(self):
         resource = 'subnet'
@@ -296,9 +296,9 @@ class CLITestV20Subnet(CLITestV20Base):
         pools = [{'start': '1.1.1.10', 'end': '1.1.1.20'},
                  {'start': '1.1.1.30', 'end': '1.1.1.40'}]
         position_values = [4, pools, netid, cidr]
-        _str = self._test_create_resource(resource, cmd, name, myid, args,
-                                          position_names, position_values,
-                                          tenant_id='tenantid')
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values,
+                                   tenant_id='tenantid')
 
     def test_list_subnets_detail(self):
         """List subnets: -D."""