OpenStack Compute (nova)

Merge lp:~jason-koelker/nova/lp762047 into lp:~hudson-openstack/nova/trunk

  1. lp762047
  2. Merge into trunk
Proposed by Jason Kölker
Status: Merged
Approved by: Vish Ishaya
Approved revision: 993
Merged at revision: 1002
Proposed branch: lp:~jason-koelker/nova/lp762047
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 101 lines (+8/-14)
6 files modified
nova/api/openstack/contrib/volumes.py (+1/-2)
nova/image/fake.py (+1/-2)
nova/tests/api/openstack/test_image_metadata.py (+2/-4)
nova/tests/api/openstack/test_server_metadata.py (+1/-2)
nova/tests/api/openstack/test_versions.py (+2/-4)
nova/virt/vmwareapi/vim.py (+1/-0)
To merge this branch: bzr merge lp:~jason-koelker/nova/lp762047
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Josh Kearney (community) Approve
Review via email: mp+57941@code.launchpad.net

Commit message

pep8 fixes

To post a comment you must log in.
Revision history for this message
Josh Kearney (jk0) wrote :

lgtm

review: Approve
Revision history for this message
Jason Kölker (jason-koelker) wrote :

I had to rewite the history on this branch to remove the unicode characters from my name.

lp:~jason-koelker/nova/lp762047 updated
993. By Jason Kölker

pep8 fixes

Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nova/api/openstack/contrib/volumes.py'
--- nova/api/openstack/contrib/volumes.py 2011-03-30 00:22:20 +0000
+++ nova/api/openstack/contrib/volumes.py 2011-04-18 20:51:44 +0000
@@ -322,8 +322,7 @@
322 # Does this matter?322 # Does this matter?
323 res = extensions.ResourceExtension('volumes',323 res = extensions.ResourceExtension('volumes',
324 VolumeController(),324 VolumeController(),
325 collection_actions={'detail': 'GET'}325 collection_actions={'detail': 'GET'})
326 )
327 resources.append(res)326 resources.append(res)
328327
329 res = extensions.ResourceExtension('volume_attachments',328 res = extensions.ResourceExtension('volume_attachments',
330329
=== modified file 'nova/image/fake.py'
--- nova/image/fake.py 2011-03-30 19:34:10 +0000
+++ nova/image/fake.py 2011-04-18 20:51:44 +0000
@@ -47,8 +47,7 @@
47 'container_format': 'ami',47 'container_format': 'ami',
48 'disk_format': 'raw',48 'disk_format': 'raw',
49 'properties': {'kernel_id': FLAGS.null_kernel,49 'properties': {'kernel_id': FLAGS.null_kernel,
50 'ramdisk_id': FLAGS.null_kernel}50 'ramdisk_id': FLAGS.null_kernel}}
51 }
52 self.create(None, image)51 self.create(None, image)
53 super(FakeImageService, self).__init__()52 super(FakeImageService, self).__init__()
5453
5554
=== modified file 'nova/tests/api/openstack/test_image_metadata.py'
--- nova/tests/api/openstack/test_image_metadata.py 2011-04-08 07:58:48 +0000
+++ nova/tests/api/openstack/test_image_metadata.py 2011-04-18 20:51:44 +0000
@@ -46,8 +46,7 @@
46 'deleted_at': None,46 'deleted_at': None,
47 'properties': {47 'properties': {
48 'key1': 'value1',48 'key1': 'value1',
49 'key2': 'value2'49 'key2': 'value2'},
50 },
51 'size': 5882349},50 'size': 5882349},
52 {'status': 'active',51 {'status': 'active',
53 'name': 'image2',52 'name': 'image2',
@@ -62,8 +61,7 @@
62 'deleted_at': None,61 'deleted_at': None,
63 'properties': {62 'properties': {
64 'key1': 'value1',63 'key1': 'value1',
65 'key2': 'value2'64 'key2': 'value2'},
66 },
67 'size': 5882349},65 'size': 5882349},
68 {'status': 'active',66 {'status': 'active',
69 'name': 'image3',67 'name': 'image3',
7068
=== modified file 'nova/tests/api/openstack/test_server_metadata.py'
--- nova/tests/api/openstack/test_server_metadata.py 2011-03-24 17:52:20 +0000
+++ nova/tests/api/openstack/test_server_metadata.py 2011-04-18 20:51:44 +0000
@@ -48,8 +48,7 @@
48 "key2": "value2",48 "key2": "value2",
49 "key3": "value3",49 "key3": "value3",
50 "key4": "value4",50 "key4": "value4",
51 "key5": "value5"51 "key5": "value5"}
52 }
53 return metadata52 return metadata
5453
5554
5655
=== modified file 'nova/tests/api/openstack/test_versions.py'
--- nova/tests/api/openstack/test_versions.py 2011-03-29 16:04:43 +0000
+++ nova/tests/api/openstack/test_versions.py 2011-04-18 20:51:44 +0000
@@ -47,8 +47,7 @@
47 {47 {
48 "rel": "self",48 "rel": "self",
49 "href": "http://localhost/v1.1",49 "href": "http://localhost/v1.1",
50 }50 }],
51 ],
52 },51 },
53 {52 {
54 "id": "v1.0",53 "id": "v1.0",
@@ -57,8 +56,7 @@
57 {56 {
58 "rel": "self",57 "rel": "self",
59 "href": "http://localhost/v1.0",58 "href": "http://localhost/v1.0",
60 }59 }],
61 ],
62 },60 },
63 ]61 ]
64 self.assertEqual(versions, expected)62 self.assertEqual(versions, expected)
6563
=== modified file 'nova/virt/vmwareapi/vim.py'
--- nova/virt/vmwareapi/vim.py 2011-03-31 21:19:59 +0000
+++ nova/virt/vmwareapi/vim.py 2011-04-18 20:51:44 +0000
@@ -43,6 +43,7 @@
4343
4444
45if suds:45if suds:
46
46 class VIMMessagePlugin(suds.plugin.MessagePlugin):47 class VIMMessagePlugin(suds.plugin.MessagePlugin):
4748
48 def addAttributeForValue(self, node):49 def addAttributeForValue(self, node):