diff --git a/karborclient/client.py b/karborclient/client.py index b6ca8fa..b6750dc 100644 --- a/karborclient/client.py +++ b/karborclient/client.py @@ -9,10 +9,12 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from karborclient.common import utils +from oslo_utils import importutils def Client(version, *args, **kwargs): - module = utils.import_versioned_module(version, 'client') + module = importutils.import_versioned_module( + 'karborclient', version, 'client' + ) client_class = getattr(module, 'Client') return client_class(*args, **kwargs) diff --git a/karborclient/common/utils.py b/karborclient/common/utils.py index adfdfbb..e19d544 100644 --- a/karborclient/common/utils.py +++ b/karborclient/common/utils.py @@ -19,7 +19,6 @@ import six import uuid from oslo_utils import encodeutils -from oslo_utils import importutils import prettytable @@ -49,13 +48,6 @@ def env(*vars, **kwargs): return kwargs.get('default', '') -def import_versioned_module(version, submodule=None): - module = 'karborclient.v%s' % version - if submodule: - module = '.'.join((module, submodule)) - return importutils.import_module(module) - - def _print(pt, order): if sys.version_info >= (3, 0): print(pt.get_string(sortby=order)) diff --git a/karborclient/shell.py b/karborclient/shell.py index 0a57bec..4e8de50 100644 --- a/karborclient/shell.py +++ b/karborclient/shell.py @@ -28,6 +28,8 @@ from keystoneclient import session as ksession from oslo_log import handlers from oslo_log import log as logging from oslo_utils import encodeutils +from oslo_utils import importutils + import six import six.moves.urllib.parse as urlparse @@ -150,7 +152,9 @@ class KarborShell(object): self.subcommands = {} subparsers = parser.add_subparsers(metavar='') - submodule = utils.import_versioned_module(version, 'shell') + submodule = importutils.import_versioned_module( + 'karborclient', version, 'shell' + ) self._find_actions(subparsers, submodule) self._find_actions(subparsers, self)