openstack
/
manila
Code Issues Proposed changes

Fix E251 unexpected spaces around keyword / parameter equals 

Pep8 does not like to have linewraps or spaces around kwarg
assignment, so reindent the lines to fulfill the pep8 rules.

Change-Id: I0bcdcd36400e18fb7afa9d07da3f32ba20efa68b
This commit is contained in:
Dirk Mueller 2014-07-03 21:13:57 +02:00
parent c4b022524b
commit 68a2f47a75
6 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manila/network/__init__.py
View File

@ -21,9 +21,9 @@ from oslo.config import cfg
network_opts = [
cfg.StrOpt('network_api_class',
default=
'manila.network.neutron.neutron_network_plugin.NeutronNetworkPlugin',
help='The full class name of the network API class to use'),
default='manila.network.neutron.'
'neutron_network_plugin.NeutronNetworkPlugin',
help='The full class name of the network API class to use'),
]
cfg.CONF.register_opts(network_opts)

8
manila/scheduler/host_manager.py
View File

@ -269,10 +269,10 @@ class HostManager(object):
host_state.update_capabilities(capabilities,
dict(six.iteritems(service)))
else:
host_state = self.host_state_cls(host,
capabilities=capabilities,
service=
dict(six.iteritems(service)))
host_state = self.host_state_cls(
host,
capabilities=capabilities,
service=dict(six.iteritems(service)))
self.host_state_map[host] = host_state
# update host_state
host_state.update_from_share_capability(capabilities)

33
manila/tests/network/neutron/test_neutron_api.py
View File

@ -149,8 +149,8 @@ class NeutronApiTest(test.TestCase):
@mock.patch.object(neutron_api.LOG, 'exception', mock.Mock())
def test_create_port_exception(self):
port_args = {'tenant_id': 'test tenant', 'network_id': 'test net'}
client_create_port_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException)
client_create_port_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException)
with mock.patch.object(self.neutron_api, '_has_port_binding_extension',
mock.Mock(return_value=True)):
@ -165,8 +165,9 @@ class NeutronApiTest(test.TestCase):
@mock.patch.object(neutron_api.LOG, 'exception', mock.Mock())
def test_create_port_exception_status_409(self):
port_args = {'tenant_id': 'test tenant', 'network_id': 'test net'}
client_create_port_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException(status_code=409))
client_create_port_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException(
status_code=409))
with mock.patch.object(self.neutron_api, '_has_port_binding_extension',
mock.Mock(return_value=True)):
@ -301,8 +302,8 @@ class NeutronApiTest(test.TestCase):
@mock.patch.object(neutron_api.LOG, 'exception', mock.Mock())
def test_create_network_exception(self):
net_args = {'tenant_id': 'test tenant', 'name': 'test name'}
client_create_network_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException)
client_create_network_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException)
with mock.patch.object(self.neutron_api.client, 'create_network',
client_create_network_mock):
@ -316,8 +317,8 @@ class NeutronApiTest(test.TestCase):
def test_create_subnet_exception(self):
subnet_args = {'tenant_id': 'test tenant', 'name': 'test name',
'net_id': 'test net id', 'cidr': '10.0.0.0/24'}
client_create_subnet_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException)
client_create_subnet_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException)
with mock.patch.object(self.neutron_api.client, 'create_subnet',
client_create_subnet_mock):
@ -330,8 +331,8 @@ class NeutronApiTest(test.TestCase):
@mock.patch.object(neutron_api.LOG, 'exception', mock.Mock())
def test_create_router_exception(self):
router_args = {'tenant_id': 'test tenant', 'name': 'test name'}
client_create_router_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException)
client_create_router_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException)
with mock.patch.object(self.neutron_api.client, 'create_router',
client_create_router_mock):
@ -351,8 +352,8 @@ class NeutronApiTest(test.TestCase):
def test_update_port_fixed_ips_exception(self):
port_id = 'test_port'
fixed_ips = {'fixed_ips': [{'subnet_id': 'test subnet'}]}
client_update_port_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException)
client_update_port_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException)
with mock.patch.object(self.neutron_api.client, 'update_port',
client_update_port_mock):
@ -374,8 +375,8 @@ class NeutronApiTest(test.TestCase):
router_id = 'test_router'
routes = {'routes': [{'destination': '0.0.0.0/0',
'nexthop': '8.8.8.8'}]}
client_update_router_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException)
client_update_router_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException)
with mock.patch.object(self.neutron_api.client, 'update_router',
client_update_router_mock):
@ -416,8 +417,8 @@ class NeutronApiTest(test.TestCase):
router_id = 'test port id'
subnet_id = 'test subnet id'
port_id = 'test port id'
client_add_interface_router_mock = mock.Mock(side_effect=
neutron_client_exc.NeutronClientException)
client_add_interface_router_mock = mock.Mock(
side_effect=neutron_client_exc.NeutronClientException)
with mock.patch.object(self.neutron_api.client, 'add_interface_router',
client_add_interface_router_mock):

4
manila/tests/test_service_instance.py
View File

@ -112,8 +112,8 @@ class ServiceInstanceManagerTestCase(test.TestCase):
'fake_share_network_id')
def test_get_server_ip(self):
fake_server = fake_compute.FakeServer(networks=
{CONF.service_network_name: '10.254.0.1'})
fake_server = fake_compute.FakeServer(
networks={CONF.service_network_name: '10.254.0.1'})
result = self._manager._get_server_ip(fake_server)

10
manila/tests/test_share_generic.py
View File

