diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-03-07 18:05:27 -0600 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-03-07 18:05:27 -0600 |
| commit | 5ec9cbcdee3de3868a47ca5ec351a9a2594ceea2 (patch) | |
| tree | e48693fd4e609eb8685ff6fd690db3e5a9005553 /nova | |
| parent | 3fc6b8cbbd1be5baffc300112a0e39a807209c36 (diff) | |
| download | nova-5ec9cbcdee3de3868a47ca5ec351a9a2594ceea2.tar.gz nova-5ec9cbcdee3de3868a47ca5ec351a9a2594ceea2.tar.xz nova-5ec9cbcdee3de3868a47ca5ec351a9a2594ceea2.zip | |
virt.xenapi.vmops._get_vm_opaque_ref assumes VM.get_record raises
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 30fa5bdd7..c0fbf96fc 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -192,14 +192,12 @@ class VMOps(object): if isinstance(instance_or_vm, basestring): ref = None try: + # check for opaque ref ref = self._session.get_xenapi().VM.get_record(instance_or_vm) - if ref != None: - # an opaque ref was passed in, return it - return instance_or_vm - except: - pass - # wasn't an opaque ref, must be an instance name - instance_name = instance_or_vm + return instance_or_vm + except self.XenAPI.Failure: + # wasn't an opaque ref, must be an instance name + instance_name = instance_or_vm # if instance_or_vm is an int/long it must be instance id elif isinstance(instance_or_vm, (int, long)): |