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: I94fceb763e7370596357db949f5e3eef091ee561

requirements.txt

@@ -7,11 +7,11 @@ pbr>=1.6 # Apache-2.0
 cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
 PrettyTable<0.8,>=0.7 # BSD
 openstacksdk>=0.8.6 # Apache-2.0
+osc-lib>=0.1.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.utils>=3.11.0 # Apache-2.0
 python-heatclient>=1.1.0 # Apache-2.0
-python-openstackclient>=2.1.0 # Apache-2.0
 PyYAML>=3.1.0 # MIT
 requests>=2.10.0 # Apache-2.0
 six>=1.9.0 # MIT

senlinclient/plugin.py

@@ -13,7 +13,7 @@
 import logging
 
 from openstack import connection
-from openstackclient.common import utils
+from osc_lib import utils
 
 LOG = logging.getLogger(__name__)
 

senlinclient/tests/unit/test_format_utils.py

@@ -13,7 +13,7 @@
 import json
 import yaml
 
-from openstackclient.tests import utils
+from osc_lib.tests import utils
 from senlinclient.common import format_utils
 
 

senlinclient/tests/unit/v1/fakes.py

@@ -16,7 +16,7 @@ import requests
 import six
 import sys
 
-from openstackclient.tests import utils
+from osc_lib.tests import utils
 
 
 AUTH_TOKEN = "foobar"

senlinclient/tests/unit/v1/test_action.py

@@ -15,7 +15,7 @@ import mock
 
 from openstack.cluster.v1 import action as sdk_action
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import action as osc_action

senlinclient/tests/unit/v1/test_cluster.py

@@ -16,7 +16,7 @@ import six
 
 from openstack.cluster.v1 import cluster as sdk_cluster
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import cluster as osc_cluster

senlinclient/tests/unit/v1/test_event.py

@@ -15,7 +15,7 @@ import mock
 
 from openstack.cluster.v1 import event as sdk_event
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import event as osc_event

senlinclient/tests/unit/v1/test_node.py

@@ -16,7 +16,7 @@ import six
 
 from openstack.cluster.v1 import node as sdk_node
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import node as osc_node

senlinclient/tests/unit/v1/test_policy.py

@@ -16,7 +16,7 @@ import six
 
 from openstack.cluster.v1 import policy as sdk_policy
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import policy as osc_policy

senlinclient/tests/unit/v1/test_policy_type.py

@@ -14,7 +14,7 @@ import mock
 
 from openstack.cluster.v1 import policy_type as sdk_policy_type
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import policy_type as osc_policy_type

senlinclient/tests/unit/v1/test_profile.py

@@ -16,8 +16,8 @@ import six
 
 from openstack.cluster.v1 import profile as sdk_profile
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import profile as osc_profile

senlinclient/tests/unit/v1/test_profile_type.py

@@ -14,7 +14,7 @@ import mock
 
 from openstack.cluster.v1 import profile_type as sdk_profile_type
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import profile_type as osc_profile_type

senlinclient/tests/unit/v1/test_receiver.py

@@ -16,7 +16,7 @@ import six
 
 from openstack.cluster.v1 import receiver as sdk_receiver
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from senlinclient.tests.unit.v1 import fakes
 from senlinclient.v1 import receiver as osc_receiver

senlinclient/v1/action.py

@@ -18,8 +18,8 @@ import six
 from cliff import lister
 from cliff import show
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common import utils as senlin_utils

senlinclient/v1/build_info.py

@@ -16,7 +16,7 @@ import logging
 import six
 
 from cliff import show
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common import utils as senlin_utils
 

senlinclient/v1/cluster.py

@@ -20,8 +20,8 @@ from cliff import command
 from cliff import lister
 from cliff import show
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common.i18n import _LI

senlinclient/v1/cluster_policy.py

@@ -18,7 +18,7 @@ import six
 from cliff import command
 from cliff import lister
 from cliff import show
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common import utils as senlin_utils

senlinclient/v1/event.py

@@ -18,8 +18,8 @@ import six
 from cliff import lister
 from cliff import show
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common import utils as senlin_utils

senlinclient/v1/node.py

@@ -20,8 +20,8 @@ from cliff import command
 from cliff import lister
 from cliff import show
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common.i18n import _LI

senlinclient/v1/policy.py

@@ -19,8 +19,8 @@ from cliff import command
 from cliff import lister
 from cliff import show
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common.i18n import _LI

senlinclient/v1/policy_type.py

@@ -17,7 +17,8 @@ import six
 
 from cliff import lister
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
+
 from senlinclient.common import format_utils
 from senlinclient.common.i18n import _
 

senlinclient/v1/profile.py

@@ -19,8 +19,8 @@ from cliff import command
 from cliff import lister
 from cliff import show
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common.i18n import _LI

senlinclient/v1/profile_type.py

@@ -17,7 +17,7 @@ import six
 
 from cliff import lister
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 from senlinclient.common import format_utils
 from senlinclient.common.i18n import _
 

senlinclient/v1/receiver.py

@@ -20,8 +20,8 @@ from cliff import command
 from cliff import lister
 from cliff import show
 from openstack import exceptions as sdk_exc
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import utils
 
 from senlinclient.common.i18n import _
 from senlinclient.common.i18n import _LI