summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Rosen <arosen@nicira.com>2013-02-15 21:32:09 -0800
committerAaron Rosen <arosen@nicira.com>2013-02-15 21:33:23 -0800
commita98aefef96d214e42a421d7b4ce6cbae5034c0ad (patch)
tree79a585f1eda98770184dc34b895e0c2515cb5c3a
parentcc4cb69d02d42d1d52266d7273ad18d0ab757063 (diff)
downloadnova-a98aefef96d214e42a421d7b4ce6cbae5034c0ad.tar.gz
nova-a98aefef96d214e42a421d7b4ce6cbae5034c0ad.tar.xz
nova-a98aefef96d214e42a421d7b4ce6cbae5034c0ad.zip
clean up missing whitespace after ':'
Change-Id: I85a0348b978d4045ebb12a99f1bd9d5888a65b3b
-rw-r--r--nova/tests/api/ec2/test_cloud.py2
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_volumes.py2
-rw-r--r--nova/tests/api/openstack/fakes.py2
-rw-r--r--nova/tests/network/test_manager.py4
-rw-r--r--nova/tests/network/test_network_info.py6
-rw-r--r--nova/tests/scheduler/test_host_filters.py2
-rw-r--r--nova/tests/test_libvirt.py4
-rw-r--r--nova/utils.py2
8 files changed, 12 insertions, 12 deletions
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index f8219e7a0..0eb2b89ae 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -461,7 +461,7 @@ class CloudTestCase(test.TestCase):
sec = db.security_group_create(self.context, kwargs)
authz = self.cloud.authorize_security_group_ingress
kwargs = {'ip_permissions': [{'to_port': 81, 'from_port': 81,
- 'ip_ranges':{'1': {'cidr_ip': u'0.0.0.0/0'},
+ 'ip_ranges': {'1': {'cidr_ip': u'0.0.0.0/0'},
'2': {'cidr_ip': u'10.10.10.10/32'}},
'groups': {'1': {'user_id': u'someuser',
'group_name': u'somegroup1'}},
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index 1a8a570e8..175513e72 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -86,7 +86,7 @@ def fake_get_instance_bdms(self, context, instance):
'volume_id': FAKE_UUID_A,
'volume_size': 1},
{'id': 2,
- 'instance_uuid':instance['uuid'],
+ 'instance_uuid': instance['uuid'],
'device_name': '/dev/fake1',
'delete_on_termination': 'False',
'virtual_name': 'MyNamesVirtual',
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 3ef98b902..beb99a3f5 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -427,7 +427,7 @@ def stub_instance(id, user_id=None, project_id=None, host=None,
project_id = 'fake_project'
if metadata:
- metadata = [{'key':k, 'value':v} for k, v in metadata.items()]
+ metadata = [{'key': k, 'value': v} for k, v in metadata.items()]
elif include_fake_metadata:
metadata = [models.InstanceMetadata(key='seq', value=str(id))]
else:
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index f5a1704ec..fba565fc3 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -299,7 +299,7 @@ class FlatNetworkTestCase(test.TestCase):
[{'id': 0}]})
db.instance_get_by_uuid(mox.IgnoreArg(),
mox.IgnoreArg()).AndReturn({'security_groups':
- [{'id':0, 'name':'test'}]})
+ [{'id': 0, 'name': 'test'}]})
db.virtual_interface_get_by_instance_and_network(mox.IgnoreArg(),
mox.IgnoreArg(), mox.IgnoreArg()).AndReturn({'id': 0})
@@ -425,7 +425,7 @@ class FlatNetworkTestCase(test.TestCase):
[{'id': 0}]})
db.instance_get_by_uuid(mox.IgnoreArg(),
mox.IgnoreArg()).AndReturn({'security_groups':
- [{'id':0, 'name':'test'}]})
+ [{'id': 0, 'name': 'test'}]})
db.virtual_interface_get_by_instance_and_network(mox.IgnoreArg(),
mox.IgnoreArg(), mox.IgnoreArg()).AndReturn({'id': 0})
diff --git a/nova/tests/network/test_network_info.py b/nova/tests/network/test_network_info.py
index 3e19a4461..d2ab6a746 100644
--- a/nova/tests/network/test_network_info.py
+++ b/nova/tests/network/test_network_info.py
@@ -327,7 +327,7 @@ class NetworkInfoTests(test.TestCase):
def test_create_model(self):
ninfo = model.NetworkInfo([fake_network_cache_model.new_vif(),
fake_network_cache_model.new_vif(
- {'address':'bb:bb:bb:bb:bb:bb'})])
+ {'address': 'bb:bb:bb:bb:bb:bb'})])
self.assertEqual(ninfo.fixed_ips(),
[fake_network_cache_model.new_ip({'address': '10.10.0.2'}),
fake_network_cache_model.new_ip(
@@ -338,13 +338,13 @@ class NetworkInfoTests(test.TestCase):
vif['network']['subnets'][0]['ips'][0].add_floating_ip('192.168.1.1')
ninfo = model.NetworkInfo([vif,
fake_network_cache_model.new_vif(
- {'address':'bb:bb:bb:bb:bb:bb'})])
+ {'address': 'bb:bb:bb:bb:bb:bb'})])
self.assertEqual(ninfo.floating_ips(), ['192.168.1.1'])
def test_hydrate(self):
ninfo = model.NetworkInfo([fake_network_cache_model.new_vif(),
fake_network_cache_model.new_vif(
- {'address':'bb:bb:bb:bb:bb:bb'})])
+ {'address': 'bb:bb:bb:bb:bb:bb'})])
deserialized = model.NetworkInfo.hydrate(ninfo)
self.assertEqual(ninfo.fixed_ips(),
[fake_network_cache_model.new_ip({'address': '10.10.0.2'}),
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index edd2e0d61..53e51668c 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -1226,7 +1226,7 @@ class HostFiltersTestCase(test.TestCase):
def test_trusted_filter_untrusted_and_untrusted_passes(self):
self.oat_data = {"hosts": [{"host_name": "host1",
"trust_lvl": "untrusted",
- "vtime":timeutils.isotime()}]}
+ "vtime": timeutils.isotime()}]}
self._stub_service_is_up(True)
filt_cls = self.class_map['TrustedFilter']()
extra_specs = {'trust:trusted_host': 'untrusted'}
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index c93bb0168..40a8c579e 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -4267,11 +4267,11 @@ class LibvirtDriverTestCase(test.TestCase):
disk_info = [{'type': 'qcow2', 'path': '/test/disk',
'virt_disk_size': '10737418240',
'backing_file': '/base/disk',
- 'disk_size':'83886080'},
+ 'disk_size': '83886080'},
{'type': 'raw', 'path': '/test/disk.local',
'virt_disk_size': '10737418240',
'backing_file': '/base/disk.local',
- 'disk_size':'83886080'}]
+ 'disk_size': '83886080'}]
disk_info_text = jsonutils.dumps(disk_info)
def fake_get_instance_disk_info(instance, xml=None):
diff --git a/nova/utils.py b/nova/utils.py
index 699544daa..aaf258142 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1363,7 +1363,7 @@ def check_string_length(value, name, min_length=0, max_length=None):
msg = _("%s is not a string or unicode") % name
raise exception.InvalidInput(message=msg)
- if len(value) < min_length:
+ if len(value) < min_length:
msg = _("%(name)s has less than %(min_length)s "
"characters.") % locals()
raise exception.InvalidInput(message=msg)