diff --git a/openstack-common.conf b/openstack-common.conf index 5cb08da4..8bb27cb7 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -3,5 +3,4 @@ base=saharaclient module=apiclient.exceptions module=importutils -module=strutils module=cliutils diff --git a/requirements.txt b/requirements.txt index 2c7d59c1..7eb760d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ pbr>=0.6,!=0.7,<1.0 Babel>=1.3 netaddr>=0.7.12 oslo.i18n>=1.0.0 # Apache-2.0 +oslo.utils>=1.0.0 # Apache-2.0 python-keystoneclient>=0.11.1 requests>=2.2.0,!=2.4.0 six>=1.7.0 diff --git a/saharaclient/shell.py b/saharaclient/shell.py index 489138f8..8e2bb7a0 100644 --- a/saharaclient/shell.py +++ b/saharaclient/shell.py @@ -51,13 +51,13 @@ from keystoneclient.auth.identity.generic import password from keystoneclient.auth.identity.generic import token from keystoneclient.auth.identity import v3 as identity from keystoneclient import session +from oslo.utils import strutils from saharaclient.api import client from saharaclient.api import shell as shell_api from saharaclient.openstack.common.apiclient import auth from saharaclient.openstack.common.apiclient import exceptions as exc from saharaclient.openstack.common import cliutils -from saharaclient.openstack.common import strutils from saharaclient import version DEFAULT_API_VERSION = 'api'