merge trunk

2 files changed, 5 insertions, 1 deletions

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index c79245972..36b8fecc2 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -135,7 +135,7 @@ class VMOps(object):
         """Return data about VM diagnostics"""
         vm = yield VMHelper.lookup(self._session, instance_id)
         if vm is None:
-            raise Exception("instance not present %s" % instance_id)
+            raise exception.NotFound('Instance not found %s' % instance_id)
         rec = yield self._session.get_xenapi().VM.get_record(vm)
         defer.returnValue(VMHelper.compile_diagnostics(self._session, rec))
 
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 649d5dd04..9c9bcc756 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -141,6 +141,10 @@ class XenAPIConnection(object):
         """ Return snapshot of console """
         return self._vmops.get_console_output(instance)
 
+    def get_diagnostics(self, instance_id):
+        """Return data about VM diagnostics"""
+        return self._vmops.get_diagnostics(instance_id)
+
     def attach_volume(self, instance_name, device_path, mountpoint):
         """ Attach volume storage to VM instance """
         return self._volumeops.attach_volume(instance_name,