From 5a758fc6d1e951e3fa7c4e1c54dae7e96595f6ab Mon Sep 17 00:00:00 2001
From: Borne Mace <borne.mace@oracle.com>
Date: Fri, 10 Jul 2015 09:19:32 -0700
Subject: [PATCH] Fixed all remaining pep8 failures in the codebase
Change-Id: I0de312a587ecd83158da4c7e05ca6495c7a981a8
Partially-Implements: blueprint enable-flake8
---
.../binary/neutron/neutron-base/ip_wrapper.py | 27 ++++++++++++-------
docker/common/hautoproxy/start.py | 7 ++---
tests/clients.py | 1 +
tests/test_images.py | 4 ++-
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/docker/centos/binary/neutron/neutron-base/ip_wrapper.py b/docker/centos/binary/neutron/neutron-base/ip_wrapper.py
index 99d70340e..94d54d4e0 100755
--- a/docker/centos/binary/neutron/neutron-base/ip_wrapper.py
+++ b/docker/centos/binary/neutron/neutron-base/ip_wrapper.py
@@ -14,9 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# This file exists because we want to create and delete any network namespaces from the
-# host mount namespace. This allows the host to access all of the neutron network
-# namespaces as well as all containers that bind mount /run/netns from the host.
+# This file exists because we want to create and delete any network
+# namespaces from the host mount namespace. This allows the host to
+# access all of the neutron network namespaces as well as all
+# containers that bind mount /run/netns from the host.
# This is required for "thin" neutron containers to function properly
@@ -24,24 +25,32 @@ import sys
import subprocess
import nsenter
+
def host_mnt_exec(cmd):
try:
with nsenter.ExitStack() as stack:
- stack.enter_context(nsenter.Namespace('1', 'mnt', proc='/opt/kolla/host_proc/'))
+ stack.enter_context(
+ nsenter.Namespace(
+ '1',
+ 'mnt',
+ proc='/opt/kolla/host_proc/'))
process_ = subprocess.Popen(cmd)
except Exception as e:
- print("An error has occured with a component that Kolla manages. Please file a bug")
+ print(
+ "An error has occured with a component that Kolla manages."
+ " Please file a bug")
print("Error: ", e)
return process_
if len(sys.argv) > 2:
- # We catch all commands that ip will accept that refer to creating or deleteing a
- # Network namespace
- if str(sys.argv[1]).startswith("net") and \
- (str(sys.argv[2]).startswith("a") or str(sys.argv[2]).startswith("d")):
+ # We catch all commands that ip will accept that refer
+ # to creating or deleteing a Network namespace
+ if str(sys.argv[1]).startswith("net") and (
+ str(sys.argv[2]).startswith("a") or
+ str(sys.argv[2]).startswith("d")):
# This cmd is executed in the host mount namespace
cmd = ["/usr/bin/env", "ip"] + sys.argv[1:]
sys.exit(host_mnt_exec(cmd).returncode)
diff --git a/docker/common/hautoproxy/start.py b/docker/common/hautoproxy/start.py
index 877b22157..bbdd876b5 100755
--- a/docker/common/hautoproxy/start.py
+++ b/docker/common/hautoproxy/start.py
@@ -6,7 +6,6 @@ docker/kubernetes environment variables.'''
import argparse
import os
-import sys
from jinja2 import Environment, FileSystemLoader
import re
import urlparse
@@ -14,6 +13,7 @@ import urlparse
re_url = re.compile(
'^(?P<name>.*)_PORT_(?P<port>\d+)_(?P<proto>(UDP|TCP))$')
+
def parse_args():
p = argparse.ArgumentParser()
p.add_argument('--output', '-o',
@@ -24,6 +24,7 @@ def parse_args():
default='/etc/haproxy/templates')
return p.parse_args()
+
def discover_services():
services = []
for k in os.environ:
@@ -31,7 +32,7 @@ def discover_services():
if mo:
parts = urlparse.urlparse(os.environ[k])
- remote_host,remote_port = parts.netloc.split(':')
+ remote_host, remote_port = parts.netloc.split(':')
service_name = '%(name)s-%(port)s' % mo.groupdict()
services.append({
@@ -45,6 +46,7 @@ def discover_services():
return services
+
def main():
args = parse_args()
services = discover_services()
@@ -62,4 +64,3 @@ def main():
if __name__ == '__main__':
main()
-
diff --git a/tests/clients.py b/tests/clients.py
index 9ac977479..9544e239b 100644
--- a/tests/clients.py
+++ b/tests/clients.py
@@ -17,6 +17,7 @@ from keystoneclient.v2_0 import client as ksclient
logging.basicConfig(level=logging.WARNING)
LOG = logging.getLogger(__name__)
+
class OpenStackClients(object):
def __init__(self):
diff --git a/tests/test_images.py b/tests/test_images.py
index c0ad84596..e8ee41bc0 100644
--- a/tests/test_images.py
+++ b/tests/test_images.py
@@ -18,11 +18,13 @@ from subprocess import Popen, PIPE, STDOUT
LOG = logging.getLogger(__name__)
+
class ImagesTest(base.BaseTestCase):
+
def setUp(self):
super(ImagesTest, self).setUp()
self.useFixture(log_fixture.SetLogLevel([__name__],
- logging.logging.INFO))
+ logging.logging.INFO))
def test_builds(self):
proc = Popen(['tools/build-all-docker-images',
--
GitLab