From cf7425be7e93f7d24ffcecc271c70034b1805f55 Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Fri, 24 Jun 2016 13:14:33 +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.

Change-Id: Ic158ee6d74f73b4629f9f35f6f29e5a4e99b5258
---
 requirements.txt             | 1 +
 test-requirements.txt        | 1 -
 tests/unit/cli/fakes.py      | 2 +-
 zaqarclient/queues/cli.py    | 2 +-
 zaqarclient/queues/v1/cli.py | 2 +-
 zaqarclient/queues/v2/cli.py | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0b545337..5478f53c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,3 +11,4 @@ jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
 oslo.i18n>=2.1.0 # Apache-2.0
 
 python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
+osc-lib>=0.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 07545c8f..3661a7fa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -27,4 +27,3 @@ sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 os-client-config>=1.13.1 # Apache-2.0
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 openstack-doc-tools>=0.23 # Apache-2.0
-python-openstackclient>=2.1.0 # Apache-2.0
diff --git a/tests/unit/cli/fakes.py b/tests/unit/cli/fakes.py
index ff44ae6b..73931b96 100644
--- a/tests/unit/cli/fakes.py
+++ b/tests/unit/cli/fakes.py
@@ -15,7 +15,7 @@
 
 
 import mock
-from openstackclient.tests import utils
+from osc_lib.tests import utils
 
 
 class TestMessaging(utils.TestCommand):
diff --git a/zaqarclient/queues/cli.py b/zaqarclient/queues/cli.py
index 68660e19..c2db59a3 100644
--- a/zaqarclient/queues/cli.py
+++ b/zaqarclient/queues/cli.py
@@ -14,7 +14,7 @@
 
 import logging
 
-from openstackclient.common import utils
+from osc_lib import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/zaqarclient/queues/v1/cli.py b/zaqarclient/queues/v1/cli.py
index f25987c5..cd40a6e0 100644
--- a/zaqarclient/queues/v1/cli.py
+++ b/zaqarclient/queues/v1/cli.py
@@ -18,8 +18,8 @@ import logging
 from cliff import command
 from cliff import lister
 from cliff import show
+from osc_lib import utils
 
-from openstackclient.common import utils
 from zaqarclient.transport import errors
 
 
diff --git a/zaqarclient/queues/v2/cli.py b/zaqarclient/queues/v2/cli.py
index 469cd8e9..9771215b 100644
--- a/zaqarclient/queues/v2/cli.py
+++ b/zaqarclient/queues/v2/cli.py
@@ -18,8 +18,8 @@ import logging
 from cliff import command
 from cliff import lister
 from cliff import show
+from osc_lib import utils
 
-from openstackclient.common import utils
 from zaqarclient.queues.v1 import cli