move old apiclient code out of openstack/common

As part of the first community-wide goal [1], teams were asked
to remove the openstack/common package of their projects
if one existed. This was a byproduct of the old oslo-incubator
form of syncing common functionality.

The package, apiclient, was moved to a top level location
and cliutils was moved to the common module. There are no oslo
specific libraries, the recommended solution is to move it
in tree and maintain it there.

Specifically in this patch, I also rearranged some of the
imports to make them match up with the hacking guidelines
while I was re-ordering them for the refactor anyway.

Lastly, the apiclient/fake_client.py was deleted since it
was not used.

[1] http://governance.openstack.org/goals/ocata/remove-incubated-oslo-code.html

Change-Id: Ib7b691240b819c9c91b100ca47ffaba75b281c78

1 files changed, 4 insertions, 4 deletions

diff --git a/troveclient/client.py b/troveclient/client.py
index 76f87d0..a0a67ae 100644
--- a/troveclient/client.py
+++ b/troveclient/client.py
@@ -22,16 +22,16 @@ OpenStack Client interface. Handles the REST calls and responses.
 from __future__ import print_function
 
 import logging
-import requests
 
 from keystoneauth1 import adapter
 from oslo_utils import importutils
+import requests
+import six.moves.urllib.parse as urlparse
+
+from troveclient.apiclient import client
 from troveclient import exceptions
-from troveclient.openstack.common.apiclient import client
 from troveclient import service_catalog
 
-import six.moves.urllib.parse as urlparse
-
 try:
     import eventlet as sleep_lib
 except ImportError: