From 0bc93d17f7d9c7251064de6c2616d70fc850c0c8 Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Fri, 24 Jun 2016 10:42:48 +0800
Subject: [PATCH] Use osc-lib instead of openstackclient

osc-lib is a package of common support modules for writing OSC plugins.
All common functions, classes such as exceptions, utils, logs and so on
have been moved from openstackclient to osc-lib. So use osc-lib instead
of openstackclient.

We should not remove openstackclient from requirement.txt because it
will cause this plugin client CLI unable to work until users install
openstackclient themselves.

Change-Id: I9dc8486b3573ffc1083e5c15d988b77f47de9dd4
---
 requirements.txt                          | 1 +
 searchlightclient/osc/plugin.py           | 2 +-
 searchlightclient/osc/v1/facet.py         | 2 +-
 searchlightclient/osc/v1/resource_type.py | 2 +-
 searchlightclient/osc/v1/search.py        | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b488060..7cc8009 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@
 Babel>=2.3.4 # BSD
 pbr>=1.6 # Apache-2.0
 cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
+osc-lib>=0.1.0 # Apache-2.0
 PrettyTable<0.8,>=0.7 # BSD
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
diff --git a/searchlightclient/osc/plugin.py b/searchlightclient/osc/plugin.py
index d3e5279..0e3633d 100644
--- a/searchlightclient/osc/plugin.py
+++ b/searchlightclient/osc/plugin.py
@@ -13,7 +13,7 @@
 
 import logging
 
-from openstackclient.common import utils
+from osc_lib import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/searchlightclient/osc/v1/facet.py b/searchlightclient/osc/v1/facet.py
index 02216c2..13827a4 100644
--- a/searchlightclient/osc/v1/facet.py
+++ b/searchlightclient/osc/v1/facet.py
@@ -17,7 +17,7 @@ import logging
 import six
 
 from cliff import lister
-from openstackclient.common import utils
+from osc_lib import utils
 
 
 class ListFacet(lister.Lister):
diff --git a/searchlightclient/osc/v1/resource_type.py b/searchlightclient/osc/v1/resource_type.py
index 68ab4ab..0ed4d1b 100644
--- a/searchlightclient/osc/v1/resource_type.py
+++ b/searchlightclient/osc/v1/resource_type.py
@@ -16,7 +16,7 @@
 import logging
 
 from cliff import lister
-from openstackclient.common import utils
+from osc_lib import utils
 
 
 class ListResourceType(lister.Lister):
diff --git a/searchlightclient/osc/v1/search.py b/searchlightclient/osc/v1/search.py
index e33b2ef..27aeb5c 100644
--- a/searchlightclient/osc/v1/search.py
+++ b/searchlightclient/osc/v1/search.py
@@ -18,7 +18,7 @@ import logging
 import six
 
 from cliff import lister
-from openstackclient.common import utils
+from osc_lib import utils
 
 
 class SearchResource(lister.Lister):