From b951bd5ea0557bf2a888de780c2a149495537c5f Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Wed, 19 Oct 2016 20:40:29 +0800
Subject: [PATCH] Remove all the openstack dir

Remove all the openstack dir

Change-Id: I7214c3835686c4a2fa2ed237667e717de5af96a7
---
 solumclient/builder/client.py                 |  2 +-
 solumclient/builder/v1/client.py              |  2 +-
 solumclient/builder/v1/image.py               |  2 +-
 solumclient/client.py                         |  2 +-
 .../apiclient}/__init__.py                    |  0
 .../{openstack => }/common/apiclient/auth.py  | 13 ++++------
 .../{openstack => }/common/apiclient/base.py  |  5 ++--
 .../common/apiclient/client.py                |  9 +++----
 .../common/apiclient/exceptions.py            |  6 ++---
 .../common/apiclient/fake_client.py           | 26 ++++++++-----------
 solumclient/common/auth.py                    |  4 +--
 solumclient/common/base.py                    |  4 +--
 solumclient/common/client.py                  |  2 +-
 solumclient/common/cliutils.py                |  2 +-
 solumclient/common/exc.py                     |  2 +-
 solumclient/openstack/common/__init__.py      | 17 ------------
 .../openstack/common/apiclient/__init__.py    |  0
 solumclient/solum.py                          |  2 +-
 solumclient/tests/builder/test_client.py      |  2 +-
 solumclient/tests/builder/v1/test_image.py    |  2 +-
 solumclient/tests/common/test_base.py         |  6 ++---
 solumclient/tests/common/test_client.py       |  6 ++---
 solumclient/tests/common/test_exc.py          |  2 +-
 solumclient/tests/test_client.py              |  2 +-
 solumclient/tests/test_solum.py               |  2 +-
 solumclient/tests/v1/test_component.py        |  4 +--
 solumclient/tests/v1/test_languagepack.py     |  2 +-
 solumclient/tests/v1/test_pipeline.py         |  4 +--
 solumclient/tests/v1/test_plan.py             |  2 +-
 solumclient/tests/v1/test_platform.py         |  2 +-
 solumclient/v1/app.py                         |  4 +--
 solumclient/v1/client.py                      |  2 +-
 solumclient/v1/component.py                   |  4 +--
 solumclient/v1/languagepack.py                |  2 +-
 solumclient/v1/pipeline.py                    |  4 +--
 solumclient/v1/plan.py                        |  4 +--
 solumclient/v1/platform.py                    |  2 +-
 solumclient/v1/workflow.py                    |  4 +--
 38 files changed, 67 insertions(+), 95 deletions(-)
 rename solumclient/{openstack => common/apiclient}/__init__.py (100%)
 rename solumclient/{openstack => }/common/apiclient/auth.py (96%)
 rename solumclient/{openstack => }/common/apiclient/base.py (99%)
 rename solumclient/{openstack => }/common/apiclient/client.py (98%)
 rename solumclient/{openstack => }/common/apiclient/exceptions.py (99%)
 rename solumclient/{openstack => }/common/apiclient/fake_client.py (91%)
 delete mode 100644 solumclient/openstack/common/__init__.py
 delete mode 100644 solumclient/openstack/common/apiclient/__init__.py

diff --git a/solumclient/builder/client.py b/solumclient/builder/client.py
index a6a4ef7..f87baf6 100644
--- a/solumclient/builder/client.py
+++ b/solumclient/builder/client.py
@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import client as api_client
 from solumclient.common import auth
 from solumclient.common import client
