Rename TRIGGERED state as PENDING

Following the change in Watcher, this patchset updates the Watcher CLI to support this change. Also it updates README.rst to pass python 3.4 ascii-tests. Change-Id: Idfcf99ee3d6b5b7342f1bbc4f726e6edd82fc77c Closes-Bug: #1548377 Related-Bug: #1554347
Updated from global requirements
2016-03-21 12:17:18 +00:00 · 2016-02-20 22:00:57 +00:00 · 2016-02-19 02:37:27 +00:00 · 2016-02-18 08:21:48 +00:00 · 2016-02-15 09:29:58 +00:00 · 2016-02-14 17:45:11 -06:00
97 changed files with 1198 additions and 2129 deletions
--- a/README.rst
+++ b/README.rst
@@ -2,16 +2,22 @@
 python-watcherclient
 ====================

-Python client library for Watcher API.
+Client for resource optimization service for OpenStack.

-Watcher takes advantage of CEP and ML algorithms/metaheuristics to improve physical resources usage through better VM placement. Watcher can improve your cloud optimization by reducing energy footprint and increasing profits.
+OpenStack Watcher provides a flexible and scalable resource optimization
+service for multi-tenant OpenStack-based clouds.
+Watcher provides a complete optimization loop-including everything from a
+metrics receiver, complex event processor and profiler, optimization processor
+and an action plan applier. This provides a robust framework to realize a wide
+range of cloud optimization goals, including the reduction of data center
+operating costs, increased system performance via intelligent virtual machine
+migration, increased energy efficiency-and more!

 * Free software: Apache license
 * Wiki: http://wiki.openstack.org/wiki/Watcher
 * Source: http://git.openstack.org/cgit/openstack/python-watcher
 * Bugs: http://bugs.launchpad.net/watcher

-
 Installation
 ============

@@ -23,13 +29,13 @@ On Ubuntu (tested on 14.04-64)
 .. code::

   sudo apt-get install python-dev libssl-dev python-pip git-core libmysqlclient-dev libffi-dev
-   
+
 On Fedora-based distributions e.g., Fedora/RHEL/CentOS/Scientific Linux (tested on CentOS 6.5)

 .. code::

   sudo yum install python-virtualenv openssl-devel python-pip git gcc libffi-devel mysql-devel postgresql-devel
-   
+
 On openSUSE-based distributions (SLES 12, openSUSE 13.1, Factory or Tumbleweed)

 .. code::
