From 9acb5d2cd31b255a0c59b9a22792f3522cc8a6f1 Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Thu, 23 Jun 2016 20:17:15 +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.

Since osc-lib 1.0.2 has released, it is stable to use.

Change-Id: Ia1569eeb7b52d3b5c0b1dd8312f397e7c7c3f869
---
 ironicclient/osc/plugin.py                            | 2 +-
 ironicclient/osc/v1/baremetal_node.py                 | 2 +-
 ironicclient/tests/unit/osc/v1/fakes.py               | 2 +-
 ironicclient/tests/unit/osc/v1/test_baremetal_node.py | 2 +-
 ironicclient/tests/unit/osc/v1/test_baremetal_port.py | 2 +-
 releasenotes/notes/osc-lib-090d62f647b9d58b.yaml      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ironicclient/osc/plugin.py b/ironicclient/osc/plugin.py
index 48e03718c..7d5c0a6b9 100644
--- a/ironicclient/osc/plugin.py
+++ b/ironicclient/osc/plugin.py
@@ -16,7 +16,7 @@
 
 import logging
 
-from openstackclient.common import utils
+from osc_lib import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/ironicclient/osc/v1/baremetal_node.py b/ironicclient/osc/v1/baremetal_node.py
index 96c1079c5..723fdd3fe 100644
--- a/ironicclient/osc/v1/baremetal_node.py
+++ b/ironicclient/osc/v1/baremetal_node.py
@@ -18,8 +18,8 @@ import argparse
 import itertools
 import logging
 
-from openstackclient.common import utils as oscutils
 from osc_lib.command import command
+from osc_lib import utils as oscutils
 
 from ironicclient.common.i18n import _
 from ironicclient.common import utils
diff --git a/ironicclient/tests/unit/osc/v1/fakes.py b/ironicclient/tests/unit/osc/v1/fakes.py
index 22c3d0cd8..2f8111e01 100644
--- a/ironicclient/tests/unit/osc/v1/fakes.py
+++ b/ironicclient/tests/unit/osc/v1/fakes.py
@@ -15,7 +15,7 @@
 #
 
 import mock
-from openstackclient.tests import utils
+from osc_lib.tests import utils
 
 from ironicclient.tests.unit.osc import fakes
 
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py b/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
index 0f1eab06a..fc7622321 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
@@ -17,7 +17,7 @@
 import copy
 import mock
 
-from openstackclient.tests import utils as oscutils
+from osc_lib.tests import utils as oscutils
 
 from ironicclient import exc
 from ironicclient.osc.v1 import baremetal_node
diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_port.py b/ironicclient/tests/unit/osc/v1/test_baremetal_port.py
index 844c683cb..be6bf54a8 100644
--- a/ironicclient/tests/unit/osc/v1/test_baremetal_port.py
+++ b/ironicclient/tests/unit/osc/v1/test_baremetal_port.py
@@ -17,7 +17,7 @@
 import copy
 
 import mock
-from openstackclient.tests import utils as oscutils
+from osc_lib.tests import utils as oscutils
 
 from ironicclient.osc.v1 import baremetal_port
 from ironicclient.tests.unit.osc.v1 import fakes as baremetal_fakes
diff --git a/releasenotes/notes/osc-lib-090d62f647b9d58b.yaml b/releasenotes/notes/osc-lib-090d62f647b9d58b.yaml
index 3e94528d1..7a133c2a3 100644
--- a/releasenotes/notes/osc-lib-090d62f647b9d58b.yaml
+++ b/releasenotes/notes/osc-lib-090d62f647b9d58b.yaml
@@ -1,4 +1,4 @@
 ---
 upgrade:
   - osc-lib is a package of common support modules for writing OSC plugins.
-    So use osc-lib instead of cliff.
+    So use osc-lib instead of cliff and OpenStackClient.