@ -327,8 +327,9 @@ class GenericShareDriverTestCase(test.TestCase):
self._driver._get_volume, self._context, self.share['id'])
def test_get_volume_snapshot(self):
volume_snapshot = fake_volume.FakeVolumeSnapshot(display_name=
CONF.volume_snapshot_name_template % self.snapshot['id'])
volume_snapshot = fake_volume.FakeVolumeSnapshot(
display_name=CONF.volume_snapshot_name_template %
self.snapshot['id'])
self.stubs.Set(self._driver.volume_api, 'get_all_snapshots',
mock.Mock(return_value=[volume_snapshot]))
result = self._driver._get_volume_snapshot(self._context,
@ -343,8 +344,9 @@ class GenericShareDriverTestCase(test.TestCase):
self.assertEqual(result, None)
def test_get_volume_snapshot_error(self):
volume_snapshot = fake_volume.FakeVolumeSnapshot(display_name=
CONF.volume_snapshot_name_template % self.snapshot['id'])
volume_snapshot = fake_volume.FakeVolumeSnapshot(
display_name=CONF.volume_snapshot_name_template %
self.snapshot['id'])
self.stubs.Set(self._driver.volume_api, 'get_all_snapshots',
mock.Mock(return_value=[volume_snapshot, volume_snapshot]))
self.assertRaises(exception.ManilaException,

52
manila/tests/test_share_glusterfs.py
View File

@ -246,16 +246,16 @@ class GlusterfsShareDriverTestCase(test.TestCase):
self._driver._ensure_gluster_vol_mounted)
def test_get_export_dir_dict_empty_volinfo(self):
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
expected_exec = ['true']
self.assertRaises(exception.GlusterfsException,
self._driver._get_export_dir_dict)
self.assertEqual(fake_utils.fake_execute_get_log(), expected_exec)
def test_get_export_dir_dict_failing_volinfo(self):
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
def exec_runner(*ignore_args, **ignore_kwargs):
raise RuntimeError('fake error')
@ -265,8 +265,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
self.assertEqual(fake_utils.fake_execute_get_log(), expected_exec)
def test_get_export_dir_dict_ambiguous_volinfo(self):
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
def exec_runner(*ignore_args, **ignore_kwargs):
return """<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@ -284,8 +284,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
self.assertEqual(fake_utils.fake_execute_get_log(), expected_exec)
def test_get_export_dir_dict_trivial_volinfo(self):
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
def exec_runner(*ignore_args, **ignore_kwargs):
return """<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@ -305,8 +305,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
self.assertEqual(ret, {})
def test_get_export_dir_dict(self):
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
def exec_runner(*ignore_args, **ignore_kwargs):
return """<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@ -443,8 +443,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
cbk = Mock(return_value=True)
access = {'access_type': 'ip', 'access_to': '10.0.0.1'}
self._driver._get_export_dir_dict = Mock()
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
expected_exec = []
ret = self._driver._manage_access(self._context, self.share, access,
cbk)
@ -458,8 +458,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
self._driver._get_export_dir_dict =\
Mock(return_value={'example.com': ['10.0.0.1'],
'fakename': ['10.0.0.1']})
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
expected_exec = ['true']
ret = self._driver._manage_access(self._context, self.share, access,
cbk)
@ -477,8 +477,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
self._driver._get_export_dir_dict =\
Mock(return_value={'example.com': ['10.0.0.1'],
'fakename': ['10.0.0.1']})
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
expected_exec = ['true']
def exec_runner(*ignore_args, **ignore_kw):
@ -500,8 +500,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
access = {'access_type': 'ip', 'access_to': '10.0.0.1'}
self._driver._get_export_dir_dict =\
Mock(return_value={'fakename': ['10.0.0.1']})
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
expected_exec = ['true']
ret = self._driver._manage_access(self._context, self.share, access,
cbk)
@ -519,8 +519,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
access = {'access_type': 'ip', 'access_to': '10.0.0.1'}
self._driver._get_export_dir_dict =\
Mock(return_value={'example.com': ['10.0.0.1']})
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
self._driver.allow_access(self._context, self.share, access)
self.assertTrue(self._driver.gluster_address.make_gluster_args.called)
self.assertEqual(
@ -531,16 +531,16 @@ class GlusterfsShareDriverTestCase(test.TestCase):
access = {'access_type': 'ip', 'access_to': '10.0.0.1'}
self._driver._get_export_dir_dict = \
Mock(return_value={'fakename': ['10.0.0.1']})
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
self._driver.allow_access(self._context, self.share, access)
self.assertFalse(self._driver.gluster_address.make_gluster_args.called)
def test_deny_access_with_share_having_noaccess(self):
access = {'access_type': 'ip', 'access_to': '10.0.0.1'}
self._driver._get_export_dir_dict = Mock(return_value={})
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
self._driver.deny_access(self._context, self.share, access)
self.assertFalse(self._driver.gluster_address.make_gluster_args.called)
@ -549,8 +549,8 @@ class GlusterfsShareDriverTestCase(test.TestCase):
self._driver._get_export_dir_dict = \
Mock(return_value={'fakename': ['10.0.0.1'],
'example.com': ['10.0.0.1']})
self._driver.gluster_address = Mock(make_gluster_args=
Mock(return_value=(('true',), {})))
self._driver.gluster_address = Mock(
make_gluster_args=Mock(return_value=(('true',), {})))
self._driver.deny_access(self._context, self.share, access)
self.assertTrue(self._driver.gluster_address.make_gluster_args.called)
self.assertEqual(