-from solumclient.openstack.common.apiclient import client as api_client
 
 API_NAME = 'builder'
 VERSION_MAP = {
diff --git a/solumclient/builder/v1/client.py b/solumclient/builder/v1/client.py
index 616ea13..f39e94c 100644
--- a/solumclient/builder/v1/client.py
+++ b/solumclient/builder/v1/client.py
@@ -13,7 +13,7 @@
 # under the License.
 
 from solumclient.builder.v1 import image
-from solumclient.openstack.common.apiclient import client
+from solumclient.common.apiclient import client
 
 
 class Client(client.BaseClient):
diff --git a/solumclient/builder/v1/image.py b/solumclient/builder/v1/image.py
index 0eb6d71..142230c 100644
--- a/solumclient/builder/v1/image.py
+++ b/solumclient/builder/v1/image.py
@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import base as apiclient_base
 from solumclient.common import base as solum_base
-from solumclient.openstack.common.apiclient import base as apiclient_base
 
 
 class Image(apiclient_base.Resource):
diff --git a/solumclient/client.py b/solumclient/client.py
index 6b6577c..3d138ba 100644
--- a/solumclient/client.py
+++ b/solumclient/client.py
@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import client as api_client
 from solumclient.common import auth
 from solumclient.common import client
-from solumclient.openstack.common.apiclient import client as api_client
 
 API_NAME = 'solum'
 VERSION_MAP = {
diff --git a/solumclient/openstack/__init__.py b/solumclient/common/apiclient/__init__.py
similarity index 100%
rename from solumclient/openstack/__init__.py
rename to solumclient/common/apiclient/__init__.py
diff --git a/solumclient/openstack/common/apiclient/auth.py b/solumclient/common/apiclient/auth.py
similarity index 96%
rename from solumclient/openstack/common/apiclient/auth.py
rename to solumclient/common/apiclient/auth.py
index d370cfa..d003d50 100644
--- a/solumclient/openstack/common/apiclient/auth.py
+++ b/solumclient/common/apiclient/auth.py
@@ -24,7 +24,7 @@ import os
 import six
 from stevedore import extension
 
-from solumclient.openstack.common.apiclient import exceptions
+from solumclient.common.apiclient import exceptions
 
 
 _discovered_plugins = {}
@@ -41,7 +41,7 @@ def discover_auth_systems():
     def add_plugin(ext):
         _discovered_plugins[ext.name] = ext.plugin
 
-    ep_namespace = "solumclient.openstack.common.apiclient.auth"
+    ep_namespace = "solumclient.common.apiclient.auth"
     mgr = extension.ExtensionManager(ep_namespace)
     mgr.map(add_plugin)
 
@@ -143,8 +143,7 @@ class BaseAuthPlugin(object):
 
     @classmethod
     def add_opts(cls, parser):
-        """Populate the parser with the options for this plugin.
-        """
+        """Populate the parser with the options for this plugin."""
         for opt in cls.opt_names:
             # use `BaseAuthPlugin.common_opt_names` since it is never
             # changed in child classes
@@ -153,8 +152,7 @@ class BaseAuthPlugin(object):
 
     @classmethod
     def add_common_opts(cls, parser):
-        """Add options that are common for several plugins.
-        """
+        """Add options that are common for several plugins."""
         for opt in cls.common_opt_names:
             cls._parser_add_opt(parser, opt)
 
@@ -191,8 +189,7 @@ class BaseAuthPlugin(object):
 
     @abc.abstractmethod
     def _do_authenticate(self, http_client):
-        """Protected method for authentication.
-        """
+        """Protected method for authentication."""
 
     def sufficient_options(self):
         """Check if all required options are present.
diff --git a/solumclient/openstack/common/apiclient/base.py b/solumclient/common/apiclient/base.py
similarity index 99%
rename from solumclient/openstack/common/apiclient/base.py
rename to solumclient/common/apiclient/base.py
index 6c9da18..c3b75ab 100644
--- a/solumclient/openstack/common/apiclient/base.py
+++ b/solumclient/common/apiclient/base.py
@@ -29,8 +29,8 @@ import copy
 import six
 from six.moves.urllib import parse
 
+from solumclient.common.apiclient import exceptions
 from solumclient.i18n import _
-from solumclient.openstack.common.apiclient import exceptions
 
 from oslo_utils import strutils
 
@@ -454,8 +454,7 @@ class Resource(object):
 
     @property
     def human_id(self):
-        """Human-readable ID which can be used for bash completion.
-        """
+        """Human-readable ID which can be used for bash completion."""
         if self.HUMAN_ID:
             name = getattr(self, self.NAME_ATTR, None)
             if name is not None:
diff --git a/solumclient/openstack/common/apiclient/client.py b/solumclient/common/apiclient/client.py
similarity index 98%
rename from solumclient/openstack/common/apiclient/client.py
rename to solumclient/common/apiclient/client.py
index f8eb3f8..53cb7a8 100644
--- a/solumclient/openstack/common/apiclient/client.py
+++ b/solumclient/common/apiclient/client.py
@@ -32,13 +32,12 @@ try:
 except ImportError:
     import json
 
-import requests
-
 from oslo_log import log as logging
 from oslo_utils import importutils
+import requests
 
+from solumclient.common.apiclient import exceptions
 from solumclient.i18n import _
-from solumclient.openstack.common.apiclient import exceptions
 
 
 _logger = logging.getLogger(__name__)
@@ -63,7 +62,7 @@ class HTTPClient(object):
       into terminal and send the same request with curl.
     """
 
-    user_agent = "solumclient.openstack.common.apiclient"
+    user_agent = "solumclient.common.apiclient"
 
     def __init__(self,
                  auth_plugin,
@@ -286,7 +285,7 @@ class HTTPClient(object):
 
         >>> def test_clients():
         ...     from keystoneclient.auth import keystone
-        ...     from openstack.common.apiclient import client
+        ...     from openstack.apiclient import client
         ...     auth = keystone.KeystoneAuthPlugin(
         ...         username="user", password="pass", tenant_name="tenant",
         ...         auth_url="http://auth:5000/v2.0")
diff --git a/solumclient/openstack/common/apiclient/exceptions.py b/solumclient/common/apiclient/exceptions.py
similarity index 99%
rename from solumclient/openstack/common/apiclient/exceptions.py
rename to solumclient/common/apiclient/exceptions.py
index 6e97abd..1e1810c 100644
--- a/solumclient/openstack/common/apiclient/exceptions.py
+++ b/solumclient/common/apiclient/exceptions.py
@@ -29,8 +29,7 @@ from solumclient.i18n import _
 
 
 class ClientException(Exception):
-    """The base exception class for all exceptions this library raises.
-    """
+    """The base exception class for all exceptions this library raises."""
     pass
 
 
@@ -108,8 +107,7 @@ class AmbiguousEndpoints(EndpointException):
 
 
 class HttpError(ClientException):
-    """The base exception class for all HTTP exceptions.
-    """
+    """The base exception class for all HTTP exceptions."""
     http_status = 0
     message = _("HTTP Error")
 
diff --git a/solumclient/openstack/common/apiclient/fake_client.py b/solumclient/common/apiclient/fake_client.py
similarity index 91%
rename from solumclient/openstack/common/apiclient/fake_client.py
rename to solumclient/common/apiclient/fake_client.py
index 0ba77cf..883290d 100644
--- a/solumclient/openstack/common/apiclient/fake_client.py
+++ b/solumclient/common/apiclient/fake_client.py
@@ -30,7 +30,7 @@ import requests
 import six
 from six.moves.urllib import parse
 
-from solumclient.openstack.common.apiclient import client
+from solumclient.common.apiclient import client
 
 
 def assert_has_keys(dct, required=None, optional=None):
@@ -46,8 +46,7 @@ def assert_has_keys(dct, required=None, optional=None):
 
 
 class TestResponse(requests.Response):
-    """Wrap requests.Response and provide a convenient initialization.
-    """
+    """Wrap requests.Response and provide a convenient initialization."""
 
     def __init__(self, data):
         super(TestResponse, self).__init__()
@@ -86,15 +85,14 @@ class FakeHTTPClient(client.HTTPClient):
         super(FakeHTTPClient, self).__init__(*args, **kwargs)
 
     def assert_called(self, method, url, body=None, pos=-1):
-        """Assert than an API method was just called.
-        """
+        """Assert than an API method was just called."""
         expected = (method, url)
         called = self.callstack[pos][0:2]
-        assert self.callstack, \
-            "Expected %s %s but no calls were made." % expected
+        assert (self.callstack,
+                "Expected %s %s but no calls were made." % expected)
 
-        assert expected == called, 'Expected %s %s; got %s %s' % \
-            (expected + called)
+        assert expected == called, 'Expected %s %s; got %s %s' % (
+            expected + called)
 
         if body is not None:
             if self.callstack[pos][3] != body:
@@ -102,12 +100,11 @@ class FakeHTTPClient(client.HTTPClient):
                                      (self.callstack[pos][3], body))
 
     def assert_called_anytime(self, method, url, body=None):
-        """Assert than an API method was called anytime in the test.
-        """
+        """Assert than an API method was called anytime in the test."""
         expected = (method, url)
 
-        assert self.callstack, \
-            "Expected %s %s but no calls were made." % expected
+        assert (self.callstack,
+                "Expected %s %s but no calls were made." % expected)
 
         found = False
         entry = None
@@ -116,8 +113,7 @@ class FakeHTTPClient(client.HTTPClient):
                 found = True
                 break
 
-        assert found, 'Expected %s %s; got %s' % \
-            (method, url, self.callstack)
+        assert found, 'Expected %s %s; got %s' % (method, url, self.callstack)
         if body is not None:
             assert entry[3] == body, "%s != %s" % (entry[3], body)
 
diff --git a/solumclient/common/auth.py b/solumclient/common/auth.py
index 4837e55..009ff5c 100644
--- a/solumclient/common/auth.py
+++ b/solumclient/common/auth.py
@@ -14,8 +14,8 @@
 
 from keystoneclient.v2_0 import client as ksclient
 
-from solumclient.openstack.common.apiclient import auth
-from solumclient.openstack.common.apiclient import exceptions
+from solumclient.common.apiclient import auth
+from solumclient.common.apiclient import exceptions
 
 
 class KeystoneAuthPlugin(auth.BaseAuthPlugin):
diff --git a/solumclient/common/base.py b/solumclient/common/base.py
index 0d4c9b5..7decaed 100644
--- a/solumclient/common/base.py
+++ b/solumclient/common/base.py
@@ -14,8 +14,8 @@
 
 from six.moves.urllib import parse as urlparse
 
-from solumclient.openstack.common.apiclient import base
-from solumclient.openstack.common.apiclient import exceptions
+from solumclient.common.apiclient import base
+from solumclient.common.apiclient import exceptions
 
 
 class FindMixin(object):
diff --git a/solumclient/common/client.py b/solumclient/common/client.py
index 9f7a2e9..dfdf1b9 100644
--- a/solumclient/common/client.py
+++ b/solumclient/common/client.py
@@ -16,9 +16,9 @@ import time
 
 from oslo_log import log as logging
 
+from solumclient.common.apiclient import client as api_client
 from solumclient.common import exc
 from solumclient import config
-from solumclient.openstack.common.apiclient import client as api_client
 
 
 _logger = logging.getLogger(__name__)
diff --git a/solumclient/common/cliutils.py b/solumclient/common/cliutils.py
index 5746ddc..31f1bad 100644
--- a/solumclient/common/cliutils.py
+++ b/solumclient/common/cliutils.py
@@ -28,8 +28,8 @@ import prettytable
 import six
 from six import moves
 
+from solumclient.common.apiclient import exceptions
 from solumclient.i18n import _
-from solumclient.openstack.common.apiclient import exceptions
 
 from oslo_utils import encodeutils
 from oslo_utils import strutils
diff --git a/solumclient/common/exc.py b/solumclient/common/exc.py
index 51dcae0..f11460e 100644
--- a/solumclient/common/exc.py
+++ b/solumclient/common/exc.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from solumclient.openstack.common.apiclient import exceptions
+from solumclient.common.apiclient import exceptions
 
 
 class CommandException(Exception):
diff --git a/solumclient/openstack/common/__init__.py b/solumclient/openstack/common/__init__.py
deleted file mode 100644
index d1223ea..0000000
--- a/solumclient/openstack/common/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import six
-
-
-six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox'))
diff --git a/solumclient/openstack/common/apiclient/__init__.py b/solumclient/openstack/common/apiclient/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/solumclient/solum.py b/solumclient/solum.py
index 9004e2d..e8eec09 100644
--- a/solumclient/solum.py
+++ b/solumclient/solum.py
@@ -48,12 +48,12 @@ from keystoneclient.v2_0 import client as keystoneclient
 import six
 
 import solumclient
+from solumclient.common.apiclient import exceptions
 from solumclient.common import cli_utils
 from solumclient.common import exc
 from solumclient.common import github
 from solumclient.common import yamlutils
 from solumclient import config
-from solumclient.openstack.common.apiclient import exceptions
 from solumclient.v1 import app as cli_app
 from solumclient.v1 import languagepack as cli_lp
 from solumclient.v1 import pipeline as cli_pipe
diff --git a/solumclient/tests/builder/test_client.py b/solumclient/tests/builder/test_client.py
index 02b65a5..70a12fa 100644
--- a/solumclient/tests/builder/test_client.py
+++ b/solumclient/tests/builder/test_client.py
@@ -15,8 +15,8 @@
 import mock
 
 from solumclient.builder import client
+from solumclient.common.apiclient import exceptions
 from solumclient.common import auth
-from solumclient.openstack.common.apiclient import exceptions
 from solumclient.tests import base
 
 
diff --git a/solumclient/tests/builder/v1/test_image.py b/solumclient/tests/builder/v1/test_image.py
index 43747bb..3480dd3 100644
--- a/solumclient/tests/builder/v1/test_image.py
+++ b/solumclient/tests/builder/v1/test_image.py
@@ -14,7 +14,7 @@
 
 from solumclient.builder.v1 import client as builder_client
 from solumclient.builder.v1 import image
-from solumclient.openstack.common.apiclient import fake_client
+from solumclient.common.apiclient import fake_client
 from solumclient.tests import base
 
 image_fixture = {
diff --git a/solumclient/tests/common/test_base.py b/solumclient/tests/common/test_base.py
index 08cd484..4617c70 100644
--- a/solumclient/tests/common/test_base.py
+++ b/solumclient/tests/common/test_base.py
@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from solumclient.openstack.common.apiclient import base
-from solumclient.openstack.common.apiclient import client
-from solumclient.openstack.common.apiclient import fake_client
+from solumclient.common.apiclient import base
+from solumclient.common.apiclient import client
+from solumclient.common.apiclient import fake_client
 from solumclient.tests import base as test_base
 
 
diff --git a/solumclient/tests/common/test_client.py b/solumclient/tests/common/test_client.py
index f93000a..470f6a4 100644
--- a/solumclient/tests/common/test_client.py
+++ b/solumclient/tests/common/test_client.py
@@ -15,10 +15,10 @@
 import mock
 import requests
 
+from solumclient.common.apiclient import auth
+from solumclient.common.apiclient import client as api_client
+from solumclient.common.apiclient import exceptions
 from solumclient.common import client
-from solumclient.openstack.common.apiclient import auth
-from solumclient.openstack.common.apiclient import client as api_client
-from solumclient.openstack.common.apiclient import exceptions
 from solumclient.tests import base
 
 
diff --git a/solumclient/tests/common/test_exc.py b/solumclient/tests/common/test_exc.py
index b964016..8e11a42 100644
--- a/solumclient/tests/common/test_exc.py
+++ b/solumclient/tests/common/test_exc.py
@@ -14,8 +14,8 @@
 
 import six
 
+from solumclient.common.apiclient import exceptions
 from solumclient.common import exc
-from solumclient.openstack.common.apiclient import exceptions
 from solumclient.tests import base
 
 
diff --git a/solumclient/tests/test_client.py b/solumclient/tests/test_client.py
index 4cb6f7c..a6ae287 100644
--- a/solumclient/tests/test_client.py
+++ b/solumclient/tests/test_client.py
@@ -15,8 +15,8 @@
 import mock
 
 from solumclient import client
+from solumclient.common.apiclient import exceptions
 from solumclient.common import auth
-from solumclient.openstack.common.apiclient import exceptions
 from solumclient.tests import base
 
 
diff --git a/solumclient/tests/test_solum.py b/solumclient/tests/test_solum.py
index 4358795..2445c1a 100644
--- a/solumclient/tests/test_solum.py
+++ b/solumclient/tests/test_solum.py
@@ -24,8 +24,8 @@ from stevedore import extension
 from testtools import matchers
 
 from solumclient import client
+from solumclient.common.apiclient import auth
 from solumclient.common import yamlutils
-from solumclient.openstack.common.apiclient import auth
 from solumclient import solum
 from solumclient.tests import base
 from solumclient.v1 import component
diff --git a/solumclient/tests/v1/test_component.py b/solumclient/tests/v1/test_component.py
index c176416..15d1432 100644
--- a/solumclient/tests/v1/test_component.py
+++ b/solumclient/tests/v1/test_component.py
@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from solumclient.openstack.common.apiclient import exceptions
-from solumclient.openstack.common.apiclient import fake_client
+from solumclient.common.apiclient import exceptions
+from solumclient.common.apiclient import fake_client
 from solumclient.tests import base
 from solumclient.v1 import client as sclient
 from solumclient.v1 import component
diff --git a/solumclient/tests/v1/test_languagepack.py b/solumclient/tests/v1/test_languagepack.py
index 3615f38..2f52eb0 100644
--- a/solumclient/tests/v1/test_languagepack.py
+++ b/solumclient/tests/v1/test_languagepack.py
@@ -13,7 +13,7 @@
 # under the License.
 
 from solumclient.builder.v1 import image
-from solumclient.openstack.common.apiclient import fake_client
+from solumclient.common.apiclient import fake_client
 from solumclient.tests import base
 from solumclient.v1 import client as sclient
 from solumclient.v1 import languagepack
diff --git a/solumclient/tests/v1/test_pipeline.py b/solumclient/tests/v1/test_pipeline.py
index df556e5..82999f9 100644
--- a/solumclient/tests/v1/test_pipeline.py
+++ b/solumclient/tests/v1/test_pipeline.py
@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from solumclient.openstack.common.apiclient import exceptions
-from solumclient.openstack.common.apiclient import fake_client
+from solumclient.common.apiclient import exceptions
+from solumclient.common.apiclient import fake_client
 from solumclient.tests import base
 from solumclient.v1 import client as sclient
 from solumclient.v1 import pipeline
diff --git a/solumclient/tests/v1/test_plan.py b/solumclient/tests/v1/test_plan.py
index e2292e0..753d449 100644
--- a/solumclient/tests/v1/test_plan.py
+++ b/solumclient/tests/v1/test_plan.py
@@ -14,7 +14,7 @@
 
 import mock
 
-from solumclient.openstack.common.apiclient import fake_client
+from solumclient.common.apiclient import fake_client
 from solumclient.tests import base
 from solumclient.v1 import client as sclient
 from solumclient.v1 import plan
diff --git a/solumclient/tests/v1/test_platform.py b/solumclient/tests/v1/test_platform.py
index 8e1c871..8c59e91 100644
--- a/solumclient/tests/v1/test_platform.py
+++ b/solumclient/tests/v1/test_platform.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from solumclient.openstack.common.apiclient import fake_client
+from solumclient.common.apiclient import fake_client
 from solumclient.tests import base
 from solumclient.v1 import client as sclient
 from solumclient.v1 import platform
diff --git a/solumclient/v1/app.py b/solumclient/v1/app.py
index 1913668..5052b54 100644
--- a/solumclient/v1/app.py
+++ b/solumclient/v1/app.py
@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import base as apiclient_base
+from solumclient.common.apiclient import exceptions
 from solumclient.common import base as solum_base
 from solumclient.common import exc
-from solumclient.openstack.common.apiclient import base as apiclient_base
-from solumclient.openstack.common.apiclient import exceptions
 
 from oslo_utils import uuidutils
 
diff --git a/solumclient/v1/client.py b/solumclient/v1/client.py
index 5b9a8b9..8db4d08 100644
--- a/solumclient/v1/client.py
+++ b/solumclient/v1/client.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from solumclient.openstack.common.apiclient import client
+from solumclient.common.apiclient import client
 from solumclient.v1 import app
 from solumclient.v1 import component
 from solumclient.v1 import languagepack
diff --git a/solumclient/v1/component.py b/solumclient/v1/component.py
index eb1c613..7c39246 100644
--- a/solumclient/v1/component.py
+++ b/solumclient/v1/component.py
@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import base as apiclient_base
+from solumclient.common.apiclient import exceptions
 from solumclient.common import base as solum_base
 from solumclient.common import exc
-from solumclient.openstack.common.apiclient import base as apiclient_base
-from solumclient.openstack.common.apiclient import exceptions
 
 from oslo_utils import uuidutils
 
diff --git a/solumclient/v1/languagepack.py b/solumclient/v1/languagepack.py
index e730854..31d11b6 100644
--- a/solumclient/v1/languagepack.py
+++ b/solumclient/v1/languagepack.py
@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import base as apiclient_base
 from solumclient.common import base as solum_base
-from solumclient.openstack.common.apiclient import base as apiclient_base
 
 
 class LanguagePack(apiclient_base.Resource):
diff --git a/solumclient/v1/pipeline.py b/solumclient/v1/pipeline.py
index dc3780f..7ec84c3 100644
--- a/solumclient/v1/pipeline.py
+++ b/solumclient/v1/pipeline.py
@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import base as apiclient_base
+from solumclient.common.apiclient import exceptions
 from solumclient.common import base as solum_base
 from solumclient.common import exc
-from solumclient.openstack.common.apiclient import base as apiclient_base
-from solumclient.openstack.common.apiclient import exceptions
 
 from oslo_utils import uuidutils
 
diff --git a/solumclient/v1/plan.py b/solumclient/v1/plan.py
index d3e2bb1..649edd5 100644
--- a/solumclient/v1/plan.py
+++ b/solumclient/v1/plan.py
@@ -14,11 +14,11 @@
 
 import six
 
+from solumclient.common.apiclient import base as apiclient_base
+from solumclient.common.apiclient import exceptions
 from solumclient.common import base as solum_base
 from solumclient.common import exc
 from solumclient.common import yamlutils
-from solumclient.openstack.common.apiclient import base as apiclient_base
-from solumclient.openstack.common.apiclient import exceptions
 
 from oslo_utils import uuidutils
 
diff --git a/solumclient/v1/platform.py b/solumclient/v1/platform.py
index 4de41c2..d846fd2 100644
--- a/solumclient/v1/platform.py
+++ b/solumclient/v1/platform.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from solumclient.openstack.common.apiclient import base
+from solumclient.common.apiclient import base
 
 
 class Platform(base.Resource):
diff --git a/solumclient/v1/workflow.py b/solumclient/v1/workflow.py
index 8ea8bd3..8c39714 100644
--- a/solumclient/v1/workflow.py
+++ b/solumclient/v1/workflow.py
@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from solumclient.common.apiclient import base as apiclient_base
+from solumclient.common.apiclient import exceptions
 from solumclient.common import base as solum_base
 from solumclient.common import exc
-from solumclient.openstack.common.apiclient import base as apiclient_base
-from solumclient.openstack.common.apiclient import exceptions
 
 from oslo_utils import uuidutils