OpenStack Compute (Nova)

Merge lp:~vivekys/nova/lp788550 into lp:~hudson-openstack/nova/trunk

Proposed by vivek.ys on 2011-05-31
Status: Merged
Approved by: Devin Carlen on 2011-05-31
Approved revision: 1120
Merged at revision: 1121
Proposed branch: lp:~vivekys/nova/lp788550
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 38 lines (+4/-3) 2 files modified
To merge this branch: bzr merge lp:~vivekys/nova/lp788550
Reviewer Review Type Date Requested Status
Alex Meade (community) Approve on 2011-05-31
Devin Carlen (community) Approve on 2011-05-31
Brian Waldon (community) 2011-05-31 Approve on 2011-05-31
Review via email: mp+62991@code.launchpad.net

Description of the Change

Fixed the APIError typo

To post a comment you must log in.
Brian Waldon (bcwaldon) wrote :

Looks good.

review: Approve
Alex Meade (alex-meade) wrote :

This is a good catch, you'll need to add your name to the Authors file though

review: Needs Fixing
lp:~vivekys/nova/lp788550 updated on 2011-05-31
1120. By Vivek YS <email address hidden> on 2011-05-31

Added myself to Authors file

Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Alex Meade (alex-meade) wrote :

:)

review: Approve

Preview Diff

1=== modified file 'Authors'
2--- Authors 2011-05-27 04:37:39 +0000
3+++ Authors 2011-05-31 15:41:17 +0000
4@@ -84,6 +84,7 @@
5 Tushar Patil <tushar.vitthal.patil@gmail.com>
6 Vasiliy Shlykov <vash@vasiliyshlykov.org>
7 Vishvananda Ishaya <vishvananda@gmail.com>
8+Vivek Y S <vivek.ys@gmail.com>
9 William Wolf <throughnothing@gmail.com>
10 Yoshiaki Tamura <yoshi@midokura.jp>
11 Youcef Laribi <Youcef.Laribi@eu.citrix.com>
12
13=== modified file 'nova/virt/vmwareapi/vmops.py'
14--- nova/virt/vmwareapi/vmops.py 2011-04-26 22:48:28 +0000
15+++ nova/virt/vmwareapi/vmops.py 2011-05-31 15:41:17 +0000
16@@ -590,11 +590,11 @@
17
18 def pause(self, instance, callback):
19 """Pause a VM instance."""
20- raise exception.APIError("pause not supported for vmwareapi")
21+ raise exception.ApiError("pause not supported for vmwareapi")
22
23 def unpause(self, instance, callback):
24 """Un-Pause a VM instance."""
25- raise exception.APIError("unpause not supported for vmwareapi")
26+ raise exception.ApiError("unpause not supported for vmwareapi")
27
28 def suspend(self, instance, callback):
29 """Suspend the specified instance."""
30@@ -673,7 +673,7 @@
31
32 def get_diagnostics(self, instance):
33 """Return data about VM diagnostics."""
34- raise exception.APIError("get_diagnostics not implemented for "
35+ raise exception.ApiError("get_diagnostics not implemented for "
36 "vmwareapi")
37
38 def get_console_output(self, instance):