--- a/doc/source/api/autoindex.rst
+++ b/doc/source/api/autoindex.rst
@@ -0,0 +1,48 @@
+.. toctree::
+   :maxdepth: 1
+
+   watcherclient.client.rst
+   watcherclient.common.apiclient.base.rst
+   watcherclient.common.apiclient.exceptions.rst
+   watcherclient.common.base.rst
+   watcherclient.common.cliutils.rst
+   watcherclient.common.http.rst
+   watcherclient.common.i18n.rst
+   watcherclient.common.utils.rst
+   watcherclient.exceptions.rst
+   watcherclient.shell.rst
+   watcherclient.tests.keystone_client_fixtures.rst
+   watcherclient.tests.test_client.rst
+   watcherclient.tests.test_http.rst
+   watcherclient.tests.test_import.rst
+   watcherclient.tests.test_shell.rst
+   watcherclient.tests.test_utils.rst
+   watcherclient.tests.utils.rst
+   watcherclient.tests.v1.test_action.rst
+   watcherclient.tests.v1.test_action_plan.rst
+   watcherclient.tests.v1.test_action_plan_shell.rst
+   watcherclient.tests.v1.test_action_shell.rst
+   watcherclient.tests.v1.test_audit.rst
+   watcherclient.tests.v1.test_audit_shell.rst
+   watcherclient.tests.v1.test_audit_template.rst
+   watcherclient.tests.v1.test_audit_template_shell.rst
+   watcherclient.tests.v1.test_goal.rst
+   watcherclient.tests.v1.test_goal_shell.rst
+   watcherclient.tests.v1.test_metric_collector.rst
+   watcherclient.tests.v1.test_metric_collector_shell.rst
+   watcherclient.v1.action.rst
+   watcherclient.v1.action_plan.rst
+   watcherclient.v1.action_plan_shell.rst
+   watcherclient.v1.action_shell.rst
+   watcherclient.v1.audit.rst
+   watcherclient.v1.audit_shell.rst
+   watcherclient.v1.audit_template.rst
+   watcherclient.v1.audit_template_shell.rst
+   watcherclient.v1.client.rst
+   watcherclient.v1.goal.rst
+   watcherclient.v1.goal_shell.rst
+   watcherclient.v1.metric_collector.rst
+   watcherclient.v1.metric_collector_shell.rst
+   watcherclient.v1.resource_fields.rst
+   watcherclient.v1.shell.rst
+   watcherclient.version.rst
--- a/doc/source/api/watcherclient.client.rst
+++ b/doc/source/api/watcherclient.client.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.client` Module
+======================================
+
+.. automodule:: watcherclient.client
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.auth.rst
+++ b/doc/source/api/watcherclient.common.apiclient.auth.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.apiclient.auth` Module
+=====================================================
+
+.. automodule:: watcherclient.common.apiclient.auth
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.base.rst
+++ b/doc/source/api/watcherclient.common.apiclient.base.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.apiclient.base` Module
+=====================================================
+
+.. automodule:: watcherclient.common.apiclient.base
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.client.rst
+++ b/doc/source/api/watcherclient.common.apiclient.client.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.apiclient.client` Module
+=======================================================
+
+.. automodule:: watcherclient.common.apiclient.client
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.exceptions.rst
+++ b/doc/source/api/watcherclient.common.apiclient.exceptions.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.apiclient.exceptions` Module
+===========================================================
+
+.. automodule:: watcherclient.common.apiclient.exceptions
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.utils.rst
+++ b/doc/source/api/watcherclient.common.apiclient.utils.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.apiclient.utils` Module
+======================================================
+
+.. automodule:: watcherclient.common.apiclient.utils
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.base.rst
+++ b/doc/source/api/watcherclient.common.base.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.base` Module
+===========================================
+
+.. automodule:: watcherclient.common.base
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.cliutils.rst
+++ b/doc/source/api/watcherclient.common.cliutils.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.cliutils` Module
+===============================================
+
+.. automodule:: watcherclient.common.cliutils
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.http.rst
+++ b/doc/source/api/watcherclient.common.http.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.http` Module
+===========================================
+
+.. automodule:: watcherclient.common.http
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.i18n.rst
+++ b/doc/source/api/watcherclient.common.i18n.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.i18n` Module
+===========================================
+
+.. automodule:: watcherclient.common.i18n
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.common.utils.rst
+++ b/doc/source/api/watcherclient.common.utils.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.common.utils` Module
+============================================
+
+.. automodule:: watcherclient.common.utils
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.exceptions.rst
+++ b/doc/source/api/watcherclient.exceptions.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.exceptions` Module
+==========================================
+
+.. automodule:: watcherclient.exceptions
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.shell.rst
+++ b/doc/source/api/watcherclient.shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.shell` Module
+=====================================
+
+.. automodule:: watcherclient.shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.keystone_client_fixtures.rst
+++ b/doc/source/api/watcherclient.tests.keystone_client_fixtures.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.keystone_client_fixtures` Module
+==============================================================
+
+.. automodule:: watcherclient.tests.keystone_client_fixtures
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_client.rst
+++ b/doc/source/api/watcherclient.tests.test_client.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.test_client` Module
+=================================================
+
+.. automodule:: watcherclient.tests.test_client
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_http.rst
+++ b/doc/source/api/watcherclient.tests.test_http.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.test_http` Module
+===============================================
+
+.. automodule:: watcherclient.tests.test_http
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_import.rst
+++ b/doc/source/api/watcherclient.tests.test_import.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.test_import` Module
+=================================================
+
+.. automodule:: watcherclient.tests.test_import
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_shell.rst
+++ b/doc/source/api/watcherclient.tests.test_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.test_shell` Module
+================================================
+
+.. automodule:: watcherclient.tests.test_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_utils.rst
+++ b/doc/source/api/watcherclient.tests.test_utils.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.test_utils` Module
+================================================
+
+.. automodule:: watcherclient.tests.test_utils
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.utils.rst
+++ b/doc/source/api/watcherclient.tests.utils.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.utils` Module
+===========================================
+
+.. automodule:: watcherclient.tests.utils
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_action` Module
+====================================================
+
+.. automodule:: watcherclient.tests.v1.test_action
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action_plan.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action_plan.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_action_plan` Module
+=========================================================
+
+.. automodule:: watcherclient.tests.v1.test_action_plan
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action_plan_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action_plan_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_action_plan_shell` Module
+===============================================================
+
+.. automodule:: watcherclient.tests.v1.test_action_plan_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_action_shell` Module
+==========================================================
+
+.. automodule:: watcherclient.tests.v1.test_action_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_audit` Module
+===================================================
+
+.. automodule:: watcherclient.tests.v1.test_audit
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_audit_shell` Module
+=========================================================
+
+.. automodule:: watcherclient.tests.v1.test_audit_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit_template.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit_template.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_audit_template` Module
+============================================================
+
+.. automodule:: watcherclient.tests.v1.test_audit_template
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit_template_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit_template_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_audit_template_shell` Module
+==================================================================
+
+.. automodule:: watcherclient.tests.v1.test_audit_template_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_goal.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_goal.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_goal` Module
+==================================================
+
+.. automodule:: watcherclient.tests.v1.test_goal
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_goal_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_goal_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_goal_shell` Module
+========================================================
+
+.. automodule:: watcherclient.tests.v1.test_goal_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_metric_collector.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_metric_collector.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_metric_collector` Module
+==============================================================
+
+.. automodule:: watcherclient.tests.v1.test_metric_collector
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_metric_collector_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_metric_collector_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.tests.v1.test_metric_collector_shell` Module
+====================================================================
+
+.. automodule:: watcherclient.tests.v1.test_metric_collector_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action.rst
+++ b/doc/source/api/watcherclient.v1.action.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.action` Module
+=========================================
+
+.. automodule:: watcherclient.v1.action
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action_plan.rst
+++ b/doc/source/api/watcherclient.v1.action_plan.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.action_plan` Module
+==============================================
+
+.. automodule:: watcherclient.v1.action_plan
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action_plan_shell.rst
+++ b/doc/source/api/watcherclient.v1.action_plan_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.action_plan_shell` Module
+====================================================
+
+.. automodule:: watcherclient.v1.action_plan_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action_shell.rst
+++ b/doc/source/api/watcherclient.v1.action_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.action_shell` Module
+===============================================
+
+.. automodule:: watcherclient.v1.action_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit.rst
+++ b/doc/source/api/watcherclient.v1.audit.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.audit` Module
+========================================
+
+.. automodule:: watcherclient.v1.audit
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit_shell.rst
+++ b/doc/source/api/watcherclient.v1.audit_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.audit_shell` Module
+==============================================
+
+.. automodule:: watcherclient.v1.audit_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit_template.rst
+++ b/doc/source/api/watcherclient.v1.audit_template.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.audit_template` Module
+=================================================
+
+.. automodule:: watcherclient.v1.audit_template
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit_template_shell.rst
+++ b/doc/source/api/watcherclient.v1.audit_template_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.audit_template_shell` Module
+=======================================================
+
+.. automodule:: watcherclient.v1.audit_template_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.client.rst
+++ b/doc/source/api/watcherclient.v1.client.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.client` Module
+=========================================
+
+.. automodule:: watcherclient.v1.client
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.goal.rst
+++ b/doc/source/api/watcherclient.v1.goal.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.goal` Module
+=======================================
+
+.. automodule:: watcherclient.v1.goal
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.goal_shell.rst
+++ b/doc/source/api/watcherclient.v1.goal_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.goal_shell` Module
+=============================================
+
+.. automodule:: watcherclient.v1.goal_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.metric_collector.rst
+++ b/doc/source/api/watcherclient.v1.metric_collector.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.metric_collector` Module
+===================================================
+
+.. automodule:: watcherclient.v1.metric_collector
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.metric_collector_shell.rst
+++ b/doc/source/api/watcherclient.v1.metric_collector_shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.metric_collector_shell` Module
+=========================================================
+
+.. automodule:: watcherclient.v1.metric_collector_shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.resource_fields.rst
+++ b/doc/source/api/watcherclient.v1.resource_fields.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.resource_fields` Module
+==================================================
+
+.. automodule:: watcherclient.v1.resource_fields
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.shell.rst
+++ b/doc/source/api/watcherclient.v1.shell.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.v1.shell` Module
+========================================
+
+.. automodule:: watcherclient.v1.shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/doc/source/api/watcherclient.version.rst
+++ b/doc/source/api/watcherclient.version.rst
@@ -0,0 +1,7 @@
+The :mod:`watcherclient.version` Module
+=======================================
+
+.. automodule:: watcherclient.version
+  :members:
+  :undoc-members:
+  :show-inheritance:
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,9 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.

-argparse
-Babel>=1.3
-oslo.i18n>=1.5.0    # Apache-2.0
-pbr>=1.6
-python-keystoneclient>=1.6.0,!=1.8.0
-six>=1.9.0
+Babel>=1.3 # BSD
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.utils>=3.5.0 # Apache-2.0
+pbr>=1.6 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+six>=1.9.0 # MIT
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,6 @@ classifier =
    Programming Language :: Python :: 2
    Programming Language :: Python :: 2.7
    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
    Programming Language :: Python :: 3.4

 [files]
@@ -37,3 +36,17 @@ all_files = 1

 [bdist_wheel]
 universal = 1
+
+[compile_catalog]
+directory = watcherclient/locale
+domain = watcherclient
+
+[update_catalog]
+domain = watcherclient
+output_dir = watcherclient/locale
+input_file = watcherclient/locale/watcherclient.pot
+
+[extract_messages]
+keywords = _ gettext ngettext l_ lazy_gettext  _LI _LW _LE _LC
+mapping_file = babel.cfg
+output_file = watcherclient/locale/watcherclient.pot
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,5 +25,5 @@ except ImportError:
    pass

 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
    pbr=True)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,19 +2,17 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.

-coverage>=3.6
-discover
-hacking<0.11,>=0.10
-httpretty>=0.8.4,<0.8.7
-mock>=1.2
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.10.0  # Apache-2.0
-python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+coverage>=3.6 # Apache-2.0
+discover # BSD
+hacking<0.11,>=0.10.2
+mock>=1.2 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT

 # Needed for pypi packaging
-wheel
-twine
+wheel # MIT
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py33,py34,py27,pep8
+envlist = py34,py27,pep8
 skipsdist = True

 [testenv]
@@ -32,12 +32,10 @@ commands = oslo_debug_helper {posargs}
 show-source = True
 ignore = E123,E125
 builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
-
-[testenv:pypi]
-commands =
-    python setup.py sdist bdist_wheel
-    twine upload --config-file .pypirc {posargs} dist/*
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build

 [testenv:wheel]
 commands = python setup.py bdist_wheel
+
+[hacking]
+import_exceptions = watcherclient._i18n
--- a/watcherclient/init.py
+++ b/watcherclient/init.py
@@ -16,6 +16,7 @@
 # under the License.

 import pbr.version
+
 from watcherclient import client
 from watcherclient import exceptions

--- a/watcherclient/_i18n.py
+++ b/watcherclient/_i18n.py
@@ -0,0 +1,45 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import oslo_i18n
+
+DOMAIN = "watcherclient"
+
+_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN)
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
+
+# The contextual translation function using the name "_C"
+# requires oslo.i18n >=2.1.0
+_C = _translators.contextual_form
+
+# The plural translation function using the name "_P"
+# requires oslo.i18n >=2.1.0
+_P = _translators.plural_form
+
+# Translators for log levels.
+#
+# The abbreviated names are meant to reflect the usual use of a short
+# name like '_'. The "L" is for "log" and the other letter comes from
+# the level.
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical
+
+
+def get_available_languages():
+    return oslo_i18n.get_available_languages(DOMAIN)
--- a/watcherclient/client.py
+++ b/watcherclient/client.py
@@ -13,13 +13,13 @@
 #    under the License.

 from keystoneclient.v2_0 import client as ksclient
+import oslo_i18n

+from watcherclient._i18n import _
 from watcherclient.common import utils
 from watcherclient import exceptions as exc
-from watcherclient.openstack.common._i18n import _
-from watcherclient.openstack.common import gettextutils

-gettextutils.install('watcherclient')
+oslo_i18n.install('watcherclient')


 def _get_ksclient(**kwargs):
--- a/watcherclient/common/apiclient/init.py
+++ b/watcherclient/common/apiclient/init.py
--- a/watcherclient/openstack/common/apiclient/base.py
+++ b/watcherclient/openstack/common/apiclient/base.py
@@ -44,8 +44,8 @@ from oslo_utils import strutils
 import six
 from six.moves.urllib import parse

-from watcherclient.openstack.common._i18n import _
-from watcherclient.openstack.common.apiclient import exceptions
+from watcherclient._i18n import _
+from watcherclient.common.apiclient import exceptions


 def getid(obj):
@@ -467,8 +467,7 @@ class Resource(object):

    @property
    def human_id(self):
-        """Human-readable ID which can be used for bash completion.
-        """
+        """Human-readable ID which can be used for bash completion."""
        if self.HUMAN_ID:
            name = getattr(self, self.NAME_ATTR, None)
            if name is not None:
--- a/watcherclient/openstack/common/apiclient/exceptions.py
+++ b/watcherclient/openstack/common/apiclient/exceptions.py
@@ -38,12 +38,11 @@ import sys

 import six

-from watcherclient.openstack.common._i18n import _
+from watcherclient._i18n import _


 class ClientException(Exception):
-    """The base exception class for all exceptions this library raises.
-    """
+    """The base exception class for all exceptions this library raises."""
    pass


@@ -118,8 +117,7 @@ class AmbiguousEndpoints(EndpointException):


 class HttpError(ClientException):
-    """The base exception class for all HTTP exceptions.
-    """
+    """The base exception class for all HTTP exceptions."""
    http_status = 0
    message = _("HTTP Error")

--- a/watcherclient/common/base.py
+++ b/watcherclient/common/base.py
@@ -23,7 +23,7 @@ import copy

 import six.moves.urllib.parse as urlparse

-from watcherclient.openstack.common.apiclient import base
+from watcherclient.common.apiclient import base


 def getid(obj):
--- a/watcherclient/openstack/common/cliutils.py
+++ b/watcherclient/openstack/common/cliutils.py
@@ -30,7 +30,7 @@ import prettytable
 import six
 from six import moves

-from watcherclient.openstack.common._i18n import _
+from watcherclient._i18n import _


 class MissingArgs(Exception):
--- a/watcherclient/common/http.py
+++ b/watcherclient/common/http.py
@@ -26,6 +26,7 @@ from keystoneclient import adapter
 import six
 import six.moves.urllib.parse as urlparse

+from watcherclient._i18n import _, _LW, _LE
 from watcherclient import exceptions as exc


@@ -83,8 +84,8 @@ class HTTPClient(object):
        elif parts.scheme == 'http':
            _class = six.moves.http_client.HTTPConnection
        else:
-            msg = 'Unsupported scheme: %s' % parts.scheme
-            raise exc.EndpointException(msg)
+            raise exc.EndpointException(
+                _('Unsupported scheme: %s'), parts.scheme)

        return (_class, _args, _kwargs)

@@ -157,15 +158,14 @@ class HTTPClient(object):
            conn.request(method, conn_url, **kwargs)
            resp = conn.getresponse()
        except socket.gaierror as e:
-            message = ("Error finding address for %(url)s: %(e)s"
-                       % dict(url=url, e=e))
-            raise exc.EndpointNotFound(message)
+            raise exc.EndpointNotFound(
+                _("Error finding address for %(url)s: %(e)s"),
+                url=url, e=e)
        except (socket.error, socket.timeout) as e:
            endpoint = self.endpoint
-            message = ("Error communicating with %(endpoint)s %(e)s"
-                       % dict(endpoint=endpoint, e=e))
-            raise exc.ConnectionRefused(message)
-
+            raise exc.ConnectionRefused(
+                _("Error communicating with %(endpoint)s %(e)s"),
+                endpoint=endpoint, e=e)
        body_iter = ResponseBodyIterator(resp)

        # Read body into string if it isn't obviously image data
@@ -178,7 +178,7 @@ class HTTPClient(object):
            self.log_http_response(resp)

        if 400 <= resp.status < 600:
-            LOG.warn("Request returned failure status.")
+            LOG.warning(_LW("Request returned failure status."))
            error_json = _extract_error_json(body_str)
            raise exc.from_response(
                resp, error_json.get('faultstring'),
@@ -210,7 +210,7 @@ class HTTPClient(object):
            try:
                body = json.loads(body)
            except ValueError:
-                LOG.error('Could not decode response body as JSON')
+                LOG.error(_LE('Could not decode response body as JSON'))
        else:
            body = None

@@ -334,7 +334,7 @@ class SessionClient(adapter.LegacyJsonAdapter):
            try:
                body = resp.json()
            except ValueError:
-                LOG.error('Could not decode response body as JSON')
+                LOG.error(_LE('Could not decode response body as JSON'))
        else:
            body = None

--- a/watcherclient/common/utils.py
+++ b/watcherclient/common/utils.py
@@ -20,9 +20,10 @@ from __future__ import print_function
 import argparse
 import json

+from oslo_utils import importutils
+
+from watcherclient._i18n import _
 from watcherclient import exceptions as exc
-from watcherclient.openstack.common._i18n import _
-from watcherclient.openstack.common import importutils


 class HelpFormatter(argparse.HelpFormatter):
--- a/watcherclient/exceptions.py
+++ b/watcherclient/exceptions.py
@@ -12,21 +12,49 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-from watcherclient.openstack.common.apiclient import exceptions
-from watcherclient.openstack.common.apiclient.exceptions import *  # noqa
+from watcherclient.common.apiclient import exceptions


 # NOTE(akurilin): This alias is left here since v.0.1.3 to support backwards
 # compatibility.
-InvalidEndpoint = EndpointException
-CommunicationError = ConnectionRefused
-HTTPBadRequest = BadRequest
-HTTPInternalServerError = InternalServerError
-HTTPNotFound = NotFound
-HTTPServiceUnavailable = ServiceUnavailable
+InvalidEndpoint = exceptions.EndpointException
+CommunicationError = exceptions.ConnectionRefused
+HTTPBadRequest = exceptions.BadRequest
+HTTPInternalServerError = exceptions.InternalServerError
+HTTPNotFound = exceptions.NotFound
+HTTPServiceUnavailable = exceptions.ServiceUnavailable


-class AmbiguousAuthSystem(ClientException):
+CommandError = exceptions.CommandError
+"""Error in CLI tool.
+
+An alias of :py:exc:`watcherclient.common.apiclient.CommandError`
+"""
+
+Unauthorized = exceptions.Unauthorized
+"""HTTP 401 - Unauthorized.
+
+Similar to 403 Forbidden, but specifically for use when authentication
+is required and has failed or has not yet been provided.
+An alias of :py:exc:`watcherclient.common.apiclient.Unauthorized`
+"""
+
+InternalServerError = exceptions.InternalServerError
+"""HTTP 500 - Internal Server Error.
+
+A generic error message, given when no more specific message is suitable.
+An alias of :py:exc:`watcherclient.common.apiclient.InternalServerError`
+"""
+
+ValidationError = exceptions.ValidationError
+"""Error in validation on API client side.
+
+A generic error message, given when no more specific message is suitable.
+An alias of :py:exc:`watcherclient.common.apiclient.ValidationError`
+"""
+
+
+class AmbiguousAuthSystem(exceptions.ClientException):
    """Could not obtain token and endpoint using provided credentials."""
    pass

@@ -34,7 +62,7 @@ class AmbiguousAuthSystem(ClientException):
 AmbigiousAuthSystem = AmbiguousAuthSystem


-class InvalidAttribute(ClientException):
+class InvalidAttribute(exceptions.ClientException):
    pass


@@ -65,7 +93,7 @@ def from_response(response, message=None, traceback=None, method=None,
    if (response.headers['Content-Type'].startswith('text/') and
            not hasattr(response, 'text')):
        # NOTE(clif_h): There seems to be a case in the
-        # openstack.common.apiclient.exceptions module where if the
+        # common.apiclient.exceptions module where if the
        # content-type of the response is text/* then it expects
        # the response to have a 'text' attribute, but that
        # doesn't always seem to necessarily be the case.
--- a/watcherclient/locale/fr/LC_MESSAGES/watcherclient.po
+++ b/watcherclient/locale/fr/LC_MESSAGES/watcherclient.po
@@ -0,0 +1,279 @@
+# French translations for python-watcherclient.
+# Copyright (C) 2016 ORGANIZATION
+# This file is distributed under the same license as the
+# python-watcherclient project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: python-watcherclient 0.20.1.dev4\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2016-01-14 14:57+0100\n"
+"PO-Revision-Date: 2016-01-12 02:05+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: fr\n"
+"Language-Team: fr <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.1.1\n"
+
+#: watcherclient/client.py:103
+msgid "Must provide Keystone credentials or user-defined endpoint and token"
+msgstr ""
+
+#: watcherclient/shell.py:279
+#, python-format
+msgid ""
+"Unable to determine the Keystone version to authenticate with using the "
+"given auth_url. Identity service may not support API version discovery. "
+"Please provide a versioned auth_url instead. %s"
+msgstr ""
+
+#: watcherclient/shell.py:344
+msgid ""
+"Unable to determine the Keystone version to authenticate with using the "
+"given auth_url."
+msgstr ""
+
+#: watcherclient/shell.py:380
+msgid ""
+"You must provide a username via either --os-username or via "
+"env[OS_USERNAME]"
+msgstr ""
+
+#: watcherclient/shell.py:396
+msgid ""
+"You must provide a password via either --os-password, env[OS_PASSWORD], "
+"or prompted response"
+msgstr ""
+
+#: watcherclient/shell.py:403
+msgid ""
+"You must provide a project name or project id via --os-project-name, "
+"--os-project-id, env[OS_PROJECT_ID] or env[OS_PROJECT_NAME].  You may use"
+" os-project and os-tenant interchangeably."
+msgstr ""
+
+#: watcherclient/shell.py:410
+msgid ""
+"You must provide an auth url via either --os-auth-url or via "
+"env[OS_AUTH_URL]"
+msgstr ""
+
+#: watcherclient/shell.py:473
+msgid "Invalid OpenStack Identity credentials"
+msgstr ""
+
+#: watcherclient/shell.py:483
+#, python-format
+msgid "'%s' is not a valid subcommand"
+msgstr ""
+
+#: watcherclient/common/cliutils.py:40
+#, python-format
+msgid "Missing arguments: %s"
+msgstr ""
+
+#: watcherclient/common/cliutils.py:158
+#, python-format
+msgid ""
+"Field labels list %(labels)s has different number of elements than fields"
+" list %(fields)s"
+msgstr ""
+
+#: watcherclient/common/http.py:88
+#, python-format
+msgid "Unsupported scheme: %s"
+msgstr ""
+
+#: watcherclient/common/http.py:162
+#, python-format
+msgid "Error finding address for %(url)s: %(e)s"
+msgstr ""
+
+#: watcherclient/common/http.py:167
+#, python-format
+msgid "Error communicating with %(endpoint)s %(e)s"
+msgstr ""
+
+#: watcherclient/common/http.py:181
+msgid "Request returned failure status."
+msgstr ""
+
+#: watcherclient/common/http.py:213 watcherclient/common/http.py:337
+msgid "Could not decode response body as JSON"
+msgstr ""
+
+#: watcherclient/common/utils.py:87
+#, python-format
+msgid "Attributes must be a list of PATH=VALUE not \"%s\""
+msgstr ""
+
+#: watcherclient/common/utils.py:120
+#, python-format
+msgid "Unknown PATCH operation: %s"
+msgstr ""
+
+#: watcherclient/common/utils.py:136
+#, python-format
+msgid "Expected non-negative --limit, got %s"
+msgstr ""
+
+#: watcherclient/common/utils.py:147
+#, python-format
+msgid ""
+"%(sort_key)s is an invalid field for sorting, valid values for --sort-key"
+" are: %(valid)s"
+msgstr ""
+
+#: watcherclient/common/utils.py:155
+#, python-format
+msgid ""
+"%s is an invalid value for sort direction, valid values for --sort-dir "
+"are: 'asc', 'desc'"
+msgstr ""
+
+#: watcherclient/common/apiclient/base.py:244
+#: watcherclient/common/apiclient/base.py:401
+#, python-format
+msgid "No %(name)s matching %(args)s."
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:83
+#, python-format
+msgid "Authentication failed. Missing options: %s"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:92
+#, python-format
+msgid "AuthSystemNotFound: %r"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:115
+#, python-format
+msgid "AmbiguousEndpoints: %r"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:122
+msgid "HTTP Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:142
+msgid "HTTP Redirection"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:150
+msgid "HTTP Client Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:159
+msgid "HTTP Server Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:169
+msgid "Multiple Choices"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:178
+msgid "Bad Request"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:188
+msgid "Unauthorized"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:197
+msgid "Payment Required"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:207
+msgid "Forbidden"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:217
+msgid "Not Found"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:227
+msgid "Method Not Allowed"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:237
+msgid "Not Acceptable"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:246
+msgid "Proxy Authentication Required"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:255
+msgid "Request Timeout"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:265
+msgid "Conflict"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:275
+msgid "Gone"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:285
+msgid "Length Required"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:295
+msgid "Precondition Failed"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:304
+msgid "Request Entity Too Large"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:321
+msgid "Request-URI Too Long"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:331
+msgid "Unsupported Media Type"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:341
+msgid "Requested Range Not Satisfiable"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:350
+msgid "Expectation Failed"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:360
+msgid "Unprocessable Entity"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:369
+msgid "Internal Server Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:380
+msgid "Not Implemented"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:390
+msgid "Bad Gateway"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:399
+msgid "Service Unavailable"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:409
+msgid "Gateway Timeout"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:418
+msgid "HTTP Version Not Supported"
+msgstr ""
+
--- a/watcherclient/locale/watcherclient.pot
+++ b/watcherclient/locale/watcherclient.pot
@@ -0,0 +1,277 @@
+# Translations template for python-watcherclient.
+# Copyright (C) 2016 ORGANIZATION
+# This file is distributed under the same license as the
+# python-watcherclient project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: python-watcherclient 0.20.1.dev5\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2016-01-14 14:57+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.1.1\n"
+
+#: watcherclient/client.py:103
+msgid "Must provide Keystone credentials or user-defined endpoint and token"
+msgstr ""
+
+#: watcherclient/shell.py:279
+#, python-format
+msgid ""
+"Unable to determine the Keystone version to authenticate with using the "
+"given auth_url. Identity service may not support API version discovery. "
+"Please provide a versioned auth_url instead. %s"
+msgstr ""
+
+#: watcherclient/shell.py:344
+msgid ""
+"Unable to determine the Keystone version to authenticate with using the "
+"given auth_url."
+msgstr ""
+
+#: watcherclient/shell.py:380
+msgid ""
+"You must provide a username via either --os-username or via "
+"env[OS_USERNAME]"
+msgstr ""
+
+#: watcherclient/shell.py:396
+msgid ""
+"You must provide a password via either --os-password, env[OS_PASSWORD], "
+"or prompted response"
+msgstr ""
+
+#: watcherclient/shell.py:403
+msgid ""
+"You must provide a project name or project id via --os-project-name, "
+"--os-project-id, env[OS_PROJECT_ID] or env[OS_PROJECT_NAME].  You may use"
+" os-project and os-tenant interchangeably."
+msgstr ""
+
+#: watcherclient/shell.py:410
+msgid ""
+"You must provide an auth url via either --os-auth-url or via "
+"env[OS_AUTH_URL]"
+msgstr ""
+
+#: watcherclient/shell.py:473
+msgid "Invalid OpenStack Identity credentials"
+msgstr ""
+
+#: watcherclient/shell.py:483
+#, python-format
+msgid "'%s' is not a valid subcommand"
+msgstr ""
+
+#: watcherclient/common/cliutils.py:40
+#, python-format
+msgid "Missing arguments: %s"
+msgstr ""
+
+#: watcherclient/common/cliutils.py:158
+#, python-format
+msgid ""
+"Field labels list %(labels)s has different number of elements than fields"
+" list %(fields)s"
+msgstr ""
+
+#: watcherclient/common/http.py:88
+#, python-format
+msgid "Unsupported scheme: %s"
+msgstr ""
+
+#: watcherclient/common/http.py:162
+#, python-format
+msgid "Error finding address for %(url)s: %(e)s"
+msgstr ""
+
+#: watcherclient/common/http.py:167
+#, python-format
+msgid "Error communicating with %(endpoint)s %(e)s"
+msgstr ""
+
+#: watcherclient/common/http.py:181
+msgid "Request returned failure status."
+msgstr ""
+
+#: watcherclient/common/http.py:213 watcherclient/common/http.py:337
+msgid "Could not decode response body as JSON"
+msgstr ""
+
+#: watcherclient/common/utils.py:87
+#, python-format
+msgid "Attributes must be a list of PATH=VALUE not \"%s\""
+msgstr ""
+
+#: watcherclient/common/utils.py:120
+#, python-format
+msgid "Unknown PATCH operation: %s"
+msgstr ""
+
+#: watcherclient/common/utils.py:136
+#, python-format
+msgid "Expected non-negative --limit, got %s"
+msgstr ""
+
+#: watcherclient/common/utils.py:147
+#, python-format
+msgid ""
+"%(sort_key)s is an invalid field for sorting, valid values for --sort-key"
+" are: %(valid)s"
+msgstr ""
+
+#: watcherclient/common/utils.py:155
+#, python-format
+msgid ""
+"%s is an invalid value for sort direction, valid values for --sort-dir "
+"are: 'asc', 'desc'"
+msgstr ""
+
+#: watcherclient/common/apiclient/base.py:244
+#: watcherclient/common/apiclient/base.py:401
+#, python-format
+msgid "No %(name)s matching %(args)s."
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:83
+#, python-format
+msgid "Authentication failed. Missing options: %s"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:92
+#, python-format
+msgid "AuthSystemNotFound: %r"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:115
+#, python-format
+msgid "AmbiguousEndpoints: %r"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:122
+msgid "HTTP Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:142
+msgid "HTTP Redirection"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:150
+msgid "HTTP Client Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:159
+msgid "HTTP Server Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:169
+msgid "Multiple Choices"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:178
+msgid "Bad Request"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:188
+msgid "Unauthorized"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:197
+msgid "Payment Required"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:207
+msgid "Forbidden"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:217
+msgid "Not Found"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:227
+msgid "Method Not Allowed"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:237
+msgid "Not Acceptable"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:246
+msgid "Proxy Authentication Required"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:255
+msgid "Request Timeout"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:265
+msgid "Conflict"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:275
+msgid "Gone"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:285
+msgid "Length Required"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:295
+msgid "Precondition Failed"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:304
+msgid "Request Entity Too Large"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:321
+msgid "Request-URI Too Long"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:331
+msgid "Unsupported Media Type"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:341
+msgid "Requested Range Not Satisfiable"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:350
+msgid "Expectation Failed"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:360
+msgid "Unprocessable Entity"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:369
+msgid "Internal Server Error"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:380
+msgid "Not Implemented"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:390
+msgid "Bad Gateway"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:399
+msgid "Service Unavailable"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:409
+msgid "Gateway Timeout"
+msgstr ""
+
+#: watcherclient/common/apiclient/exceptions.py:418
+msgid "HTTP Version Not Supported"
+msgstr ""
+
--- a/watcherclient/openstack/common/init.py
+++ b/watcherclient/openstack/common/init.py
--- a/watcherclient/openstack/common/_i18n.py
+++ b/watcherclient/openstack/common/_i18n.py
@@ -1,45 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""oslo.i18n integration module.
-
-See http://docs.openstack.org/developer/oslo.i18n/usage.html
-
-"""
-
-try:
-    import oslo_i18n
-
-    # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
-    # application name when this module is synced into the separate
-    # repository. It is OK to have more than one translation function
-    # using the same domain, since there will still only be one message
-    # catalog.
-    _translators = oslo_i18n.TranslatorFactory(domain='watcherclient')
-
-    # The primary translation function using the well-known name "_"
-    _ = _translators.primary
-
-    # Translators for log levels.
-    #
-    # The abbreviated names are meant to reflect the usual use of a short
-    # name like '_'. The "L" is for "log" and the other letter comes from
-    # the level.
-    _LI = _translators.log_info
-    _LW = _translators.log_warning
-    _LE = _translators.log_error
-    _LC = _translators.log_critical
-except ImportError:
-    # NOTE(dims): Support for cases where a project wants to use
-    # code from oslo-incubator, but is not ready to be internationalized
-    # (like tempest)
-    _ = _LI = _LW = _LE = _LC = lambda x: x
--- a/watcherclient/openstack/common/apiclient/init.py
+++ b/watcherclient/openstack/common/apiclient/init.py
--- a/watcherclient/openstack/common/apiclient/auth.py
+++ b/watcherclient/openstack/common/apiclient/auth.py
@@ -1,234 +0,0 @@
-# Copyright 2013 OpenStack Foundation
-# Copyright 2013 Spanish National Research Council.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-# E0202: An attribute inherited from %s hide this method
-# pylint: disable=E0202
-
-########################################################################
-#
-# THIS MODULE IS DEPRECATED
-#
-# Please refer to
-# https://etherpad.openstack.org/p/kilo-watcherclient-library-proposals for
-# the discussion leading to this deprecation.
-#
-# We recommend checking out the python-openstacksdk project
-# (https://launchpad.net/python-openstacksdk) instead.
-#
-########################################################################
-
-import abc
-import argparse
-import os
-
-import six
-from stevedore import extension
-
-from watcherclient.openstack.common.apiclient import exceptions
-
-
-_discovered_plugins = {}
-
-
-def discover_auth_systems():
-    """Discover the available auth-systems.
-
-    This won't take into account the old style auth-systems.
-    """
-    global _discovered_plugins
-    _discovered_plugins = {}
-
-    def add_plugin(ext):
-        _discovered_plugins[ext.name] = ext.plugin
-
-    ep_namespace = "watcherclient.openstack.common.apiclient.auth"
-    mgr = extension.ExtensionManager(ep_namespace)
-    mgr.map(add_plugin)
-
-
-def load_auth_system_opts(parser):
-    """Load options needed by the available auth-systems into a parser.
-
-    This function will try to populate the parser with options from the
-    available plugins.
-    """
-    group = parser.add_argument_group("Common auth options")
-    BaseAuthPlugin.add_common_opts(group)
-    for name, auth_plugin in six.iteritems(_discovered_plugins):
-        group = parser.add_argument_group(
-            "Auth-system '%s' options" % name,
-            conflict_handler="resolve")
-        auth_plugin.add_opts(group)
-
-
-def load_plugin(auth_system):
-    try:
-        plugin_class = _discovered_plugins[auth_system]
-    except KeyError:
-        raise exceptions.AuthSystemNotFound(auth_system)
-    return plugin_class(auth_system=auth_system)
-
-
-def load_plugin_from_args(args):
-    """Load required plugin and populate it with options.
-
-    Try to guess auth system if it is not specified. Systems are tried in
-    alphabetical order.
-
-    :type args: argparse.Namespace
-    :raises: AuthPluginOptionsMissing
-    """
-    auth_system = args.os_auth_system
-    if auth_system:
-        plugin = load_plugin(auth_system)
-        plugin.parse_opts(args)
-        plugin.sufficient_options()
-        return plugin
-
-    for plugin_auth_system in sorted(six.iterkeys(_discovered_plugins)):
-        plugin_class = _discovered_plugins[plugin_auth_system]
-        plugin = plugin_class()
-        plugin.parse_opts(args)
-        try:
-            plugin.sufficient_options()
-        except exceptions.AuthPluginOptionsMissing:
-            continue
-        return plugin
-    raise exceptions.AuthPluginOptionsMissing(["auth_system"])
-
-
-@six.add_metaclass(abc.ABCMeta)
-class BaseAuthPlugin(object):
-    """Base class for authentication plugins.
-
-    An authentication plugin needs to override at least the authenticate
-    method to be a valid plugin.
-    """
-
-    auth_system = None
-    opt_names = []
-    common_opt_names = [
-        "auth_system",
-        "username",
-        "password",
-        "tenant_name",
-        "token",
-        "auth_url",
-    ]
-
-    def __init__(self, auth_system=None, **kwargs):
-        self.auth_system = auth_system or self.auth_system
-        self.opts = dict((name, kwargs.get(name))
-                         for name in self.opt_names)
-
-    @staticmethod
-    def _parser_add_opt(parser, opt):
-        """Add an option to parser in two variants.
-
-        :param opt: option name (with underscores)
-        """
-        dashed_opt = opt.replace("_", "-")
-        env_var = "OS_%s" % opt.upper()
-        arg_default = os.environ.get(env_var, "")
-        arg_help = "Defaults to env[%s]." % env_var
-        parser.add_argument(
-            "--os-%s" % dashed_opt,
-            metavar="<%s>" % dashed_opt,
-            default=arg_default,
-            help=arg_help)
-        parser.add_argument(
-            "--os_%s" % opt,
-            metavar="<%s>" % dashed_opt,
-            help=argparse.SUPPRESS)
-
-    @classmethod
-    def add_opts(cls, parser):
-        """Populate the parser with the options for this plugin.
-        """
-        for opt in cls.opt_names:
-            # use `BaseAuthPlugin.common_opt_names` since it is never
-            # changed in child classes
-            if opt not in BaseAuthPlugin.common_opt_names:
-                cls._parser_add_opt(parser, opt)
-
-    @classmethod
-    def add_common_opts(cls, parser):
-        """Add options that are common for several plugins.
-        """
-        for opt in cls.common_opt_names:
-            cls._parser_add_opt(parser, opt)
-
-    @staticmethod
-    def get_opt(opt_name, args):
-        """Return option name and value.
-
-        :param opt_name: name of the option, e.g., "username"
-        :param args: parsed arguments
-        """
-        return (opt_name, getattr(args, "os_%s" % opt_name, None))
-
-    def parse_opts(self, args):
-        """Parse the actual auth-system options if any.
-
-        This method is expected to populate the attribute `self.opts` with a
-        dict containing the options and values needed to make authentication.
-        """
-        self.opts.update(dict(self.get_opt(opt_name, args)
-                              for opt_name in self.opt_names))
-
-    def authenticate(self, http_client):
-        """Authenticate using plugin defined method.
-
-        The method usually analyses `self.opts` and performs
-        a request to authentication server.
-
-        :param http_client: client object that needs authentication
-        :type http_client: HTTPClient
-        :raises: AuthorizationFailure
-        """
-        self.sufficient_options()
-        self._do_authenticate(http_client)
-
-    @abc.abstractmethod
-    def _do_authenticate(self, http_client):
-        """Protected method for authentication.
-        """
-
-    def sufficient_options(self):
-        """Check if all required options are present.
-
-        :raises: AuthPluginOptionsMissing
-        """
-        missing = [opt
-                   for opt in self.opt_names
-                   if not self.opts.get(opt)]
-        if missing:
-            raise exceptions.AuthPluginOptionsMissing(missing)
-
-    @abc.abstractmethod
-    def token_and_endpoint(self, endpoint_type, service_type):
-        """Return token and endpoint.
-
-        :param service_type: Service type of the endpoint
-        :type service_type: string
-        :param endpoint_type: Type of endpoint.
-                              Possible values: public or publicURL,
-                              internal or internalURL,
-                              admin or adminURL
-        :type endpoint_type: string
-        :returns: tuple of token and endpoint strings
-        :raises: EndpointException
-        """
--- a/watcherclient/openstack/common/apiclient/client.py
+++ b/watcherclient/openstack/common/apiclient/client.py
@@ -1,388 +0,0 @@
-# Copyright 2010 Jacob Kaplan-Moss
-# Copyright 2011 OpenStack Foundation
-# Copyright 2011 Piston Cloud Computing, Inc.
-# Copyright 2013 Alessio Ababilov
-# Copyright 2013 Grid Dynamics
-# Copyright 2013 OpenStack Foundation
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-OpenStack Client interface. Handles the REST calls and responses.
-"""
-
-# E0202: An attribute inherited from %s hide this method
-# pylint: disable=E0202
-
-import hashlib
-import logging
-import time
-
-try:
-    import simplejson as json
-except ImportError:
-    import json
-
-from oslo_utils import encodeutils
-from oslo_utils import importutils
-import requests
-
-from watcherclient.openstack.common._i18n import _
-from watcherclient.openstack.common.apiclient import exceptions
-
-_logger = logging.getLogger(__name__)
-SENSITIVE_HEADERS = ('X-Auth-Token', 'X-Subject-Token',)
-
-
-class HTTPClient(object):
-    """This client handles sending HTTP requests to OpenStack servers.
-
-    Features:
-
-    - share authentication information between several clients to different
-      services (e.g., for compute and image clients);
-    - reissue authentication request for expired tokens;
-    - encode/decode JSON bodies;
-    - raise exceptions on HTTP errors;
-    - pluggable authentication;
-    - store authentication information in a keyring;
-    - store time spent for requests;
-    - register clients for particular services, so one can use
-      `http_client.identity` or `http_client.compute`;
-    - log requests and responses in a format that is easy to copy-and-paste
-      into terminal and send the same request with curl.
-    """
-
-    user_agent = "watcherclient.openstack.common.apiclient"
-
-    def __init__(self,
-                 auth_plugin,
-                 region_name=None,
-                 endpoint_type="publicURL",
-                 original_ip=None,
-                 verify=True,
-                 cert=None,
-                 timeout=None,
-                 timings=False,
-                 keyring_saver=None,
-                 debug=False,
-                 user_agent=None,
-                 http=None):
-        self.auth_plugin = auth_plugin
-
-        self.endpoint_type = endpoint_type
-        self.region_name = region_name
-
-        self.original_ip = original_ip
-        self.timeout = timeout
-        self.verify = verify
-        self.cert = cert
-
-        self.keyring_saver = keyring_saver
-        self.debug = debug
-        self.user_agent = user_agent or self.user_agent
-
-        self.times = []  # [("item", starttime, endtime), ...]
-        self.timings = timings
-
-        # requests within the same session can reuse TCP connections from pool
-        self.http = http or requests.Session()
-
-        self.cached_token = None
-        self.last_request_id = None
-
-    def _safe_header(self, name, value):
-        if name in SENSITIVE_HEADERS:
-            # because in python3 byte string handling is ... ug
-            v = value.encode('utf-8')
-            h = hashlib.sha1(v)
-            d = h.hexdigest()
-            return encodeutils.safe_decode(name), "{SHA1}%s" % d
-        else:
-            return (encodeutils.safe_decode(name),
-                    encodeutils.safe_decode(value))
-
-    def _http_log_req(self, method, url, kwargs):
-        if not self.debug:
-            return
-
-        string_parts = [
-            "curl -g -i",
-            "-X '%s'" % method,
-            "'%s'" % url,
-        ]
-
-        for element in kwargs['headers']:
-            header = ("-H '%s: %s'" %
-                      self._safe_header(element, kwargs['headers'][element]))
-            string_parts.append(header)
-
-        _logger.debug("REQ: %s" % " ".join(string_parts))
-        if 'data' in kwargs:
-            _logger.debug("REQ BODY: %s\n" % (kwargs['data']))
-
-    def _http_log_resp(self, resp):
-        if not self.debug:
-            return
-        _logger.debug(
-            "RESP: [%s] %s\n",
-            resp.status_code,
-            resp.headers)
-        if resp._content_consumed:
-            _logger.debug(
-                "RESP BODY: %s\n",
-                resp.text)
-
-    def serialize(self, kwargs):
-        if kwargs.get('json') is not None:
-            kwargs['headers']['Content-Type'] = 'application/json'
-            kwargs['data'] = json.dumps(kwargs['json'])
-        try:
-            del kwargs['json']
-        except KeyError:
-            pass
-
-    def get_timings(self):
-        return self.times
-
-    def reset_timings(self):
-        self.times = []
-
-    def request(self, method, url, **kwargs):
-        """Send an http request with the specified characteristics.
-
-        Wrapper around `requests.Session.request` to handle tasks such as
-        setting headers, JSON encoding/decoding, and error handling.
-
-        :param method: method of HTTP request
-        :param url: URL of HTTP request
-        :param kwargs: any other parameter that can be passed to
-             requests.Session.request (such as `headers`) or `json`
-             that will be encoded as JSON and used as `data` argument
-        """
-        kwargs.setdefault("headers", {})
-        kwargs["headers"]["User-Agent"] = self.user_agent
-        if self.original_ip:
-            kwargs["headers"]["Forwarded"] = "for=%s;by=%s" % (
-                self.original_ip, self.user_agent)
-        if self.timeout is not None:
-            kwargs.setdefault("timeout", self.timeout)
-        kwargs.setdefault("verify", self.verify)
-        if self.cert is not None:
-            kwargs.setdefault("cert", self.cert)
-        self.serialize(kwargs)
-
-        self._http_log_req(method, url, kwargs)
-        if self.timings:
-            start_time = time.time()
-        resp = self.http.request(method, url, **kwargs)
-        if self.timings:
-            self.times.append(("%s %s" % (method, url),
-                               start_time, time.time()))
-        self._http_log_resp(resp)
-
-        self.last_request_id = resp.headers.get('x-openstack-request-id')
-
-        if resp.status_code >= 400:
-            _logger.debug(
-                "Request returned failure status: %s",
-                resp.status_code)
-            raise exceptions.from_response(resp, method, url)
-
-        return resp
-
-    @staticmethod
-    def concat_url(endpoint, url):
-        """Concatenate endpoint and final URL.
-
-        E.g., "http://keystone/v2.0/" and "/tokens" are concatenated to
-        "http://keystone/v2.0/tokens".
-
-        :param endpoint: the base URL
-        :param url: the final URL
-        """
-        return "%s/%s" % (endpoint.rstrip("/"), url.strip("/"))
-
-    def client_request(self, client, method, url, **kwargs):
-        """Send an http request using `client`'s endpoint and specified `url`.
-
-        If request was rejected as unauthorized (possibly because the token is
-        expired), issue one authorization attempt and send the request once
-        again.
-
-        :param client: instance of BaseClient descendant
-        :param method: method of HTTP request
-        :param url: URL of HTTP request
-        :param kwargs: any other parameter that can be passed to
-            `HTTPClient.request`
-        """
-
-        filter_args = {
-            "endpoint_type": client.endpoint_type or self.endpoint_type,
-            "service_type": client.service_type,
-        }
-        token, endpoint = (self.cached_token, client.cached_endpoint)
-        just_authenticated = False
-        if not (token and endpoint):
-            try:
-                token, endpoint = self.auth_plugin.token_and_endpoint(
-                    **filter_args)
-            except exceptions.EndpointException:
-                pass
-            if not (token and endpoint):
-                self.authenticate()
-                just_authenticated = True
-                token, endpoint = self.auth_plugin.token_and_endpoint(
-                    **filter_args)
-                if not (token and endpoint):
-                    raise exceptions.AuthorizationFailure(
-                        _("Cannot find endpoint or token for request"))
-
-        old_token_endpoint = (token, endpoint)
-        kwargs.setdefault("headers", {})["X-Auth-Token"] = token
-        self.cached_token = token
-        client.cached_endpoint = endpoint
-        # Perform the request once. If we get Unauthorized, then it
-        # might be because the auth token expired, so try to
-        # re-authenticate and try again. If it still fails, bail.
-        try:
-            return self.request(
-                method, self.concat_url(endpoint, url), **kwargs)
-        except exceptions.Unauthorized as unauth_ex:
-            if just_authenticated:
-                raise
-            self.cached_token = None
-            client.cached_endpoint = None
-            if self.auth_plugin.opts.get('token'):
-                self.auth_plugin.opts['token'] = None
-            if self.auth_plugin.opts.get('endpoint'):
-                self.auth_plugin.opts['endpoint'] = None
-            self.authenticate()
-            try:
-                token, endpoint = self.auth_plugin.token_and_endpoint(
-                    **filter_args)
-            except exceptions.EndpointException:
-                raise unauth_ex
-            if (not (token and endpoint) or
-                    old_token_endpoint == (token, endpoint)):
-                raise unauth_ex
-            self.cached_token = token
-            client.cached_endpoint = endpoint
-            kwargs["headers"]["X-Auth-Token"] = token
-            return self.request(
-                method, self.concat_url(endpoint, url), **kwargs)
-
-    def add_client(self, base_client_instance):
-        """Add a new instance of :class:`BaseClient` descendant.
-
-        `self` will store a reference to `base_client_instance`.
-
-        Example:
-
-        >>> def test_clients():
-        ...     from keystoneclient.auth import keystone
-        ...     from openstack.common.apiclient import client
-        ...     auth = keystone.KeystoneAuthPlugin(
-        ...         username="user", password="pass", tenant_name="tenant",
-        ...         auth_url="http://auth:5000/v2.0")
-        ...     openstack_client = client.HTTPClient(auth)
-        ...     # create nova client
-        ...     from novaclient.v1_1 import client
-        ...     client.Client(openstack_client)
-        ...     # create keystone client
-        ...     from keystoneclient.v2_0 import client
-        ...     client.Client(openstack_client)
-        ...     # use them
-        ...     openstack_client.identity.tenants.list()
-        ...     openstack_client.compute.servers.list()
-        """
-        service_type = base_client_instance.service_type
-        if service_type and not hasattr(self, service_type):
-            setattr(self, service_type, base_client_instance)
-
-    def authenticate(self):
-        self.auth_plugin.authenticate(self)
-        # Store the authentication results in the keyring for later requests
-        if self.keyring_saver:
-            self.keyring_saver.save(self)
-
-
-class BaseClient(object):
-    """Top-level object to access the OpenStack API.
-
-    This client uses :class:`HTTPClient` to send requests. :class:`HTTPClient`
-    will handle a bunch of issues such as authentication.
-    """
-
-    service_type = None
-    endpoint_type = None  # "publicURL" will be used
-    cached_endpoint = None
-
-    def __init__(self, http_client, extensions=None):
-        self.http_client = http_client
-        http_client.add_client(self)
-
-        # Add in any extensions...
-        if extensions:
-            for extension in extensions:
-                if extension.manager_class:
-                    setattr(self, extension.name,
-                            extension.manager_class(self))
-
-    def client_request(self, method, url, **kwargs):
-        return self.http_client.client_request(
-            self, method, url, **kwargs)
-
-    @property
-    def last_request_id(self):
-        return self.http_client.last_request_id
-
-    def head(self, url, **kwargs):
-        return self.client_request("HEAD", url, **kwargs)
-
-    def get(self, url, **kwargs):
-        return self.client_request("GET", url, **kwargs)
-
-    def post(self, url, **kwargs):
-        return self.client_request("POST", url, **kwargs)
-
-    def put(self, url, **kwargs):
-        return self.client_request("PUT", url, **kwargs)
-
-    def delete(self, url, **kwargs):
-        return self.client_request("DELETE", url, **kwargs)
-
-    def patch(self, url, **kwargs):
-        return self.client_request("PATCH", url, **kwargs)
-
-    @staticmethod
-    def get_class(api_name, version, version_map):
-        """Returns the client class for the requested API version
-
-        :param api_name: the name of the API, e.g. 'compute', 'image', etc
-        :param version: the requested API version
-        :param version_map: a dict of client classes keyed by version
-        :rtype: a client class for the requested API version
-        """
-        try:
-            client_path = version_map[str(version)]
-        except (KeyError, ValueError):
-            msg = _("Invalid %(api_name)s client version '%(version)s'. "
-                    "Must be one of: %(version_map)s") % {
-                        'api_name': api_name,
-                        'version': version,
-                        'version_map': ', '.join(version_map.keys())}
-            raise exceptions.UnsupportedVersion(msg)
-
-        return importutils.import_class(client_path)
--- a/watcherclient/openstack/common/apiclient/fake_client.py
+++ b/watcherclient/openstack/common/apiclient/fake_client.py
@@ -1,190 +0,0 @@
-# Copyright 2013 OpenStack Foundation
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-A fake server that "responds" to API methods with pre-canned responses.
-
-All of these responses come from the spec, so if for some reason the spec's
-wrong the tests might raise AssertionError. I've indicated in comments the
-places where actual behavior differs from the spec.
-"""
-
-########################################################################
-#
-# THIS MODULE IS DEPRECATED
-#
-# Please refer to
-# https://etherpad.openstack.org/p/kilo-watcherclient-library-proposals for
-# the discussion leading to this deprecation.
-#
-# We recommend checking out the python-openstacksdk project
-# (https://launchpad.net/python-openstacksdk) instead.
-#
-########################################################################
-
-# W0102: Dangerous default value %s as argument
-# pylint: disable=W0102
-
-import json
-
-import requests
-import six
-from six.moves.urllib import parse
-
-from watcherclient.openstack.common.apiclient import client
-
-
-def assert_has_keys(dct, required=None, optional=None):
-    required = required or []
-    optional = optional or []
-    for k in required:
-        try:
-            assert k in dct
-        except AssertionError:
-            extra_keys = set(dct.keys()).difference(set(required + optional))
-            raise AssertionError("found unexpected keys: %s" %
-                                 list(extra_keys))
-
-
-class TestResponse(requests.Response):
-    """Wrap requests.Response and provide a convenient initialization.
-    """
-
-    def __init__(self, data):
-        super(TestResponse, self).__init__()
-        self._content_consumed = True
-        if isinstance(data, dict):
-            self.status_code = data.get('status_code', 200)
-            # Fake the text attribute to streamline Response creation
-            text = data.get('text', "")
-            if isinstance(text, (dict, list)):
-                self._content = json.dumps(text)
-                default_headers = {
-                    "Content-Type": "application/json",
-                }
-            else:
-                self._content = text
-                default_headers = {}
-            if six.PY3 and isinstance(self._content, six.string_types):
-                self._content = self._content.encode('utf-8', 'strict')
-            self.headers = data.get('headers') or default_headers
-        else:
-            self.status_code = data
-
-    def __eq__(self, other):
-        return (self.status_code == other.status_code and
-                self.headers == other.headers and
-                self._content == other._content)
-
-
-class FakeHTTPClient(client.HTTPClient):
-
-    def __init__(self, *args, **kwargs):
-        self.callstack = []
-        self.fixtures = kwargs.pop("fixtures", None) or {}
-        if not args and "auth_plugin" not in kwargs:
-            args = (None, )
-        super(FakeHTTPClient, self).__init__(*args, **kwargs)
-
-    def assert_called(self, method, url, body=None, pos=-1):
-        """Assert than an API method was just called.
-        """
-        expected = (method, url)
-        called = self.callstack[pos][0:2]
-        assert self.callstack, \
-            "Expected %s %s but no calls were made." % expected
-
-        assert expected == called, 'Expected %s %s; got %s %s' % \
-            (expected + called)
-
-        if body is not None:
-            if self.callstack[pos][3] != body:
-                raise AssertionError('%r != %r' %
-                                     (self.callstack[pos][3], body))
-
-    def assert_called_anytime(self, method, url, body=None):
-        """Assert than an API method was called anytime in the test.
-        """
-        expected = (method, url)
-
-        assert self.callstack, \
-            "Expected %s %s but no calls were made." % expected
-
-        found = False
-        entry = None
-        for entry in self.callstack:
-            if expected == entry[0:2]:
-                found = True
-                break
-
-        assert found, 'Expected %s %s; got %s' % \
-            (method, url, self.callstack)
-        if body is not None:
-            assert entry[3] == body, "%s != %s" % (entry[3], body)
-
-        self.callstack = []
-
-    def clear_callstack(self):
-        self.callstack = []
-
-    def authenticate(self):
-        pass
-
-    def client_request(self, client, method, url, **kwargs):
-        # Check that certain things are called correctly
-        if method in ["GET", "DELETE"]:
-            assert "json" not in kwargs
-
-        # Note the call
-        self.callstack.append(
-            (method,
-             url,
-             kwargs.get("headers") or {},
-             kwargs.get("json") or kwargs.get("data")))
-        try:
-            fixture = self.fixtures[url][method]
-        except KeyError:
-            pass
-        else:
-            return TestResponse({"headers": fixture[0],
-                                 "text": fixture[1]})
-
-        # Call the method
-        args = parse.parse_qsl(parse.urlparse(url)[4])
-        kwargs.update(args)
-        munged_url = url.rsplit('?', 1)[0]
-        munged_url = munged_url.strip('/').replace('/', '_').replace('.', '_')
-        munged_url = munged_url.replace('-', '_')
-
-        callback = "%s_%s" % (method.lower(), munged_url)
-
-        if not hasattr(self, callback):
-            raise AssertionError('Called unknown API method: %s %s, '
-                                 'expected fakes method name: %s' %
-                                 (method, url, callback))
-
-        resp = getattr(self, callback)(**kwargs)
-        if len(resp) == 3:
-            status, headers, body = resp
-        else:
-            status, body = resp
-            headers = {}
-        self.last_request_id = headers.get('x-openstack-request-id',
-                                           'req-test')
-        return TestResponse({
-            "status_code": status,
-            "text": body,
-            "headers": headers,
-        })
--- a/watcherclient/openstack/common/apiclient/utils.py
+++ b/watcherclient/openstack/common/apiclient/utils.py
@@ -1,100 +0,0 @@
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-########################################################################
-#
-# THIS MODULE IS DEPRECATED
-#
-# Please refer to
-# https://etherpad.openstack.org/p/kilo-watcherclient-library-proposals for
-# the discussion leading to this deprecation.
-#
-# We recommend checking out the python-openstacksdk project
-# (https://launchpad.net/python-openstacksdk) instead.
-#
-########################################################################
-
-from oslo_utils import encodeutils
-from oslo_utils import uuidutils
-import six
-
-from watcherclient.openstack.common._i18n import _
-from watcherclient.openstack.common.apiclient import exceptions
-
-
-def find_resource(manager, name_or_id, **find_args):
-    """Look for resource in a given manager.
-
-    Used as a helper for the _find_* methods.
-    Example:
-
-    .. code-block:: python
-
-        def _find_hypervisor(cs, hypervisor):
-            #Get a hypervisor by name or ID.
-            return cliutils.find_resource(cs.hypervisors, hypervisor)
-    """
-    # first try to get entity as integer id
-    try:
-        return manager.get(int(name_or_id))
-    except (TypeError, ValueError, exceptions.NotFound):
-        pass
-
-    # now try to get entity as uuid
-    try:
-        if six.PY2:
-            tmp_id = encodeutils.safe_encode(name_or_id)
-        else:
-            tmp_id = encodeutils.safe_decode(name_or_id)
-
-        if uuidutils.is_uuid_like(tmp_id):
-            return manager.get(tmp_id)
-    except (TypeError, ValueError, exceptions.NotFound):
-        pass
-
-    # for str id which is not uuid
-    if getattr(manager, 'is_alphanum_id_allowed', False):
-        try:
-            return manager.get(name_or_id)
-        except exceptions.NotFound:
-            pass
-
-    try:
-        try:
-            return manager.find(human_id=name_or_id, **find_args)
-        except exceptions.NotFound:
-            pass
-
-        # finally try to find entity by name
-        try:
-            resource = getattr(manager, 'resource_class', None)
-            name_attr = resource.NAME_ATTR if resource else 'name'
-            kwargs = {name_attr: name_or_id}
-            kwargs.update(find_args)
-            return manager.find(**kwargs)
-        except exceptions.NotFound:
-            msg = _("No %(name)s with a name or "
-                    "ID of '%(name_or_id)s' exists.") % \
-                {
-                    "name": manager.resource_class.__name__.lower(),
-                    "name_or_id": name_or_id
-                }
-            raise exceptions.CommandError(msg)
-    except exceptions.NoUniqueMatch:
-        msg = _("Multiple %(name)s matches found for "
-                "'%(name_or_id)s', use an ID to be more specific.") % \
-            {
-                "name": manager.resource_class.__name__.lower(),
-                "name_or_id": name_or_id
-            }
-        raise exceptions.CommandError(msg)
--- a/watcherclient/openstack/common/gettextutils.py
+++ b/watcherclient/openstack/common/gettextutils.py
@@ -1,479 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-# Copyright 2013 IBM Corp.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-gettext for openstack-common modules.
-
-Usual usage in an openstack.common module:
-
-    from watcherclient.openstack.common.gettextutils import _
-"""
-
-import copy
-import gettext
-import locale
-from logging import handlers
-import os
-
-from babel import localedata
-import six
-
-_AVAILABLE_LANGUAGES = {}
-
-# FIXME(dhellmann): Remove this when moving to oslo.i18n.
-USE_LAZY = False
-
-
-class TranslatorFactory(object):
-    """Create translator functions
-    """
-
-    def __init__(self, domain, localedir=None):
-        """Establish a set of translation functions for the domain.
-
-        :param domain: Name of translation domain,
-                       specifying a message catalog.
-        :type domain: str
-        :param lazy: Delays translation until a message is emitted.
-                     Defaults to False.
-        :type lazy: Boolean
-        :param localedir: Directory with translation catalogs.
-        :type localedir: str
-        """
-        self.domain = domain
-        if localedir is None:
-            localedir = os.environ.get(domain.upper() + '_LOCALEDIR')
-        self.localedir = localedir
-
-    def _make_translation_func(self, domain=None):
-        """Return a new translation function ready for use.
-
-        Takes into account whether or not lazy translation is being
-        done.
-
-        The domain can be specified to override the default from the
-        factory, but the localedir from the factory is always used
-        because we assume the log-level translation catalogs are
-        installed in the same directory as the main application
-        catalog.
-
-        """
-        if domain is None:
-            domain = self.domain
-        t = gettext.translation(domain,
-                                localedir=self.localedir,
-                                fallback=True)
-        # Use the appropriate method of the translation object based
-        # on the python version.
-        m = t.gettext if six.PY3 else t.ugettext
-
-        def f(msg):
-            """oslo.i18n.gettextutils translation function."""
-            if USE_LAZY:
-                return Message(msg, domain=domain)
-            return m(msg)
-        return f
-
-    @property
-    def primary(self):
-        "The default translation function."
-        return self._make_translation_func()
-
-    def _make_log_translation_func(self, level):
-        return self._make_translation_func(self.domain + '-log-' + level)
-
-    @property
-    def log_info(self):
-        "Translate info-level log messages."
-        return self._make_log_translation_func('info')
-
-    @property
-    def log_warning(self):
-        "Translate warning-level log messages."
-        return self._make_log_translation_func('warning')
-
-    @property
-    def log_error(self):
-        "Translate error-level log messages."
-        return self._make_log_translation_func('error')
-
-    @property
-    def log_critical(self):
-        "Translate critical-level log messages."
-        return self._make_log_translation_func('critical')
-
-
-# NOTE(dhellmann): When this module moves out of the incubator into
-# oslo.i18n, these global variables can be moved to an integration
-# module within each application.
-
-# Create the global translation functions.
-_translators = TranslatorFactory('watcherclient')
-
-# The primary translation function using the well-known name "_"
-_ = _translators.primary
-
-# Translators for log levels.
-#
-# The abbreviated names are meant to reflect the usual use of a short
-# name like '_'. The "L" is for "log" and the other letter comes from
-# the level.
-_LI = _translators.log_info
-_LW = _translators.log_warning
-_LE = _translators.log_error
-_LC = _translators.log_critical
-
-# NOTE(dhellmann): End of globals that will move to the application's
-# integration module.
-
-
-def enable_lazy():
-    """Convenience function for configuring _() to use lazy gettext
-
-    Call this at the start of execution to enable the gettextutils._
-    function to use lazy gettext functionality. This is useful if
-    your project is importing _ directly instead of using the
-    gettextutils.install() way of importing the _ function.
-    """
-    global USE_LAZY
-    USE_LAZY = True
-
-
-def install(domain):
-    """Install a _() function using the given translation domain.
-
-    Given a translation domain, install a _() function using gettext's
-    install() function.
-
-    The main difference from gettext.install() is that we allow
-    overriding the default localedir (e.g. /usr/share/locale) using
-    a translation-domain-specific environment variable (e.g.
-    NOVA_LOCALEDIR).
-
-    Note that to enable lazy translation, enable_lazy must be
-    called.
-
-    :param domain: the translation domain
-    """
-    from six import moves
-    tf = TranslatorFactory(domain)
-    moves.builtins.__dict__['_'] = tf.primary
-
-
-class Message(six.text_type):
-    """A Message object is a unicode object that can be translated.
-
-    Translation of Message is done explicitly using the translate() method.
-    For all non-translation intents and purposes, a Message is simply unicode,
-    and can be treated as such.
-    """
-
-    def __new__(cls, msgid, msgtext=None, params=None,
-                domain='watcherclient', *args):
-        """Create a new Message object.
-
-        In order for translation to work gettext requires a message ID, this
-        msgid will be used as the base unicode text. It is also possible
-        for the msgid and the base unicode text to be different by passing
-        the msgtext parameter.
-        """
-        # If the base msgtext is not given, we use the default translation
-        # of the msgid (which is in English) just in case the system locale is
-        # not English, so that the base text will be in that locale by default.
-        if not msgtext:
-            msgtext = Message._translate_msgid(msgid, domain)
-        # We want to initialize the parent unicode with the actual object that
-        # would have been plain unicode if 'Message' was not enabled.
-        msg = super(Message, cls).__new__(cls, msgtext)
-        msg.msgid = msgid
-        msg.domain = domain
-        msg.params = params
-        return msg
-
-    def translate(self, desired_locale=None):
-        """Translate this message to the desired locale.
-
-        :param desired_locale: The desired locale to translate the message to,
-                               if no locale is provided the message will be
-                               translated to the system's default locale.
-
-        :returns: the translated message in unicode
-        """
-
-        translated_message = Message._translate_msgid(self.msgid,
-                                                      self.domain,
-                                                      desired_locale)
-        if self.params is None:
-            # No need for more translation
-            return translated_message
-
-        # This Message object may have been formatted with one or more
-        # Message objects as substitution arguments, given either as a single
-        # argument, part of a tuple, or as one or more values in a dictionary.
-        # When translating this Message we need to translate those Messages too
-        translated_params = _translate_args(self.params, desired_locale)
-
-        translated_message = translated_message % translated_params
-
-        return translated_message
-
-    @staticmethod
-    def _translate_msgid(msgid, domain, desired_locale=None):
-        if not desired_locale:
-            system_locale = locale.getdefaultlocale()
-            # If the system locale is not available to the runtime use English
-            if not system_locale[0]:
-                desired_locale = 'en_US'
-            else:
-                desired_locale = system_locale[0]
-
-        locale_dir = os.environ.get(domain.upper() + '_LOCALEDIR')
-        lang = gettext.translation(domain,
-                                   localedir=locale_dir,
-                                   languages=[desired_locale],
-                                   fallback=True)
-        if six.PY3:
-            translator = lang.gettext
-        else:
-            translator = lang.ugettext
-
-        translated_message = translator(msgid)
-        return translated_message
-
-    def __mod__(self, other):
-        # When we mod a Message we want the actual operation to be performed
-        # by the parent class (i.e. unicode()), the only thing  we do here is
-        # save the original msgid and the parameters in case of a translation
-        params = self._sanitize_mod_params(other)
-        unicode_mod = super(Message, self).__mod__(params)
-        modded = Message(self.msgid,
-                         msgtext=unicode_mod,
-                         params=params,
-                         domain=self.domain)
-        return modded
-
-    def _sanitize_mod_params(self, other):
-        """Sanitize the object being modded with this Message.
-
-        - Add support for modding 'None' so translation supports it
-        - Trim the modded object, which can be a large dictionary, to only
-        those keys that would actually be used in a translation
-        - Snapshot the object being modded, in case the message is
-        translated, it will be used as it was when the Message was created
-        """
-        if other is None:
-            params = (other,)
-        elif isinstance(other, dict):
-            # Merge the dictionaries
-            # Copy each item in case one does not support deep copy.
-            params = {}
-            if isinstance(self.params, dict):
-                for key, val in self.params.items():
-                    params[key] = self._copy_param(val)
-            for key, val in other.items():
-                params[key] = self._copy_param(val)
-        else:
-            params = self._copy_param(other)
-        return params
-
-    def _copy_param(self, param):
-        try:
-            return copy.deepcopy(param)
-        except Exception:
-            # Fallback to casting to unicode this will handle the
-            # python code-like objects that can't be deep-copied
-            return six.text_type(param)
-
-    def __add__(self, other):
-        msg = _('Message objects do not support addition.')
-        raise TypeError(msg)
-
-    def __radd__(self, other):
-        return self.__add__(other)
-
-    if six.PY2:
-        def __str__(self):
-            # NOTE(luisg): Logging in python 2.6 tries to str() log records,
-            # and it expects specifically a UnicodeError in order to proceed.
-            msg = _('Message objects do not support str() because they may '
-                    'contain non-ascii characters. '
-                    'Please use unicode() or translate() instead.')
-            raise UnicodeError(msg)
-
-
-def get_available_languages(domain):
-    """Lists the available languages for the given translation domain.
-
-    :param domain: the domain to get languages for
-    """
-    if domain in _AVAILABLE_LANGUAGES:
-        return copy.copy(_AVAILABLE_LANGUAGES[domain])
-
-    localedir = '%s_LOCALEDIR' % domain.upper()
-    find = lambda x: gettext.find(domain,
-                                  localedir=os.environ.get(localedir),
-                                  languages=[x])
-
-    # NOTE(mrodden): en_US should always be available (and first in case
-    # order matters) since our in-line message strings are en_US
-    language_list = ['en_US']
-    # NOTE(luisg): Babel <1.0 used a function called list(), which was
-    # renamed to locale_identifiers() in >=1.0, the requirements master list
-    # requires >=0.9.6, uncapped, so defensively work with both. We can remove
-    # this check when the master list updates to >=1.0, and update all projects
-    list_identifiers = (getattr(localedata, 'list', None) or
-                        getattr(localedata, 'locale_identifiers'))
-    locale_identifiers = list_identifiers()
-
-    for i in locale_identifiers:
-        if find(i) is not None:
-            language_list.append(i)
-
-    # NOTE(luisg): Babel>=1.0,<1.3 has a bug where some OpenStack supported
-    # locales (e.g. 'zh_CN', and 'zh_TW') aren't supported even though they
-    # are perfectly legitimate locales:
-    #     https://github.com/mitsuhiko/babel/issues/37
-    # In Babel 1.3 they fixed the bug and they support these locales, but
-    # they are still not explicitly "listed" by locale_identifiers().
-    # That is  why we add the locales here explicitly if necessary so that
-    # they are listed as supported.
-    aliases = {'zh': 'zh_CN',
-               'zh_Hant_HK': 'zh_HK',
-               'zh_Hant': 'zh_TW',
-               'fil': 'tl_PH'}
-    for (locale_, alias) in six.iteritems(aliases):
-        if locale_ in language_list and alias not in language_list:
-            language_list.append(alias)
-
-    _AVAILABLE_LANGUAGES[domain] = language_list
-    return copy.copy(language_list)
-
-
-def translate(obj, desired_locale=None):
-    """Gets the translated unicode representation of the given object.
-
-    If the object is not translatable it is returned as-is.
-    If the locale is None the object is translated to the system locale.
-
-    :param obj: the object to translate
-    :param desired_locale: the locale to translate the message to, if None the
-                           default system locale will be used
-    :returns: the translated object in unicode, or the original object if
-              it could not be translated
-    """
-    message = obj
-    if not isinstance(message, Message):
-        # If the object to translate is not already translatable,
-        # let's first get its unicode representation
-        message = six.text_type(obj)
-    if isinstance(message, Message):
-        # Even after unicoding() we still need to check if we are
-        # running with translatable unicode before translating
-        return message.translate(desired_locale)
-    return obj
-
-
-def _translate_args(args, desired_locale=None):
-    """Translates all the translatable elements of the given arguments object.
-
-    This method is used for translating the translatable values in method
-    arguments which include values of tuples or dictionaries.
-    If the object is not a tuple or a dictionary the object itself is
-    translated if it is translatable.
-
-    If the locale is None the object is translated to the system locale.
-
-    :param args: the args to translate
-    :param desired_locale: the locale to translate the args to, if None the
-                           default system locale will be used
-    :returns: a new args object with the translated contents of the original
-    """
-    if isinstance(args, tuple):
-        return tuple(translate(v, desired_locale) for v in args)
-    if isinstance(args, dict):
-        translated_dict = {}
-        for (k, v) in six.iteritems(args):
-            translated_v = translate(v, desired_locale)
-            translated_dict[k] = translated_v
-        return translated_dict
-    return translate(args, desired_locale)
-
-
-class TranslationHandler(handlers.MemoryHandler):
-    """Handler that translates records before logging them.
-
-    The TranslationHandler takes a locale and a target logging.Handler object
-    to forward LogRecord objects to after translating them. This handler
-    depends on Message objects being logged, instead of regular strings.
-
-    The handler can be configured declaratively in the logging.conf as follows:
-
-        [handlers]
-        keys = translatedlog, translator
-
-        [handler_translatedlog]
-        class = handlers.WatchedFileHandler
-        args = ('/var/log/api-localized.log',)
-        formatter = context
-
-        [handler_translator]
-        class = openstack.common.log.TranslationHandler
-        target = translatedlog
-        args = ('zh_CN',)
-
-    If the specified locale is not available in the system, the handler will
-    log in the default locale.
-    """
-
-    def __init__(self, locale=None, target=None):
-        """Initialize a TranslationHandler
-
-        :param locale: locale to use for translating messages
-        :param target: logging.Handler object to forward
-                       LogRecord objects to after translation
-        """
-        # NOTE(luisg): In order to allow this handler to be a wrapper for
-        # other handlers, such as a FileHandler, and still be able to
-        # configure it using logging.conf, this handler has to extend
-        # MemoryHandler because only the MemoryHandlers' logging.conf
-        # parsing is implemented such that it accepts a target handler.
-        handlers.MemoryHandler.__init__(self, capacity=0, target=target)
-        self.locale = locale
-
-    def setFormatter(self, fmt):
-        self.target.setFormatter(fmt)
-
-    def emit(self, record):
-        # We save the message from the original record to restore it
-        # after translation, so other handlers are not affected by this
-        original_msg = record.msg
-        original_args = record.args
-
-        try:
-            self._translate_and_log_record(record)
-        finally:
-            record.msg = original_msg
-            record.args = original_args
-
-    def _translate_and_log_record(self, record):
-        record.msg = translate(record.msg, self.locale)
-
-        # In addition to translating the message, we also need to translate
-        # arguments that were passed to the log method that were not part
-        # of the main message e.g., log.info(_('Some message %s'), this_one))
-        record.args = _translate_args(record.args, self.locale)
-
-        self.target.emit(record)
--- a/watcherclient/openstack/common/importutils.py
+++ b/watcherclient/openstack/common/importutils.py
@@ -1,73 +0,0 @@
-# Copyright 2011 OpenStack Foundation.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-Import related utilities and helper functions.
-"""
-
-import sys
-import traceback
-
-
-def import_class(import_str):
-    """Returns a class from a string including module and class."""
-    mod_str, _sep, class_str = import_str.rpartition('.')
-    __import__(mod_str)
-    try:
-        return getattr(sys.modules[mod_str], class_str)
-    except AttributeError:
-        raise ImportError('Class %s cannot be found (%s)' %
-                          (class_str,
-                           traceback.format_exception(*sys.exc_info())))
-
-
-def import_object(import_str, *args, **kwargs):
-    """Import a class and return an instance of it."""
-    return import_class(import_str)(*args, **kwargs)
-
-
-def import_object_ns(name_space, import_str, *args, **kwargs):
-    """Tries to import object from default namespace.
-
-    Imports a class and return an instance of it, first by trying
-    to find the class in a default namespace, then failing back to
-    a full path if not found in the default namespace.
-    """
-    import_value = "%s.%s" % (name_space, import_str)
-    try:
-        return import_class(import_value)(*args, **kwargs)
-    except ImportError:
-        return import_class(import_str)(*args, **kwargs)
-
-
-def import_module(import_str):
-    """Import a module."""
-    __import__(import_str)
-    return sys.modules[import_str]
-
-
-def import_versioned_module(version, submodule=None):
-    module = 'watcherclient.v%s' % version
-    if submodule:
-        module = '.'.join((module, submodule))
-    return import_module(module)
-
-
-def try_import(import_str, default=None):
-    """Try to import a module and if it fails return default."""
-    try:
-        return import_module(import_str)
-    except ImportError:
-        return default
--- a/watcherclient/openstack/common/strutils.py
+++ b/watcherclient/openstack/common/strutils.py
@@ -1,316 +0,0 @@
-# Copyright 2011 OpenStack Foundation.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-System-level utilities and helper functions.
-"""
-
-import math
-import re
-import sys
-import unicodedata
-
-import six
-
-from watcherclient.openstack.common.gettextutils import _
-
-
-UNIT_PREFIX_EXPONENT = {
-    'k': 1,
-    'K': 1,
-    'Ki': 1,
-    'M': 2,
-    'Mi': 2,
-    'G': 3,
-    'Gi': 3,
-    'T': 4,
-    'Ti': 4,
-}
-UNIT_SYSTEM_INFO = {
-    'IEC': (1024, re.compile(r'(^[-+]?\d*\.?\d+)([KMGT]i?)?(b|bit|B)$')),
-    'SI': (1000, re.compile(r'(^[-+]?\d*\.?\d+)([kMGT])?(b|bit|B)$')),
-}
-
-TRUE_STRINGS = ('1', 't', 'true', 'on', 'y', 'yes')
-FALSE_STRINGS = ('0', 'f', 'false', 'off', 'n', 'no')
-
-SLUGIFY_STRIP_RE = re.compile(r"[^\w\s-]")
-SLUGIFY_HYPHENATE_RE = re.compile(r"[-\s]+")
-
-
-# NOTE(flaper87): The following globals are used by `mask_password`
-_SANITIZE_KEYS = ['adminPass', 'admin_pass', 'password', 'admin_password']
-
-# NOTE(ldbragst): Let's build a list of regex objects using the list of
-# _SANITIZE_KEYS we already have. This way, we only have to add the new key
-# to the list of _SANITIZE_KEYS and we can generate regular expressions
-# for XML and JSON automatically.
-_SANITIZE_PATTERNS_2 = []
-_SANITIZE_PATTERNS_1 = []
-
-# NOTE(amrith): Some regular expressions have only one parameter, some
-# have two parameters. Use different lists of patterns here.
-_FORMAT_PATTERNS_1 = [r'(%(key)s\s*[=]\s*)[^\s^\'^\"]+']
-_FORMAT_PATTERNS_2 = [r'(%(key)s\s*[=]\s*[\"\']).*?([\"\'])',
-                      r'(%(key)s\s+[\"\']).*?([\"\'])',
-                      r'([-]{2}%(key)s\s+)[^\'^\"^=^\s]+([\s]*)',
-                      r'(<%(key)s>).*?(</%(key)s>)',
-                      r'([\"\']%(key)s[\"\']\s*:\s*[\"\']).*?([\"\'])',
-                      r'([\'"].*?%(key)s[\'"]\s*:\s*u?[\'"]).*?([\'"])',
-                      r'([\'"].*?%(key)s[\'"]\s*,\s*\'--?[A-z]+\'\s*,\s*u?'
-                      '[\'"]).*?([\'"])',
-                      r'(%(key)s\s*--?[A-z]+\s*)\S+(\s*)']
-
-for key in _SANITIZE_KEYS:
-    for pattern in _FORMAT_PATTERNS_2:
-        reg_ex = re.compile(pattern % {'key': key}, re.DOTALL)
-        _SANITIZE_PATTERNS_2.append(reg_ex)
-
-    for pattern in _FORMAT_PATTERNS_1:
-        reg_ex = re.compile(pattern % {'key': key}, re.DOTALL)
-        _SANITIZE_PATTERNS_1.append(reg_ex)
-
-
-def int_from_bool_as_string(subject):
-    """Interpret a string as a boolean and return either 1 or 0.
-
-    Any string value in:
-
-        ('True', 'true', 'On', 'on', '1')
-
-    is interpreted as a boolean True.
-
-    Useful for JSON-decoded stuff and config file parsing
-    """
-    return bool_from_string(subject) and 1 or 0
-
-
-def bool_from_string(subject, strict=False, default=False):
-    """Interpret a string as a boolean.
-
-    A case-insensitive match is performed such that strings matching 't',
-    'true', 'on', 'y', 'yes', or '1' are considered True and, when
-    `strict=False`, anything else returns the value specified by 'default'.
-
-    Useful for JSON-decoded stuff and config file parsing.
-
-    If `strict=True`, unrecognized values, including None, will raise a
-    ValueError which is useful when parsing values passed in from an API call.
-    Strings yielding False are 'f', 'false', 'off', 'n', 'no', or '0'.
-    """
-    if not isinstance(subject, six.string_types):
-        subject = six.text_type(subject)
-
-    lowered = subject.strip().lower()
-
-    if lowered in TRUE_STRINGS:
-        return True
-    elif lowered in FALSE_STRINGS:
-        return False
-    elif strict:
-        acceptable = ', '.join(
-            "'%s'" % s for s in sorted(TRUE_STRINGS + FALSE_STRINGS))
-        msg = _("Unrecognized value '%(val)s', acceptable values are:"
-                " %(acceptable)s") % {'val': subject,
-                                      'acceptable': acceptable}
-        raise ValueError(msg)
-    else:
-        return default
-
-
-def safe_decode(text, incoming=None, errors='strict'):
-    """Decodes incoming text/bytes string using `incoming` if they're not
-       already unicode.
-
-    :param incoming: Text's current encoding
-    :param errors: Errors handling policy. See here for valid
-        values http://docs.python.org/2/library/codecs.html
-    :returns: text or a unicode `incoming` encoded
-                representation of it.
-    :raises TypeError: If text is not an instance of str
-    """
-    if not isinstance(text, (six.string_types, six.binary_type)):
-        raise TypeError("%s can't be decoded" % type(text))
-
-    if isinstance(text, six.text_type):
-        return text
-
-    if not incoming:
-        incoming = (sys.stdin.encoding or
-                    sys.getdefaultencoding())
-
-    try:
-        return text.decode(incoming, errors)
-    except UnicodeDecodeError:
-        # Note(flaper87) If we get here, it means that
-        # sys.stdin.encoding / sys.getdefaultencoding
-        # didn't return a suitable encoding to decode
-        # text. This happens mostly when global LANG
-        # var is not set correctly and there's no
-        # default encoding. In this case, most likely
-        # python will use ASCII or ANSI encoders as
-        # default encodings but they won't be capable
-        # of decoding non-ASCII characters.
-        #
-        # Also, UTF-8 is being used since it's an ASCII
-        # extension.
-        return text.decode('utf-8', errors)
-
-
-def safe_encode(text, incoming=None,
-                encoding='utf-8', errors='strict'):
-    """Encodes incoming text/bytes string using `encoding`.
-
-    If incoming is not specified, text is expected to be encoded with
-    current python's default encoding. (`sys.getdefaultencoding`)
-
-    :param incoming: Text's current encoding
-    :param encoding: Expected encoding for text (Default UTF-8)
-    :param errors: Errors handling policy. See here for valid
-        values http://docs.python.org/2/library/codecs.html
-    :returns: text or a bytestring `encoding` encoded
-                representation of it.
-    :raises TypeError: If text is not an instance of str
-    """
-    if not isinstance(text, (six.string_types, six.binary_type)):
-        raise TypeError("%s can't be encoded" % type(text))
-
-    if not incoming:
-        incoming = (sys.stdin.encoding or
-                    sys.getdefaultencoding())
-
-    if isinstance(text, six.text_type):
-        return text.encode(encoding, errors)
-    elif text and encoding != incoming:
-        # Decode text before encoding it with `encoding`
-        text = safe_decode(text, incoming, errors)
-        return text.encode(encoding, errors)
-    else:
-        return text
-
-
-def string_to_bytes(text, unit_system='IEC', return_int=False):
-    """Converts a string into an float representation of bytes.
-
-    The units supported for IEC ::
-
-        Kb(it), Kib(it), Mb(it), Mib(it), Gb(it), Gib(it), Tb(it), Tib(it)
-        KB, KiB, MB, MiB, GB, GiB, TB, TiB
-
-    The units supported for SI ::
-
-        kb(it), Mb(it), Gb(it), Tb(it)
-        kB, MB, GB, TB
-
-    Note that the SI unit system does not support capital letter 'K'
-
-    :param text: String input for bytes size conversion.
-    :param unit_system: Unit system for byte size conversion.
-    :param return_int: If True, returns integer representation of text
-                       in bytes. (default: decimal)
-    :returns: Numerical representation of text in bytes.
-    :raises ValueError: If text has an invalid value.
-
-    """
-    try:
-        base, reg_ex = UNIT_SYSTEM_INFO[unit_system]
-    except KeyError:
-        msg = _('Invalid unit system: "%s"') % unit_system
-        raise ValueError(msg)
-    match = reg_ex.match(text)
-    if match:
-        magnitude = float(match.group(1))
-        unit_prefix = match.group(2)
-        if match.group(3) in ['b', 'bit']:
-            magnitude /= 8
-    else:
-        msg = _('Invalid string format: %s') % text
-        raise ValueError(msg)
-    if not unit_prefix:
-        res = magnitude
-    else:
-        res = magnitude * pow(base, UNIT_PREFIX_EXPONENT[unit_prefix])
-    if return_int:
-        return int(math.ceil(res))
-    return res
-
-
-def to_slug(value, incoming=None, errors="strict"):
-    """Normalize string.
-
-    Convert to lowercase, remove non-word characters, and convert spaces
-    to hyphens.
-
-    Inspired by Django's `slugify` filter.
-
-    :param value: Text to slugify
-    :param incoming: Text's current encoding
-    :param errors: Errors handling policy. See here for valid
-        values http://docs.python.org/2/library/codecs.html
-    :returns: slugified unicode representation of `value`
-    :raises TypeError: If text is not an instance of str
-    """
-    value = safe_decode(value, incoming, errors)
-    # NOTE(aababilov): no need to use safe_(encode|decode) here:
-    # encodings are always "ascii", error handling is always "ignore"
-    # and types are always known (first: unicode; second: str)
-    value = unicodedata.normalize("NFKD", value).encode(
-        "ascii", "ignore").decode("ascii")
-    value = SLUGIFY_STRIP_RE.sub("", value).strip().lower()
-    return SLUGIFY_HYPHENATE_RE.sub("-", value)
-
-
-def mask_password(message, secret="***"):
-    """Replace password with 'secret' in message.
-
-    :param message: The string which includes security information.
-    :param secret: value with which to replace passwords.
-    :returns: The unicode value of message with the password fields masked.
-
-    For example:
-
-    >>> mask_password("'adminPass' : 'aaaaa'")
-    "'adminPass' : '***'"
-    >>> mask_password("'admin_pass' : 'aaaaa'")
-    "'admin_pass' : '***'"
-    >>> mask_password('"password" : "aaaaa"')
-    '"password" : "***"'
-    >>> mask_password("'original_password' : 'aaaaa'")
-    "'original_password' : '***'"
-    >>> mask_password("u'original_password' :   u'aaaaa'")
-    "u'original_password' :   u'***'"
-    """
-    try:
-        message = six.text_type(message)
-    except UnicodeDecodeError:
-        # NOTE(jecarey): Temporary fix to handle cases where message is a
-        # byte string.   A better solution will be provided in Kilo.
-        pass
-
-    # NOTE(ldbragst): Check to see if anything in message contains any key
-    # specified in _SANITIZE_KEYS, if not then just return the message since
-    # we don't have to mask any passwords.
-    if not any(key in message for key in _SANITIZE_KEYS):
-        return message
-
-    substitute = r'\g<1>' + secret + r'\g<2>'
-    for pattern in _SANITIZE_PATTERNS_2:
-        message = re.sub(pattern, substitute, message)
-
-    substitute = r'\g<1>' + secret
-    for pattern in _SANITIZE_PATTERNS_1:
-        message = re.sub(pattern, substitute, message)
-
-    return message
--- a/watcherclient/shell.py
+++ b/watcherclient/shell.py
@@ -26,20 +26,16 @@ import sys
 from keystoneclient.auth.identity import v2 as v2_auth
 from keystoneclient.auth.identity import v3 as v3_auth
 from keystoneclient import discover
-from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
+from keystoneclient import exceptions as ks_exc
 from keystoneclient import session as kssession
 import six.moves.urllib.parse as urlparse

-
 import watcherclient
+from watcherclient._i18n import _
 from watcherclient import client as watcher_client
+from watcherclient.common import cliutils
 from watcherclient.common import utils
 from watcherclient import exceptions as exc
-from watcherclient.openstack.common._i18n import _
-from watcherclient.openstack.common import cliutils
-from watcherclient.openstack.common import gettextutils
-
-gettextutils.install('watcherclient')


 class WatcherShell(object):
@@ -344,9 +340,10 @@ class WatcherShell(object):
            # support only v2
            auth = self._get_keystone_v2_auth(v2_auth_url, **kwargs)
        else:
-            raise exc.CommandError('Unable to determine the Keystone version '
-                                   'to authenticate with using the given '
-                                   'auth_url.')
+            raise exc.CommandError(
+                _('Unable to determine the Keystone version '
+                  'to authenticate with using the given '
+                  'auth_url.'))

        return auth

--- a/watcherclient/tests/test_shell.py
+++ b/watcherclient/tests/test_shell.py
@@ -12,24 +12,17 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.

-import json
-import os
 import re
 import sys

 import fixtures
-import httpretty
 from keystoneclient import exceptions as keystone_exc
-from keystoneclient.fixture import v2 as ks_v2_fixture
-from keystoneclient.fixture import v3 as ks_v3_fixture
 import mock
 import six
-import testtools
 from testtools import matchers

 from watcherclient import exceptions as exc
 from watcherclient import shell as watcher_shell
-from watcherclient.tests import keystone_client_fixtures
 from watcherclient.tests import utils

 FAKE_ENV = {'OS_USERNAME': 'username',
@@ -37,22 +30,6 @@ FAKE_ENV = {'OS_USERNAME': 'username',
            'OS_TENANT_NAME': 'tenant_name',
            'OS_AUTH_URL': 'http://no.where/v2.0/'}

-FAKE_ENV_KEYSTONE_V2 = {
-    'OS_USERNAME': 'username',
-    'OS_PASSWORD': 'password',
-    'OS_TENANT_NAME': 'tenant_name',
-    'OS_AUTH_URL': keystone_client_fixtures.BASE_URL,
-}
-
-FAKE_ENV_KEYSTONE_V3 = {
-    'OS_USERNAME': 'username',
-    'OS_PASSWORD': 'password',
-    'OS_TENANT_NAME': 'tenant_name',
-    'OS_AUTH_URL': keystone_client_fixtures.BASE_URL,
-    'OS_USER_DOMAIN_ID': 'default',
-    'OS_PROJECT_DOMAIN_ID': 'default',
-}
-

 class ShellTest(utils.BaseTestCase):
    re_options = re.DOTALL | re.MULTILINE
@@ -175,132 +152,3 @@ class ShellTest(utils.BaseTestCase):
        for r in required:
            self.assertThat(stdout,
                            matchers.MatchesRegex(r, self.re_options))
-
-
-class TestCase(testtools.TestCase):
-
-    tokenid = keystone_client_fixtures.TOKENID
-
-    def set_fake_env(self, fake_env):
-        client_env = ('OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_ID',
-                      'OS_TENANT_NAME', 'OS_AUTH_URL', 'OS_REGION_NAME',
-                      'OS_AUTH_TOKEN', 'OS_NO_CLIENT_AUTH', 'OS_SERVICE_TYPE',
-                      'OS_ENDPOINT_TYPE')
-
-        for key in client_env:
-            self.useFixture(
-                fixtures.EnvironmentVariable(key, fake_env.get(key)))
-
-    # required for testing with Python 2.6
-    def assertRegexpMatches(self, text, expected_regexp, msg=None):
-        """Fail the test unless the text matches the regular expression."""
-        if isinstance(expected_regexp, six.string_types):
-            expected_regexp = re.compile(expected_regexp)
-        if not expected_regexp.search(text):
-            msg = msg or "Regexp didn't match"
-            msg = '%s: %r not found in %r' % (
-                msg, expected_regexp.pattern, text)
-            raise self.failureException(msg)
-
-    def register_keystone_v2_token_fixture(self):
-        v2_token = ks_v2_fixture.Token(token_id=self.tokenid)
-        service = v2_token.add_service('baremetal')
-        service.add_endpoint('http://watcher.example.com', region='RegionOne')
-        httpretty.register_uri(
-            httpretty.POST,
-            '%s/tokens' % (keystone_client_fixtures.V2_URL),
-            body=json.dumps(v2_token))
-
-    def register_keystone_v3_token_fixture(self):
-        v3_token = ks_v3_fixture.Token()
-        service = v3_token.add_service('baremetal')
-        service.add_standard_endpoints(public='http://watcher.example.com')
-        httpretty.register_uri(
-            httpretty.POST,
-            '%s/auth/tokens' % (keystone_client_fixtures.V3_URL),
-            body=json.dumps(v3_token),
-            adding_headers={'X-Subject-Token': self.tokenid})
-
-    def register_keystone_auth_fixture(self):
-        self.register_keystone_v2_token_fixture()
-        self.register_keystone_v3_token_fixture()
-        httpretty.register_uri(
-            httpretty.GET,
-            keystone_client_fixtures.BASE_URL,
-            body=keystone_client_fixtures.keystone_request_callback)
-
-
-class ShellTestNoMox(TestCase):
-    def setUp(self):
-        super(ShellTestNoMox, self).setUp()
-        # httpretty doesn't work as expected if http proxy environment
-        # variable is set.
-        os.environ = dict((k, v) for (k, v) in os.environ.items()
-                          if k.lower() not in ('http_proxy', 'https_proxy'))
-        self.set_fake_env(FAKE_ENV_KEYSTONE_V2)
-
-    def shell(self, argstr):
-        orig = sys.stdout
-        try:
-            sys.stdout = six.StringIO()
-            _shell = watcher_shell.WatcherShell()
-            _shell.main(argstr.split())
-            self.subcommands = _shell.subcommands.keys()
-        except SystemExit:
-            exc_type, exc_value, exc_traceback = sys.exc_info()
-            self.assertEqual(0, exc_value.code)
-        finally:
-            out = sys.stdout.getvalue()
-            sys.stdout.close()
-            sys.stdout = orig
-
-        return out
-
-    # @httpretty.activate
-    # def test_action_list(self):
-    #     self.register_keystone_auth_fixture()
-    #     resp_dict = {"dummies": [
-    #                  {"instance_uuid": "null",
-    #                   "uuid": "351a82d6-9f04-4c36-b79a-a38b9e98ff71",
-    #                   "links": [{"href": "http://watcher.example.com:6385/"
-    #                              "v1/dummies/foo",
-    #                              "rel": "self"},
-    #                             {"href": "http://watcher.example.com:6385/"
-    #                              "dummies/foo",
-    #                              "rel": "bookmark"}],
-    #                   "maintenance": "false",
-    #                   "provision_state": "null",
-    #                   "power_state": "power off"},
-    #                  {"instance_uuid": "null",
-    #                   "uuid": "66fbba13-29e8-4b8a-9e80-c655096a40d3",
-    #                   "links": [{"href": "http://watcher.example.com:6385/"
-    #                              "v1/dummies/foo2",
-    #                              "rel": "self"},
-    #                             {"href": "http://watcher.example.com:6385/"
-    #                              "dummies/foo2",
-    #                              "rel": "bookmark"}],
-    #                   "maintenance": "false",
-    #                   "provision_state": "null",
-    #                   "power_state": "power off"}]}
-    #     httpretty.register_uri(
-    #         httpretty.GET,
-    #         'http://watcher.example.com/v1/dummies',
-    #         status=200,
-    #         content_type='application/json; charset=UTF-8',
-    #         body=json.dumps(resp_dict))
-
-    #     event_list_text = self.shell('action-list')
-
-    #     required = [
-    #         '351a82d6-9f04-4c36-b79a-a38b9e98ff71',
-    #         '66fbba13-29e8-4b8a-9e80-c655096a40d3',
-    #     ]
-
-    #     for r in required:
-    #         self.assertRegexpMatches(event_list_text, r)
-
-
-class ShellTestNoMoxV3(ShellTestNoMox):
-
-    def _set_fake_env(self):
-        self.set_fake_env(FAKE_ENV_KEYSTONE_V3)
--- a/watcherclient/tests/test_utils.py
+++ b/watcherclient/tests/test_utils.py
@@ -17,8 +17,8 @@

 import mock

+from watcherclient.common.apiclient import exceptions as exc
 from watcherclient.common import utils
-from watcherclient import exceptions as exc
 from watcherclient.tests import utils as test_utils


--- a/watcherclient/tests/v1/test_action_plan.py
+++ b/watcherclient/tests/v1/test_action_plan.py
@@ -38,7 +38,7 @@ ACTION_PLAN2 = {
 }

 UPDATED_ACTION_PLAN = copy.deepcopy(ACTION_PLAN1)
-NEW_STATE = 'STARTING'
+NEW_STATE = 'PENDING'
 UPDATED_ACTION_PLAN['state'] = NEW_STATE

 fake_responses = {
--- a/watcherclient/tests/v1/test_action_plan_shell.py
+++ b/watcherclient/tests/v1/test_action_plan_shell.py
@@ -16,9 +16,9 @@

 import mock

+from watcherclient.common import cliutils
 from watcherclient.common import utils as commonutils
-from watcherclient.openstack.common.apiclient.exceptions import ValidationError
-from watcherclient.openstack.common import cliutils
+from watcherclient import exceptions
 from watcherclient.tests import utils
 import watcherclient.v1.action_plan_shell as ap_shell

@@ -52,8 +52,9 @@ class ActionPlanShellTest(utils.BaseTestCase):
        args = mock.MagicMock()
        setattr(args, 'action-plan', 'not_uuid')

-        self.assertRaises(ValidationError, ap_shell.do_action_plan_show,
-                          client_mock, args)
+        self.assertRaises(
+            exceptions.ValidationError,
+            ap_shell.do_action_plan_show, client_mock, args)

    def test_do_action_plan_delete(self):
        client_mock = mock.MagicMock()
@@ -70,8 +71,9 @@ class ActionPlanShellTest(utils.BaseTestCase):
        args = mock.MagicMock()
        setattr(args, 'action-plan', ['not_uuid'])

-        self.assertRaises(ValidationError, ap_shell.do_action_plan_delete,
-                          client_mock, args)
+        self.assertRaises(
+            exceptions.ValidationError,
+            ap_shell.do_action_plan_delete, client_mock, args)

    def test_do_action_plan_delete_multiple(self):
        client_mock = mock.MagicMock()
@@ -93,8 +95,9 @@ class ActionPlanShellTest(utils.BaseTestCase):
                 "not_uuid",
                 "a5199d0e-0702-4613-9234-5ae2af8dafeb"])

-        self.assertRaises(ValidationError, ap_shell.do_action_plan_delete,
-                          client_mock, args)
+        self.assertRaises(
+            exceptions.ValidationError,
+            ap_shell.do_action_plan_delete, client_mock, args)
        client_mock.action_plan.delete.assert_has_calls(
            [mock.call('a5199d0e-0702-4613-9234-5ae2af8dafea')])

@@ -121,8 +124,9 @@ class ActionPlanShellTest(utils.BaseTestCase):
        args.op = 'add'
        args.attributes = [['arg1=val1', 'arg2=val2']]

-        self.assertRaises(ValidationError, ap_shell.do_action_plan_update,
-                          client_mock, args)
+        self.assertRaises(
+            exceptions.ValidationError,
+            ap_shell.do_action_plan_update, client_mock, args)

    def test_do_action_plan_start(self):
        client_mock = mock.MagicMock()
@@ -133,7 +137,7 @@ class ActionPlanShellTest(utils.BaseTestCase):

        ap_shell.do_action_plan_start(client_mock, args)
        patch = commonutils.args_array_to_patch(
-            'replace', ['state=STARTING'])
+            'replace', ['state=PENDING'])
        client_mock.action_plan.update.assert_called_once_with(
            'a5199d0e-0702-4613-9234-5ae2af8dafea', patch)

@@ -144,5 +148,6 @@ class ActionPlanShellTest(utils.BaseTestCase):
        action_plan = 'not_uuid'
        setattr(args, 'action-plan', action_plan)

-        self.assertRaises(ValidationError, ap_shell.do_action_plan_start,
-                          client_mock, args)
+        self.assertRaises(
+            exceptions.ValidationError,
+            ap_shell.do_action_plan_start, client_mock, args)
--- a/watcherclient/tests/v1/test_action_shell.py
+++ b/watcherclient/tests/v1/test_action_shell.py
@@ -16,9 +16,9 @@

 import mock

+from watcherclient.common import cliutils
 from watcherclient.common import utils as commonutils
-from watcherclient.openstack.common.apiclient.exceptions import ValidationError
-from watcherclient.openstack.common import cliutils
+from watcherclient import exceptions
 from watcherclient.tests import utils
 import watcherclient.v1.action_shell as a_shell

@@ -36,10 +36,8 @@ class ActionShellTest(utils.BaseTestCase):
               'created_at',
               'deleted_at',
               'description',
-               'dst',
               'next_uuid',
-               'parameter',
-               'src',
+               'input_parameters',
               'state',
               'action_plan_uuid',
               'updated_at',
@@ -64,7 +62,7 @@ class ActionShellTest(utils.BaseTestCase):
        args = mock.MagicMock()
        args.action = 'not_uuid'

-        self.assertRaises(ValidationError, a_shell.do_action_show,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_action_show,
                          client_mock, args)

    def test_do_action_delete(self):
@@ -81,7 +79,7 @@ class ActionShellTest(utils.BaseTestCase):
        args = mock.MagicMock()
        args.action = ['not_uuid']

-        self.assertRaises(ValidationError, a_shell.do_action_delete,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_action_delete,
                          client_mock, args)

    def test_do_action_delete_multiple(self):
@@ -102,7 +100,7 @@ class ActionShellTest(utils.BaseTestCase):
                       'not_uuid'
                       'a5199d0e-0702-4613-9234-5ae2af8dafeb']

-        self.assertRaises(ValidationError, a_shell.do_action_delete,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_action_delete,
                          client_mock, args)
        client_mock.action.delete.assert_has_calls(
            [mock.call('a5199d0e-0702-4613-9234-5ae2af8dafea')])
@@ -128,5 +126,5 @@ class ActionShellTest(utils.BaseTestCase):
        args.op = 'add'
        args.attributes = [['arg1=val1', 'arg2=val2']]

-        self.assertRaises(ValidationError, a_shell.do_action_update,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_action_update,
                          client_mock, args)
--- a/watcherclient/tests/v1/test_audit_shell.py
+++ b/watcherclient/tests/v1/test_audit_shell.py
@@ -16,9 +16,9 @@

 import mock

+from watcherclient.common import cliutils
 from watcherclient.common import utils as commonutils
-from watcherclient.openstack.common.apiclient.exceptions import ValidationError
-from watcherclient.openstack.common import cliutils
+from watcherclient import exceptions
 from watcherclient.tests import utils
 import watcherclient.v1.audit_shell as a_shell

@@ -53,7 +53,7 @@ class AuditShellTest(utils.BaseTestCase):
        args = mock.MagicMock()
        args.audit = 'not_uuid'

-        self.assertRaises(ValidationError, a_shell.do_audit_show,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_audit_show,
                          client_mock, args)

    def test_do_audit_delete(self):
@@ -70,7 +70,7 @@ class AuditShellTest(utils.BaseTestCase):
        args = mock.MagicMock()
        args.audit = ['not_uuid']

-        self.assertRaises(ValidationError, a_shell.do_audit_delete,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_audit_delete,
                          client_mock, args)

    def test_do_audit_delete_multiple(self):
@@ -91,7 +91,7 @@ class AuditShellTest(utils.BaseTestCase):
                      'not_uuid',
                      'a5199d0e-0702-4613-9234-5ae2af8dafeb']

-        self.assertRaises(ValidationError, a_shell.do_audit_delete,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_audit_delete,
                          client_mock, args)
        client_mock.audit.delete.assert_has_calls(
            [mock.call('a5199d0e-0702-4613-9234-5ae2af8dafea')])
@@ -117,7 +117,7 @@ class AuditShellTest(utils.BaseTestCase):
        args.op = 'add'
        args.attributes = [['arg1=val1', 'arg2=val2']]

-        self.assertRaises(ValidationError, a_shell.do_audit_update,
+        self.assertRaises(exceptions.ValidationError, a_shell.do_audit_update,
                          client_mock, args)

    def test_do_audit_create(self):
--- a/watcherclient/tests/v1/test_audit_template.py
+++ b/watcherclient/tests/v1/test_audit_template.py
@@ -19,7 +19,7 @@ import copy

 from six.moves.urllib import parse as urlparse
 import testtools
-from testtools.matchers import HasLength
+from testtools import matchers

 from watcherclient.tests import utils
 import watcherclient.v1.audit_template
@@ -41,7 +41,7 @@ AUDIT_TMPL2 = {
    'description': 'Audit Template 2 description',
    'host_aggregate': 8,
    'extra': {'automatic': True},
-    'goal': 'SERVERS_CONSOLIDATION'
+    'goal': 'BASIC_CONSOLIDATION'
 }

 AUDIT_TMPL3 = {
@@ -176,6 +176,16 @@ fake_responses_sorting = {
    },
 }

+fake_responses_filter_by_goal = {
+    '/v1/audit_templates/?goal=BASIC_CONSOLIDATION':
+    {
+        'GET': (
+            {},
+            {"audit_templates": [AUDIT_TMPL2]}
+        ),
+    },
+}
+

 class AuditTemplateManagerTest(testtools.TestCase):

@@ -202,6 +212,18 @@ class AuditTemplateManagerTest(testtools.TestCase):
        self.assertEqual(expect, self.api.calls)
        self.assertEqual(1, len(audit_templates))

+    def test_audit_templates_list_by_goal(self):
+        self.api = utils.FakeAPI(fake_responses_filter_by_goal)
+        self.mgr = watcherclient.v1.audit_template.AuditTemplateManager(
+            self.api)
+        audit_templates = self.mgr.list(goal="BASIC_CONSOLIDATION")
+        expect = [
+            ('GET', '/v1/audit_templates/?goal=%s' % AUDIT_TMPL2['goal'],
+             {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(audit_templates))
+
    def test_audit_templates_list_detail(self):
        audit_templates = self.mgr.list(detail=True)
        expect = [
@@ -230,7 +252,7 @@ class AuditTemplateManagerTest(testtools.TestCase):
            ('GET', '/v1/audit_templates/?limit=1', {}, None),
        ]
        self.assertEqual(expect, self.api.calls)
-        self.assertThat(audit_templates, HasLength(1))
+        self.assertThat(audit_templates, matchers.HasLength(1))

    def test_audit_templates_list_pagination_no_limit(self):
        self.api = utils.FakeAPI(fake_responses_pagination)
@@ -242,7 +264,7 @@ class AuditTemplateManagerTest(testtools.TestCase):
            ('GET', '/v1/audit_templates/?limit=1', {}, None)
        ]
        self.assertEqual(expect, self.api.calls)
-        self.assertThat(audit_templates, HasLength(2))
+        self.assertThat(audit_templates, matchers.HasLength(2))

    def test_audit_templates_list_sort_key(self):
        self.api = utils.FakeAPI(fake_responses_sorting)
--- a/watcherclient/tests/v1/test_audit_template_shell.py
+++ b/watcherclient/tests/v1/test_audit_template_shell.py
@@ -16,8 +16,8 @@

 import mock

+from watcherclient.common import cliutils
 from watcherclient.common import utils as commonutils
-from watcherclient.openstack.common import cliutils
 from watcherclient.tests import utils
 import watcherclient.v1.audit_template_shell as at_shell

--- a/watcherclient/tests/v1/test_goal_shell.py
+++ b/watcherclient/tests/v1/test_goal_shell.py
@@ -15,7 +15,8 @@
 #   under the License.

 import mock
-from watcherclient.openstack.common import cliutils
+
+from watcherclient.common import cliutils
 from watcherclient.tests import utils
 import watcherclient.v1.goal_shell as a_shell

--- a/watcherclient/tests/v1/test_metric_collector_shell.py
+++ b/watcherclient/tests/v1/test_metric_collector_shell.py
@@ -16,8 +16,8 @@

 import mock

+from watcherclient.common import cliutils
 from watcherclient.common import utils as commonutils
-from watcherclient.openstack.common import cliutils
 from watcherclient.tests import utils
 import watcherclient.v1.metric_collector_shell as mc_shell

--- a/watcherclient/v1/action_plan_shell.py
+++ b/watcherclient/v1/action_plan_shell.py
@@ -18,9 +18,10 @@
 # import argparse

 from oslo_utils import uuidutils
+
+from watcherclient.common import cliutils
 from watcherclient.common import utils
-from watcherclient.openstack.common.apiclient.exceptions import ValidationError
-from watcherclient.openstack.common import cliutils
+from watcherclient import exceptions
 from watcherclient.v1 import resource_fields as res_fields


@@ -41,7 +42,7 @@ def do_action_plan_show(cc, args):
        action_plan = cc.action_plan.get(action_plan_uuid)
        _print_action_plan_show(action_plan)
    else:
-        raise ValidationError()
+        raise exceptions.ValidationError()


@cliutils.arg(
@@ -105,7 +106,7 @@ def do_action_plan_delete(cc, args):
            cc.action_plan.delete(p)
            print ('Deleted action plan %s' % p)
        else:
-            raise ValidationError()
+            raise exceptions.ValidationError()


@cliutils.arg(
@@ -133,7 +134,7 @@ def do_action_plan_update(cc, args):
        action_plan = cc.action_plan.update(action_plan_uuid, patch)
        _print_action_plan_show(action_plan)
    else:
-        raise ValidationError()
+        raise exceptions.ValidationError()


@cliutils.arg('action-plan',
@@ -144,7 +145,7 @@ def do_action_plan_start(cc, args):
    action_plan_uuid = getattr(args, 'action-plan')
    if uuidutils.is_uuid_like(action_plan_uuid):
        args.op = 'replace'
-        args.attributes = [['state=STARTING']]
+        args.attributes = [['state=PENDING']]

        patch = utils.args_array_to_patch(
            args.op,
@@ -153,4 +154,4 @@ def do_action_plan_start(cc, args):
        action_plan = cc.action_plan.update(action_plan_uuid, patch)
        _print_action_plan_show(action_plan)
    else:
-        raise ValidationError()
+        raise exceptions.ValidationError()
--- a/watcherclient/v1/action_shell.py
+++ b/watcherclient/v1/action_shell.py
@@ -18,9 +18,10 @@
 # import argparse

 from oslo_utils import uuidutils
+
+from watcherclient.common import cliutils
 from watcherclient.common import utils
-from watcherclient.openstack.common.apiclient.exceptions import ValidationError
-from watcherclient.openstack.common import cliutils
+from watcherclient import exceptions
 from watcherclient.v1 import resource_fields as res_fields


@@ -40,7 +41,7 @@ def do_action_show(cc, args):
        action = cc.action.get(args.action)
        _print_action_show(action)
    else:
-        raise ValidationError()
+        raise exceptions.ValidationError()


@cliutils.arg(
@@ -110,7 +111,7 @@ def do_action_delete(cc, args):
            cc.action.delete(p)
            print ('Deleted action %s' % p)
        else:
-            raise ValidationError()
+            raise exceptions.ValidationError()


@cliutils.arg('action', metavar='<action>', help="UUID of the action.")
@@ -134,4 +135,4 @@ def do_action_update(cc, args):
        action = cc.action.update(args.action, patch)
        _print_action_show(action)
    else:
-        raise ValidationError()
+        raise exceptions.ValidationError()
--- a/watcherclient/v1/audit_shell.py
+++ b/watcherclient/v1/audit_shell.py
@@ -18,9 +18,10 @@
 # import argparse

 from oslo_utils import uuidutils
+
+from watcherclient.common import cliutils
 from watcherclient.common import utils
-from watcherclient.openstack.common.apiclient.exceptions import ValidationError
-from watcherclient.openstack.common import cliutils
+from watcherclient import exceptions
 from watcherclient.v1 import resource_fields as res_fields


@@ -41,7 +42,7 @@ def do_audit_show(cc, args):
        audit = cc.audit.get(args.audit)
        _print_audit_show(audit)
    else:
-        raise ValidationError()
+        raise exceptions.ValidationError()


@cliutils.arg(
@@ -132,7 +133,7 @@ def do_audit_delete(cc, args):
            cc.audit.delete(p)
            print ('Deleted audit %s' % p)
        else:
-            raise ValidationError()
+            raise exceptions.ValidationError()


@cliutils.arg(
@@ -159,4 +160,4 @@ def do_audit_update(cc, args):
        audit = cc.audit.update(args.audit, patch)
        _print_audit_show(audit)
    else:
-        raise ValidationError()
+        raise exceptions.ValidationError()
--- a/watcherclient/v1/audit_template.py
+++ b/watcherclient/v1/audit_template.py
@@ -34,7 +34,7 @@ class AuditTemplateManager(base.Manager):
    def _path(id=None):
        return '/v1/audit_templates/%s' % id if id else '/v1/audit_templates'

-    def list(self, name=None, limit=None, sort_key=None,
+    def list(self, name=None, goal=None, limit=None, sort_key=None,
             sort_dir=None, detail=False):
        """Retrieve a list of audit template.

@@ -65,6 +65,8 @@ class AuditTemplateManager(base.Manager):
        filters = utils.common_filters(limit, sort_key, sort_dir)
        if name is not None:
            filters.append('name=%s' % name)
+        if goal is not None:
+            filters.append("goal=%s" % goal)

        path = ''
        if detail:
--- a/watcherclient/v1/audit_template_shell.py
+++ b/watcherclient/v1/audit_template_shell.py
@@ -17,8 +17,8 @@

 # import argparse

+from watcherclient.common import cliutils
 from watcherclient.common import utils
-from watcherclient.openstack.common import cliutils
 from watcherclient.v1 import resource_fields as res_fields


@@ -45,10 +45,6 @@ def do_audit_template_show(cc, args):
    action='store_true',
    default=False,
    help="Show detailed information about audit templates.")
-@cliutils.arg(
-    '--name',
-    metavar='<name>',
-    help='Only show information for the audit template with this name.')
@cliutils.arg(
    '--goal',
    metavar='<goal>',
@@ -73,8 +69,6 @@ def do_audit_template_list(cc, args):
    """List the audit templates."""
    params = {}

-    if args.name is not None:
-        params['name'] = args.name
    if args.goal is not None:
        params['goal'] = args.goal
    if args.detail:
--- a/watcherclient/v1/goal_shell.py
+++ b/watcherclient/v1/goal_shell.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

+from watcherclient.common import cliutils
 from watcherclient.common import utils
-from watcherclient.openstack.common import cliutils
 from watcherclient.v1 import resource_fields as res_fields


--- a/watcherclient/v1/metric_collector_shell.py
+++ b/watcherclient/v1/metric_collector_shell.py
@@ -17,8 +17,8 @@

 # import argparse

+from watcherclient.common import cliutils
 from watcherclient.common import utils
-from watcherclient.openstack.common import cliutils
 from watcherclient.v1 import resource_fields as res_fields


--- a/watcherclient/v1/resource_fields.py
+++ b/watcherclient/v1/resource_fields.py
@@ -59,13 +59,11 @@ ACTION_PLAN_SHORT_LIST_FIELD_LABELS = ['UUID', 'Audit', 'State', 'Updated At']
 # Action
 ACTION_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at', 'next_uuid',
                 'description', 'alarm', 'state', 'action_plan_uuid',
-                 'action_type', 'applies_to', 'src', 'dst', 'parameter']
+                 'action_type', 'applies_to', 'input_parameters']

 ACTION_FIELD_LABELS = ['UUID', 'Created At', 'Updated At', 'Deleted At',
                       'Next Action', 'Description', 'Alarm', 'State',
-                       'Action Plan', 'Action',
-                       'Applies to', 'Hypervisor Source',
-                       'Hypervisor Destination', 'Parameter']
+                       'Action Plan', 'Action', 'Applies to', 'Parameters']

 ACTION_SHORT_LIST_FIELDS = ['uuid', 'next_uuid',
                            'state', 'action_plan_uuid', 'action_type']
Author	SHA1	Message	Date
Alexander Chadin	3640fc4a0b	Rename TRIGGERED state as PENDING Following the change in Watcher, this patchset updates the Watcher CLI to support this change. Also it updates README.rst to pass python 3.4 ascii-tests. Change-Id: Idfcf99ee3d6b5b7342f1bbc4f726e6edd82fc77c Closes-Bug: #1548377 Related-Bug: #1554347	2016-03-21 12:17:18 +00:00
OpenStack Proposal Bot	15511203d8	Updated from global requirements Change-Id: Ife3d32cf3d7054ce9e6e5f7c8f849652a6ba2267	2016-02-20 22:00:57 +00:00
OpenStack Proposal Bot	f390f3526f	Updated from global requirements Change-Id: Ia6f12d87f376841faebcab42ac70a72f6f222985	2016-02-19 02:37:27 +00:00
Jenkins	0ce454f3b3	Merge "Replace deprecated LOG.warn with LOG.warning"	2016-02-18 08:21:48 +00:00
Jenkins	5b4729dcbe	Merge "Removed host_aggregate filter for Audit Template"	2016-02-15 09:29:58 +00:00
Tin Lam	a36b42afef	Replace deprecated LOG.warn with LOG.warning LOG.warn is deprecated. It is still used in a few places. This replaces it with the non-deprecated LOG.warning. Change-Id: I7ed615a24dcb4eff919d747d8f30625d6d4db0ee Partial-Bug:#1508442	2016-02-14 17:45:11 -06:00
Vincent Francoise	9699fc5f70	Removed host_aggregate filter for Audit Template Although it was proposed via python-watcherclient, the feature was not implemented on the Watcher API. As the notion of host aggregate is currently unused in Watcher, decision was made to only implement the filtering of goal within the Watcher API whilst removing the host_aggregate filter from the Watcher client. Thus, this patchset removes the 'host_aggregate' parameter from the client. Change-Id: I014e4b0d5e734ea9ef869c3ad33908a2c0d2aa40 Related-Bug: #1510189	2016-02-12 15:49:26 +00:00
Vincent Francoise	51a3b3fe3f	Removed useless '--name' in audit-template-list This bug outlined that a --name option of the audit-template-list subcommand was not working properly. But the goal of this command would have been equivalent to using 'audit-template-show'. That's why I simply removed it from our client. Change-Id: I57bb0c88bcf373304e59109cd7557052ef7a980b Closes-Bug: #1510190	2016-02-11 15:21:42 +01:00
Taylor Peoples	b30fad9965	Sync with openstack/requirements master branch In order to accept the requirements contract defined in openstack/requirements, we need to sync with the master branch of that project's global-requirements.txt and test-requirements.txt files. Most of the changes are just version changes and nothing major. The only major changes are: 1) Removing httpretty and therefore needing to update the test_shell.py file which uses httpretty. It seems like the code that was dependent on httpretty is not even being ran as part of the UTs, so this code was removed. 2) The twine dependency is removed, and therefore the pypi tox environment was also removed. Change-Id: I939856e9b0a32792bea45b42c489dc9bbbe62782 Closes-Bug: #1533283	2016-01-26 07:39:44 +01:00
Vincent Francoise	59c0dc667e	Updated STARTING to TRIGGERED Following https://review.openstack.org/269700, we now have to make the same changes to the python-watcherclient project. Change-Id: I894508dc3b04dd0f24101c5dfb396116f41dc23f Related-Bug: #1533245	2016-01-25 15:56:18 +01:00
Jenkins	dee7be63d9	Merge "Sync Action resource fields"	2016-01-21 17:04:22 +00:00
Andreas Jaeger	3ef4a0cae0	Remove argparse from requirements argparse was external in python 2.6 but not anymore, remove it from requirements. This should help with pip 8.0 that gets confused in this situation. Installation of the external argparse is not needed. Change-Id: Ib7e74912b36c1b5ccb514e31fac35efeff57378d	2016-01-20 19:23:35 +01:00
Jenkins	670a70ff5a	Merge "Fix extraction of _LI _LW _LE _LC for translation"	2016-01-14 16:39:16 +00:00
Jean-Emile DARTOIS	926af3273a	Fix extraction of _LI _LW _LE _LC for translation In order to start translating we should gradually update the messages. To fix this issue, we need to add _LI _LW _LE _LC in setup.cfg Change-Id: I21bc850453b7b0f046c38ad724a17d0b8bb2e851 Related-Bug: #1534164	2016-01-14 14:58:23 +01:00
Antoine Cabot	a0f97ee02b	Update Watcher documentation in README Update the header of the README to align description with launchpad and pypi. Change-Id: Id724c5b314d8ac9e72ebe7e661e8ab74d6483047 Related-Bug: #1527654	2016-01-14 13:07:06 +00:00
David.T	740dcf7bc2	i18n - Make string translatable Since internationalization should be enabled in Watcher CLI/SDK, this patchset refactors the watcherclient codebase to wrap previously untranslatable strings with i18n translation functions so we can import them for translation into the .pot template file. Change-Id: Ibb987e66b95e009e33b596add8c96ecb193a3773 Implements: blueprint support-translation	2016-01-13 11:01:26 +00:00
David.T	4b2f948e7a	Respect the import order template Package import order shall respect hacking rules defined by OpenStack, excepting i18n package import. Change-Id: I5d609d0414a5eb270fd27ed16dc0a4630ea35086 Closes-Bug: #1533115	2016-01-13 10:59:38 +00:00
David.T	eb0c70d332	Sync Action resource fields In watcher blueprint watcher-add-actions-via-conf introduce updates of Action object. We have to synchronize watcherclient to be able to display correctly action resource fields on console. Change-Id: I1ace65ab85ed4422d9c8cd2846cc73d0a0b51e4d Implements: blueprint watcher-add-actions-via-conf	2016-01-13 10:49:28 +00:00
David.T	03d12fd030	Sync with oslo-incubator Most of librairies available under openstack/common folder are now deployed by using oslo dedicated package. So we can remove them and point to new python package. Moreover, According to the November agreement in Oslo team, apiclient and clituils will be removed from Oslo incubator. We should keep the local copy by ourselfs Change-Id: I3abc09d1c512df1f5cb868ed462a7900260705ce Implements: blueprint make-watcherclient-use-graduated-oslo-lib	2016-01-12 15:52:32 +00:00
Steve Martinelli	1852227505	use keystoneclient exceptions instead of oslo-incubator code depending on any oslo-incubator code from another project is dangerous. keystoneclient makes its exceptions public and it's not recommended to use any code from keystoneclient.openstack.common.apiclient since it's maintained by oslo-incubator. Change-Id: I22b7977f943abac9418342d4fd3d2b996d717e91	2015-12-27 01:46:07 -05:00
shu-mutou	dbcc77bc6c	Drop py33 support "Python 3.3 support is being dropped since OpenStack Liberty." written in following URL. https://wiki.openstack.org/wiki/Python3 And already the infra team and the oslo team are dropping py33 support from their projects. Since we rely on oslo for a lot of our work, and depend on infra for our CI, we should drop py33 support too. Change-Id: Ie9ab166c21bf8765b62f9f033d42571538e5f29c Closes-Bug: #1526170	2015-12-15 19:19:47 +09:00