summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-03-07 16:34:59 -0600
committerTrey Morris <trey.morris@rackspace.com>2011-03-07 16:34:59 -0600
commit3fc6b8cbbd1be5baffc300112a0e39a807209c36 (patch)
tree3c2692964cbd6dd957eda56f0a69cba715b399ff /nova
parent59f73e3180731cec644b590d448e0da74711ae03 (diff)
downloadnova-3fc6b8cbbd1be5baffc300112a0e39a807209c36.tar.gz
nova-3fc6b8cbbd1be5baffc300112a0e39a807209c36.tar.xz
nova-3fc6b8cbbd1be5baffc300112a0e39a807209c36.zip
virt.xenapi.vmops._get_vm_opaque_ref checks for basestring instance instead of str
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/xenapi/vmops.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index ae4609418..30fa5bdd7 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -189,7 +189,7 @@ class VMOps(object):
a vm name or a vm instance, and want a vm instance in return.
"""
# if instance_or_vm is a string it must be opaque ref or instance name
- if isinstance(instance_or_vm, str):
+ if isinstance(instance_or_vm, basestring):
ref = None
try:
ref = self._session.get_xenapi().VM.get_record(instance_or_vm)