Clean up pep8 E123 and E124 violations
Fixed E123 and E124 errors.
All ignores are to be removed in the next sequence of patches.
Change-Id: Ie5dc0cd6b0cbdf00f403cb1a039c499a2fca869e
diff --git a/stress/driver.py b/stress/driver.py
index 35004bb..3032d58 100644
--- a/stress/driver.py
+++ b/stress/driver.py
@@ -36,7 +36,7 @@
filename="stress.debug.log",
filemode="w",
level=logging.DEBUG,
- )
+)
# define a Handler which writes INFO messages or higher to the sys.stdout
_console = logging.StreamHandler()
diff --git a/stress/test_server_actions.py b/stress/test_server_actions.py
index 87b1067..5ba03e1 100644
--- a/stress/test_server_actions.py
+++ b/stress/test_server_actions.py
@@ -117,8 +117,7 @@
self._logger.info('machine %s ACTIVE -> %s' %
(self._target['id'], reboot_state))
self._state.set_instance_state(self._target['id'],
- (self._target, reboot_state)
- )
+ (self._target, reboot_state))
self._retry_state = self.States.ACTIVE_CHECK
elif server_state == 'ACTIVE':
# machine must have gone ACTIVE -> REBOOT ->ACTIVE
diff --git a/stress/test_servers.py b/stress/test_servers.py
index 3075045..1a4b830 100644
--- a/stress/test_servers.py
+++ b/stress/test_servers.py
@@ -67,20 +67,19 @@
'metadata': {
'key1': 'value1',
'key2': 'value2',
- },
+ },
'imageRef': _image_ref,
'flavorRef': _flavor_ref,
'adminPass': 'testpwd',
- 'key_name': _key_name
- }
+ 'key_name': _key_name,
+ }
TestCreateVM._vm_id = TestCreateVM._vm_id + 1
- response, body = manager.servers_client.create_server(
- expected_server['name'],
- _image_ref,
- _flavor_ref,
- meta=expected_server['metadata'],
- adminPass=expected_server['adminPass']
- )
+ create_server = manager.servers_client.create_server
+ response, body = create_server(expected_server['name'],
+ _image_ref,
+ _flavor_ref,
+ meta=expected_server['metadata'],
+ adminPass=expected_server['adminPass'])
if (response.status != 202):
self._logger.error("response: %s" % response)
diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 48f4152..ee972bf 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -107,12 +107,13 @@
Provides authentication via Keystone
"""
- creds = {'auth': {
+ creds = {
+ 'auth': {
'passwordCredentials': {
'username': user,
'password': password,
},
- 'tenantName': tenant_name
+ 'tenantName': tenant_name,
}
}
diff --git a/tempest/manager.py b/tempest/manager.py
index 6bb713b..c4c1e1a 100644
--- a/tempest/manager.py
+++ b/tempest/manager.py
@@ -101,7 +101,7 @@
'image_client',
'identity_client',
'network_client',
- ]
+ ]
def _get_compute_client(self, username=None, password=None,
tenant_name=None):
diff --git a/tempest/services/identity/json/admin_client.py b/tempest/services/identity/json/admin_client.py
index f9c4f04..9e171b6 100644
--- a/tempest/services/identity/json/admin_client.py
+++ b/tempest/services/identity/json/admin_client.py
@@ -207,12 +207,13 @@
self.auth_url = config.identity.auth_url
def auth(self, user, password, tenant):
- creds = {'auth': {
+ creds = {
+ 'auth': {
'passwordCredentials': {
'username': user,
'password': password,
},
- 'tenantName': tenant
+ 'tenantName': tenant,
}
}
headers = {'Content-Type': 'application/json'}
diff --git a/tempest/services/network/json/network_client.py b/tempest/services/network/json/network_client.py
index c93c83f..34342c9 100644
--- a/tempest/services/network/json/network_client.py
+++ b/tempest/services/network/json/network_client.py
@@ -17,8 +17,8 @@
def create_network(self, name, key="network"):
post_body = {
key: {
- 'name': name
- }
+ 'name': name,
+ }
}
headers = {'Content-Type': 'application/json'}
body = json.dumps(post_body)
diff --git a/tempest/services/nova/json/flavors_client.py b/tempest/services/nova/json/flavors_client.py
index a95eb6a..ca1770b 100644
--- a/tempest/services/nova/json/flavors_client.py
+++ b/tempest/services/nova/json/flavors_client.py
@@ -44,15 +44,15 @@
swap, rxtx):
"""Creates a new flavor or instance type"""
post_body = {
- 'name': name,
- 'ram': ram,
- 'vcpus': vcpus,
- 'disk': disk,
- 'OS-FLV-EXT-DATA:ephemeral': ephemeral,
- 'id': flavor_id,
- 'swap': swap,
- 'rxtx_factor': rxtx
- }
+ 'name': name,
+ 'ram': ram,
+ 'vcpus': vcpus,
+ 'disk': disk,
+ 'OS-FLV-EXT-DATA:ephemeral': ephemeral,
+ 'id': flavor_id,
+ 'swap': swap,
+ 'rxtx_factor': rxtx,
+ }
post_body = json.dumps({'flavor': post_body})
resp, body = self.post('flavors', post_body, self.headers)
diff --git a/tempest/services/nova/json/servers_client.py b/tempest/services/nova/json/servers_client.py
index a18ebd2..32ec740 100644
--- a/tempest/services/nova/json/servers_client.py
+++ b/tempest/services/nova/json/servers_client.py
@@ -335,12 +335,12 @@
def attach_volume(self, server_id, volume_id, device='/dev/vdz'):
"""Attaches a volume to a server instance"""
- post_body = json.dumps(
- {'volumeAttachment': {
- 'volumeId': volume_id,
- 'device': device,
- }
- })
+ post_body = json.dumps({
+ 'volumeAttachment': {
+ 'volumeId': volume_id,
+ 'device': device,
+ }
+ })
resp, body = self.post('servers/%s/os-volume_attachments' % server_id,
post_body, self.headers)
return resp, body
diff --git a/tempest/services/nova/json/volumes_extensions_client.py b/tempest/services/nova/json/volumes_extensions_client.py
index 1a234bd..4c0a962 100644
--- a/tempest/services/nova/json/volumes_extensions_client.py
+++ b/tempest/services/nova/json/volumes_extensions_client.py
@@ -61,7 +61,7 @@
'size': size,
'display_name': kwargs.get('display_name'),
'metadata': kwargs.get('metadata'),
- }
+ }
post_body = json.dumps({'volume': post_body})
resp, body = self.post('os-volumes', post_body, self.headers)
diff --git a/tempest/services/volume/json/volumes_client.py b/tempest/services/volume/json/volumes_client.py
index 2c9f8c3..6f04e5e 100644
--- a/tempest/services/volume/json/volumes_client.py
+++ b/tempest/services/volume/json/volumes_client.py
@@ -81,7 +81,7 @@
'size': size,
'display_name': kwargs.get('display_name'),
'metadata': kwargs.get('metadata'),
- }
+ }
post_body = json.dumps({'volume': post_body})
resp, body = self.post('volumes', post_body, self.headers)
@@ -95,9 +95,9 @@
def attach_volume(self, volume_id, instance_uuid, mountpoint):
"""Attaches a volume to a given instance on a given mountpoint"""
post_body = {
- 'instance_uuid': instance_uuid,
- 'mountpoint': mountpoint
- }
+ 'instance_uuid': instance_uuid,
+ 'mountpoint': mountpoint,
+ }
post_body = json.dumps({'os-attach': post_body})
url = 'volumes/%s/action' % (volume_id)
resp, body = self.post(url, post_body, self.headers)
diff --git a/tox.ini b/tox.ini
index e9a82a8..8966c29 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,4 +15,4 @@
[testenv:pep8]
deps = pep8==1.3.3
-commands = pep8 --ignore=E121,E122,E123,E124,E125,E126 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack,kong .
+commands = pep8 --ignore=E121,E122,E125,E126 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack,kong .