python-openstackclient ClientManager interface changed

I update the watcher client plugin to correctly used ClientManager auth parameters Change-Id: Ie2e4db3b63ea1671147a407480ce0d2569d5b057 Closes-bug: #1625643 (cherry picked from commit a48a9213f0)
Merge "Add constraint target to tox.ini and remove 1 dep" into stable/newton
2016-09-29 07:15:28 +00:00 · 2016-09-26 09:40:00 +00:00 · 2016-09-21 10:17:54 +00:00 · 2016-09-21 08:40:31 +00:00 · 2016-09-02 09:45:20 -04:00
4 changed files with 17 additions and 8 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/python-watcherclient.git
+defaultbranch=stable/newton
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ description-file =
    README.rst
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = http://www.openstack.org/
+home-page =  http://docs.openstack.org/developer/python-watcherclient
 classifier =
    Environment :: OpenStack
    Intended Audience :: Information Technology
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,16 @@
 [tox]
-minversion = 1.6
+minversion = 1.8
 envlist = py34,py27,pep8
 skipsdist = True

 [testenv]
 usedevelop = True
-install_command = pip install -U {opts} {packages}
+install_command =
+                  constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/newton} {opts} {packages}
+                  pip install -U {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'

 [testenv:pep8]
--- a/watcherclient/plugin.py
+++ b/watcherclient/plugin.py
@@ -39,12 +39,19 @@ def make_client(instance):
        interface=instance._interface,
    )

+    auth_url = instance._auth_url \
+        if hasattr(instance, '_auth_url') else instance.auth.auth_url
+    username = instance._username \
+        if hasattr(instance, '_username') else instance.auth._username
+    password = instance._password \
+        if hasattr(instance, '_password') else instance.auth._password
+
    client = watcher_client(
        endpoint=endpoint,
        session=instance.session,
-        auth_url=instance._auth_url,
-        username=instance._username,
-        password=instance._password,
+        auth_url=auth_url,
+        username=username,
+        password=password,
        region_name=instance._region_name,
    )
Author	SHA1	Message	Date
David.T	d4dfe32d0d	python-openstackclient ClientManager interface changed I update the watcher client plugin to correctly used ClientManager auth parameters Change-Id: Ie2e4db3b63ea1671147a407480ce0d2569d5b057 Closes-bug: #1625643 (cherry picked from commit `a48a9213f0`)	2016-09-29 07:15:28 +00:00
Jenkins	63a319c1d6	Merge "Add constraint target to tox.ini and remove 1 dep" into stable/newton	2016-09-26 09:40:00 +00:00
David.T	6347775f6d	Add constraint target to tox.ini and remove 1 dep This adds a pip install command to tox.ini that is only used when the tox env is passed with the 'constraints' factor appended onto it. As such this will not effect developer workflows or current unit tests. The initial use of this will be in a non-voting job, to verify that the constrained checks with tox are stable. DevStack is already running constrained jobs, as such problems are no expected. To run a tox with pip using constraints on a developer system a developer should run the desired tox environment with -constraints. For example: $(tox -epy27-constraints) Pip will pull the current version of the upper-constraints.txt file down from the git.openstack.org, however this method can be overriden to use a local file setting the environment variable "UPPER_CONSTRAINTS_FILE" to the local path or a different URL, it is passed directly to pip. This is currently not enabled in the default tox run, however it is possible to enable it as a default by adding it to 'envlist' in tox.ini This also removes requirements.txt from tox.ini deps This is redundant, per lifeless email: http://lists.openstack.org/pipermail/openstack-dev/2015-July/069663.html Change-Id: Id953a99cf2f83533a38a03f9934f4ec818bec03f	2016-09-21 10:17:54 +00:00
avnish	0a5edb5852	Update home page link in cfg file Change-Id: I4630862bc2e7cd64f158173fdf05af5a054afd92 (cherry picked from commit `ad4ee3fcc7`)	2016-09-21 08:40:31 +00:00
Doug Hellmann	77a6c9a6d9	Update .gitreview for stable/newton Change-Id: I2117565c1bf7340baf3df0743a0fd01f30592eb5	2016-09-02 09:45:20 -04:00