From a56767a865baeeb0174c03e80809467edaaca2e0 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 7 Jan 2015 12:59:34 -0500 Subject: [PATCH] Fix flake8 errors and turn off hacking --- shade/__init__.py | 24 ++++++++++++++---------- shade/meta.py | 1 - shade/tests/base.py | 2 +- shade/tests/test_shade.py | 2 +- tox.ini | 5 +++-- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/shade/__init__.py b/shade/__init__.py index de678d9a1..bd9cd5e0e 100644 --- a/shade/__init__.py +++ b/shade/__init__.py @@ -24,6 +24,7 @@ from ironicclient import exceptions as ironic_exceptions from keystoneclient import client as keystone_client from novaclient import exceptions as nova_exceptions from novaclient.v1_1 import client as nova_client +from novaclient.v1_1 import floating_ips import os_client_config import pbr.version import troveclient.client as trove_client @@ -38,6 +39,7 @@ __version__ = pbr.version.VersionInfo('shade').version_string() class OpenStackCloudException(Exception): pass + class OpenStackCloudTimeout(OpenStackCloudException): pass @@ -378,7 +380,7 @@ class OpenStackCloud(object): self._image_cache = self._get_images_from_cloud() return self._image_cache - def get_image_name(self, image_id): + def get_image_name(self, image_id, exclude): image = self.get_image(image_id, exclude) if image: return image.id @@ -452,7 +454,7 @@ class OpenStackCloud(object): return None def get_server_id(self, server_name): - server = get_server_by_name(server_name) + server = self.get_server_by_name(server_name) if server: return server.id return None @@ -498,7 +500,7 @@ class OpenStackCloud(object): if not pool_ips: try: new_ip = self.nova_client.floating_ips.create(pool) - except Exception as e: + except Exception: raise OpenStackCloudException( "Unable to create floating ip in pool %s" % pool) pool_ips.append(new_ip.ip) @@ -591,7 +593,8 @@ class OpenStackCloud(object): continue if server.status == 'ACTIVE': - return self.add_ips_to_server(server, auto_ip, ips, ip_pool) + return self.add_ips_to_server( + server, auto_ip, ips, ip_pool) if server.status == 'ERROR': raise OpenStackCloudException( @@ -605,13 +608,13 @@ class OpenStackCloud(object): def delete_server(self, name, wait=False, timeout=180): server_list = self.nova_client.servers.list(True, {'name': name}) if server_list: - server = [x for x in server_list if x.name == module.params['name']] + server = [x for x in server_list if x.name == name] self.nova_client.servers.delete(server.pop()) if not wait: return expire = time.time() + timeout while time.time() < expire: - server = nova.servers.list(True, {'name': name}) + server = self.nova_client.servers.list(True, {'name': name}) if not server: return time.sleep(5) @@ -629,6 +632,7 @@ class OpenStackCloud(object): raise OpenStackCloudTimeout( "Timed out waiting for server to get deleted.") + class OperatorCloud(OpenStackCloud): @property @@ -679,7 +683,7 @@ class OperatorCloud(OpenStackCloud): machine = self.ironic_client.node.create(**kwargs) except Exception as e: raise OpenStackCloudException( - "Error registering machine with Ironic: %s" % e.message) + "Error registering machine with Ironic: %s" % e.message) created_nics = [] try: @@ -692,18 +696,18 @@ class OperatorCloud(OpenStackCloud): self.ironic_client.port.delete(uuid) self.ironic_client.node.delete(machine.uuid) raise OpenStackCloudException( - "Error registering NICs with Ironic: %s" % e.message) + "Error registering NICs with Ironic: %s" % e.message) return machine def unregister_machine(self, nics, uuid): for nic in nics: try: self.ironic_client.port.delete( - self.ironic_client.port.get_by_address(nic['mac'])) + self.ironic_client.port.get_by_address(nic['mac'])) except Exception as e: raise OpenStackCloudException(e.message) try: self.ironic_client.node.delete(uuid) except Exception as e: raise OpenStackCloudException( - "Error unregistering machine from Ironic: %s" % e.message) + "Error unregistering machine from Ironic: %s" % e.message) diff --git a/shade/meta.py b/shade/meta.py index 95849cb4d..65208f39a 100644 --- a/shade/meta.py +++ b/shade/meta.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import re import types NON_CALLABLES = (basestring, bool, dict, int, list, types.NoneType) diff --git a/shade/tests/base.py b/shade/tests/base.py index 93b83262c..0b5b1f446 100644 --- a/shade/tests/base.py +++ b/shade/tests/base.py @@ -50,4 +50,4 @@ class TestCase(testtools.TestCase): stderr = self.useFixture(fixtures.StringStream('stderr')).stream self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr)) - self.log_fixture = self.useFixture(fixtures.FakeLogger()) \ No newline at end of file + self.log_fixture = self.useFixture(fixtures.FakeLogger()) diff --git a/shade/tests/test_shade.py b/shade/tests/test_shade.py index e8b0ac82f..687129671 100644 --- a/shade/tests/test_shade.py +++ b/shade/tests/test_shade.py @@ -25,4 +25,4 @@ from shade.tests import base class TestShade(base.TestCase): def test_something(self): - pass \ No newline at end of file + pass diff --git a/tox.ini b/tox.ini index 4649796f5..5a1018329 100644 --- a/tox.ini +++ b/tox.ini @@ -25,8 +25,9 @@ commands = {posargs} commands = python setup.py testr --coverage --testr-args='{posargs}' [flake8] -# We're not inside of OpenStack, so H305 makes no sense -ignore = H305 +# Infra does not follow hacking, nor the broken E12* things +ignore = E123,E125,H +select = H231 show-source = True builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build