summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/virt/powervm/exception.py2
-rw-r--r--nova/virt/powervm/operator.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/powervm/exception.py b/nova/virt/powervm/exception.py
index 1ced07cfe..be476109c 100644
--- a/nova/virt/powervm/exception.py
+++ b/nova/virt/powervm/exception.py
@@ -25,7 +25,7 @@ class PowerVMFileTransferFailed(exception.NovaException):
message = _("File '%(file_path)' transfer to PowerVM manager failed")
-class PowerVMLPARInstanceNotFound(exception.NovaException):
+class PowerVMLPARInstanceNotFound(exception.InstanceNotFound):
message = _("LPAR instance '%(instance_name)s' could not be found")
diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py
index 8b411c055..16da1d16c 100644
--- a/nova/virt/powervm/operator.py
+++ b/nova/virt/powervm/operator.py
@@ -281,8 +281,8 @@ class PowerVMOperator(object):
"PowerVM system.") % instance_name)
def _cleanup(self, instance_name):
+ lpar_id = self._get_instance(instance_name)['lpar_id']
try:
- lpar_id = self._get_instance(instance_name)['lpar_id']
vhost = self._operator.get_vhost_by_instance_id(lpar_id)
disk_name = self._operator.get_disk_name_by_vhost(vhost)