From a23454daba2ffa2dc86bee1ee1707e2edb72bc44 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Fri, 21 Oct 2016 14:47:20 +0800 Subject: [PATCH] Use function import_versioned_module from oslo.utils oslo.utils 3.17 provides similar function, just use it. Change-Id: I2739649c7443d2de9338489d6607b1fb1b092e95 --- ironic/common/image_service.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py index 6016ac11e9..891ed5698a 100644 --- a/ironic/common/image_service.py +++ b/ironic/common/image_service.py @@ -45,15 +45,10 @@ def _get_glance_session(): return _GLANCE_SESSION -def import_versioned_module(version, submodule=None): - module = 'ironic.common.glance_service.v%s' % version - if submodule: - module = '.'.join((module, submodule)) - return importutils.try_import(module) - - def GlanceImageService(client=None, version=1, context=None): - module = import_versioned_module(version, 'image_service') + module_str = 'ironic.common.glance_service' + module = importutils.import_versioned_module(module_str, version, + 'image_service') service_class = getattr(module, 'GlanceImageService') if (context is not None and CONF.glance.auth_strategy == 'keystone' and not context.auth_token):