diff options
| author | Armando Migliaccio <armando.migliaccio@citrix.com> | 2011-03-28 12:08:43 +0100 |
|---|---|---|
| committer | Armando Migliaccio <armando.migliaccio@citrix.com> | 2011-03-28 12:08:43 +0100 |
| commit | 184fa8239d54d20ff294cdb019d07989ed3d6c4d (patch) | |
| tree | 78027b0132063fe2caf5ea926dcaf984927f7b8c /nova/virt | |
| parent | df946c08acba6fe1234b13f04d3c46c3973647c2 (diff) | |
addressed termies review (third round)
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/fake.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index d084c725f..d79312a60 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -60,7 +60,7 @@ from nova import exception from nova import log as logging -_CLASSES = ['host', 'network', 'session', 'SR', 'VBD',\ +_CLASSES = ['host', 'network', 'session', 'SR', 'VBD', \ 'PBD', 'VDI', 'VIF', 'PIF', 'VM', 'VLAN', 'task'] _db_content = {} diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 08046318e..147419f90 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -668,7 +668,7 @@ class VMOps(object): self._wait_with_callback(instance.id, task, callback) def suspend(self, instance, callback): - """Suspend the specified instance""" + """Suspend the specified instance.""" vm_ref = self._get_vm_opaque_ref(instance) task = self._session.call_xenapi('Async.VM.suspend', vm_ref) self._wait_with_callback(instance.id, task, callback) @@ -686,6 +686,7 @@ class VMOps(object): - shutdown the instance VM. - set 'bootlock' to prevent the instance from starting in rescue. - spawn a rescue VM (the vm name-label will be instance-N-rescue). + """ rescue_vm_ref = VMHelper.lookup(self._session, "%s-rescue" % instance.name) |