Drop xenapi session.get_imported_xenapi()

Historically it was used to allow the xenapi fake module to be inserted
in place of the real XenAPI module. However, it was used inconsistently
and is unnecessary now that the session carries that information as well.

Remove it by using the session.XenAPI attribute consistently, and then
removing the stubs and ensuring that the fake module gets inserted
directly into sys.modules.

Change-Id: Id058e19eb7d932abf7b07a1e4324637a8d4b2ea6

5 files changed, 17 insertions, 25 deletions

diff --git a/nova/virt/xenapi/connection.py b/nova/virt/xenapi/connection.py
index 2777fa883..4d29b7ed8 100644
--- a/nova/virt/xenapi/connection.py
+++ b/nova/virt/xenapi/connection.py
@@ -500,7 +500,8 @@ class XenAPISession(object):
     """The session to invoke XenAPI SDK calls"""
 
     def __init__(self, url, user, pw):
-        self.XenAPI = self.get_imported_xenapi()
+        import XenAPI
+        self.XenAPI = XenAPI
         self._sessions = queue.Queue()
         self.is_slave = False
         exception = self.XenAPI.Failure(_("Unable to log in to XenAPI "
@@ -558,10 +559,6 @@ class XenAPISession(object):
         product_version = software_version['product_version']
         return tuple(int(part) for part in product_version.split('.'))
 
-    def get_imported_xenapi(self):
-        """Stubout point. This can be replaced with a mock xenapi module."""
-        return __import__('XenAPI')
-
     def get_session_id(self):
         """Return a string session_id.  Used for vnc consoles."""
         with self._get_session() as session:
diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py
index 7fe8a7b77..4633695fd 100644
--- a/nova/virt/xenapi/host.py
+++ b/nova/virt/xenapi/host.py
@@ -38,7 +38,6 @@ class Host(object):
     Implements host related operations.
     """
     def __init__(self, session):
-        self.XenAPI = session.get_imported_xenapi()
         self._session = session
 
     def host_power_action(self, _host, action):
@@ -95,7 +94,7 @@ class Host(object):
                     notifications.send_update(ctxt, old_ref, new_ref)
 
                     break
-                except self.XenAPI.Failure:
+                except self._session.XenAPI.Failure:
                     LOG.exception('Unable to migrate VM %(vm_ref)s'
                                   'from %(host)s' % locals())
                     (old_ref, new_ref) = db.instance_update_and_get_original(
@@ -173,7 +172,6 @@ def call_xenhost(session, method, arg_dict):
     out that behavior.
     """
     # Create a task ID as something that won't match any instance ID
-    XenAPI = session.get_imported_xenapi()
     try:
         result = session.call_plugin('xenhost', method, args=arg_dict)
         if not result:
@@ -182,7 +180,7 @@ def call_xenhost(session, method, arg_dict):
     except ValueError:
         LOG.exception(_("Unable to get updated status"))
         return None
-    except XenAPI.Failure as e:
+    except session.XenAPI.Failure as e:
         LOG.error(_("The call to %(method)s returned "
                     "an error: %(e)s.") % locals())
         return e.details[1]
diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py
index cb00faed5..07a03d029 100644
--- a/nova/virt/xenapi/pool.py
+++ b/nova/virt/xenapi/pool.py
@@ -48,7 +48,6 @@ class ResourcePool(object):
     Implements resource pool operations.
     """
     def __init__(self, session):
-        self.XenAPI = session.get_imported_xenapi()
         host_ref = session.get_xenapi_host()
         host_rec = session.call_xenapi('host.get_record', host_ref)
         self._host_name = host_rec['hostname']
@@ -139,7 +138,7 @@ class ResourcePool(object):
                     'master_user': FLAGS.xenapi_connection_username,
                     'master_pass': FLAGS.xenapi_connection_password, }
             self._session.call_plugin('xenhost', 'host_join', args)
-        except self.XenAPI.Failure as e:
+        except self._session.XenAPI.Failure as e:
             LOG.error(_("Pool-Join failed: %(e)s") % locals())
             raise exception.AggregateError(aggregate_id=aggregate_id,
                                            action='add_to_aggregate',
@@ -158,7 +157,7 @@ class ResourcePool(object):
 
             host_ref = self._session.call_xenapi('host.get_by_uuid', host_uuid)
             self._session.call_xenapi("pool.eject", host_ref)
-        except self.XenAPI.Failure as e:
+        except self._session.XenAPI.Failure as e:
             LOG.error(_("Pool-eject failed: %(e)s") % locals())
             raise exception.AggregateError(aggregate_id=aggregate_id,
                                            action='remove_from_aggregate',
@@ -170,7 +169,7 @@ class ResourcePool(object):
             pool_ref = self._session.call_xenapi("pool.get_all")[0]
             self._session.call_xenapi("pool.set_name_label",
                                       pool_ref, aggregate_name)
-        except self.XenAPI.Failure as e:
+        except self._session.XenAPI.Failure as e:
             LOG.error(_("Unable to set up pool: %(e)s.") % locals())
             raise exception.AggregateError(aggregate_id=aggregate_id,
                                            action='add_to_aggregate',
@@ -181,7 +180,7 @@ class ResourcePool(object):
         try:
             pool_ref = self._session.call_xenapi('pool.get_all')[0]
             self._session.call_xenapi('pool.set_name_label', pool_ref, '')
-        except self.XenAPI.Failure as e:
+        except self._session.XenAPI.Failure as e:
             LOG.error(_("Pool-set_name_label failed: %(e)s") % locals())
             raise exception.AggregateError(aggregate_id=aggregate_id,
                                            action='remove_from_aggregate',
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 85fe73cd8..6af2ac9e0 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -152,7 +152,6 @@ class VMOps(object):
     Management class for VM-related tasks
     """
     def __init__(self, session):
-        self.XenAPI = session.get_imported_xenapi()
         self.compute_api = compute.API()
         self._session = session
         self.poll_rescue_last_ran = None
@@ -619,7 +618,7 @@ class VMOps(object):
             template_vm_ref, template_vdi_uuids = vm_utils.create_snapshot(
                     self._session, instance, vm_ref, label)
             return template_vm_ref, template_vdi_uuids
-        except self.XenAPI.Failure, exc:
+        except self._session.XenAPI.Failure, exc:
             LOG.error(_("Unable to Snapshot instance: %(exc)s"), locals(),
                       instance=instance)
             raise
@@ -635,7 +634,7 @@ class VMOps(object):
             _params = {'params': pickle.dumps(params)}
             self._session.call_plugin('migration', 'transfer_vhd',
                                       _params)
-        except self.XenAPI.Failure:
+        except self._session.XenAPI.Failure:
             msg = _("Failed to transfer vhd to new host")
             raise exception.MigrationError(reason=msg)
 
@@ -977,7 +976,7 @@ class VMOps(object):
                 self._session.call_xenapi('VM.hard_shutdown', vm_ref)
             else:
                 self._session.call_xenapi('VM.clean_shutdown', vm_ref)
-        except self.XenAPI.Failure, exc:
+        except self._session.XenAPI.Failure, exc:
             LOG.exception(exc)
 
     def _find_root_vdi_ref(self, vm_ref):
@@ -1038,7 +1037,7 @@ class VMOps(object):
         """Destroys a VM record."""
         try:
             self._session.call_xenapi('VM.destroy', vm_ref)
-        except self.XenAPI.Failure, exc:
+        except self._session.XenAPI.Failure, exc:
             LOG.exception(exc)
             return
 
@@ -1492,7 +1491,7 @@ class VMOps(object):
         args.update(addl_args)
         try:
             return self._session.call_plugin(plugin, method, args)
-        except self.XenAPI.Failure, e:
+        except self._session.XenAPI.Failure, e:
             err_msg = e.details[-1].splitlines()[-1]
             if 'TIMEOUT:' in err_msg:
                 LOG.error(_('TIMEOUT: The call to %(method)s timed out. '
diff --git a/nova/virt/xenapi/volumeops.py b/nova/virt/xenapi/volumeops.py
index 412b89be5..587c5877a 100644
--- a/nova/virt/xenapi/volumeops.py
+++ b/nova/virt/xenapi/volumeops.py
@@ -33,7 +33,6 @@ class VolumeOps(object):
     """
 
     def __init__(self, session):
-        self.XenAPI = session.get_imported_xenapi()
         self._session = session
 
     def create_volume_for_sm(self, volume, sr_uuid):
@@ -42,7 +41,7 @@ class VolumeOps(object):
         sm_vol_rec = {}
         try:
             sr_ref = self._session.call_xenapi("SR.get_by_uuid", sr_uuid)
-        except self.XenAPI.Failure, exc:
+        except self._session.XenAPI.Failure, exc:
             LOG.exception(exc)
             raise volume_utils.StorageError(_('Unable to get SR using uuid'))
         #Create VDI
@@ -149,7 +148,7 @@ class VolumeOps(object):
         try:
             sr_ref = self.introduce_sr(uuid, label, sr_params)
             LOG.debug(_('Introduced %(label)s as %(sr_ref)s.') % locals())
-        except self.XenAPI.Failure, exc:
+        except self._session.XenAPI.Failure, exc:
             LOG.exception(exc)
             raise volume_utils.StorageError(
                                 _('Unable to introduce Storage Repository'))
@@ -177,7 +176,7 @@ class VolumeOps(object):
         try:
             vbd_ref = vm_utils.create_vbd(self._session, vm_ref, vdi_ref,
                                           dev_number, bootable=False)
-        except self.XenAPI.Failure, exc:
+        except self._session.XenAPI.Failure, exc:
             LOG.exception(exc)
             self.forget_sr(uuid)
             raise Exception(_('Unable to use SR %(sr_ref)s for'
@@ -185,7 +184,7 @@ class VolumeOps(object):
 
         try:
             self._session.call_xenapi("VBD.plug", vbd_ref)
-        except self.XenAPI.Failure, exc:
+        except self._session.XenAPI.Failure, exc:
             LOG.exception(exc)
             self.forget_sr(uuid)
             raise Exception(_('Unable to attach volume to instance %s')