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

heatclient/osc/plugin.py

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

heatclient/osc/v1/build_info.py

@@ -17,7 +17,7 @@ import logging
 import six
 
 from cliff import show
-from openstackclient.common import utils
+from osc_lib import utils
 
 from heatclient.common import utils as heat_utils
 

heatclient/osc/v1/event.py

@@ -18,7 +18,7 @@ import time
 from cliff.formatters import base
 from cliff import lister
 from cliff import show
-from openstackclient.common import utils
+from osc_lib import utils
 
 from heatclient.common import event_utils
 from heatclient.common import utils as heat_utils

heatclient/osc/v1/resource.py

@@ -20,9 +20,9 @@ from six.moves.urllib import request
 
 from cliff import lister
 from cliff import show
-from openstackclient.common import exceptions as exc
-from openstackclient.common import utils
-from openstackclient.i18n import _
+from osc_lib import exceptions as exc
+from osc_lib.i18n import _
+from osc_lib import utils
 from oslo_serialization import jsonutils
 
 from heatclient.common import format_utils

heatclient/osc/v1/resource_type.py

@@ -20,8 +20,8 @@ from cliff import lister
 from heatclient.common import format_utils
 from heatclient.common import utils as heat_utils
 from heatclient import exc as heat_exc
-from openstackclient.common import exceptions as exc
-from openstackclient.i18n import _
+from osc_lib import exceptions as exc
+from osc_lib.i18n import _
 
 
 class ResourceTypeShow(format_utils.YamlFormat):

heatclient/osc/v1/service.py

@@ -16,7 +16,7 @@
 import logging
 
 from cliff import lister
-from openstackclient.common import utils
+from osc_lib import utils
 
 
 class ListService(lister.Lister):

heatclient/osc/v1/snapshot.py

@@ -19,12 +19,12 @@ import six
 from cliff import command
 from cliff import lister
 from cliff import show
-from openstackclient.common import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import exceptions as exc
+from osc_lib.i18n import _
+from osc_lib import utils
 
 from heatclient.common import format_utils
 from heatclient import exc as heat_exc
-from openstackclient.i18n import _
 
 
 class ListSnapshot(lister.Lister):

heatclient/osc/v1/software_config.py

@@ -21,8 +21,8 @@ import yaml
 
 from cliff import command
 from cliff import lister
-from openstackclient.common import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import exceptions as exc
+from osc_lib import utils
 
 from heatclient.common import format_utils
 from heatclient.common import template_format

heatclient/osc/v1/software_deployment.py

@@ -20,8 +20,8 @@ from cliff import command
 from cliff import lister
 from cliff import show
 
-from openstackclient.common import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import exceptions as exc
+from osc_lib import utils
 
 from heatclient.common import deployment_utils
 from heatclient.common import format_utils

heatclient/osc/v1/stack.py

@@ -19,9 +19,9 @@ import sys
 from cliff import command
 from cliff import lister
 from cliff import show
-from openstackclient.common import exceptions as exc
-from openstackclient.common import parseractions
-from openstackclient.common import utils
+from osc_lib.cli import parseractions
+from osc_lib import exceptions as exc
+from osc_lib import utils
 from oslo_serialization import jsonutils
 import six
 from six.moves.urllib import request

heatclient/osc/v1/template.py

@@ -17,7 +17,7 @@ import six
 
 
 from cliff import lister
-from openstackclient.common import utils
+from osc_lib import utils
 
 from heatclient.common import format_utils
 from heatclient.common import http

heatclient/tests/unit/osc/v1/test_resource.py

@@ -14,7 +14,7 @@
 import copy
 import mock
 
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc
 from heatclient.osc.v1 import resource

heatclient/tests/unit/osc/v1/test_resource_type.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc
 from heatclient.osc.v1 import resource_type

heatclient/tests/unit/osc/v1/test_snapshot.py

@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc
 from heatclient.osc.v1 import snapshot

heatclient/tests/unit/osc/v1/test_software_config.py

@@ -14,7 +14,7 @@
 import mock
 import yaml
 
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc
 from heatclient.osc.v1 import software_config

heatclient/tests/unit/osc/v1/test_software_deployment.py

@@ -14,7 +14,7 @@
 import copy
 import mock
 
-from openstackclient.common import exceptions as exc
+from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc
 from heatclient.osc.v1 import software_deployment

heatclient/tests/unit/osc/v1/test_stack.py

@@ -18,8 +18,8 @@ import six
 import testscenarios
 import yaml
 
-from openstackclient.common import exceptions as exc
-from openstackclient.common import utils
+from osc_lib import exceptions as exc
+from osc_lib import utils
 
 from heatclient.common import template_format
 from heatclient import exc as heat_exc

requirements.txt

@@ -6,6 +6,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
 iso8601>=0.1.11 # MIT
+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