From 27ba5a02a2331193415e247fc1e82853c838170c Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 25 Jun 2019 13:04:31 -0400
Subject: [PATCH] Update tox.ini files to use stein constraints

This updates the upper-constraints.txt used by tox for
installing python modules to reference the stable/stein
constraints.

Change-Id: Ia3a145933e44aca016e84024dca4131dd778ecce
Closes-Bug: 1834216
Signed-off-by: Don Penney <don.penney@windriver.com>
---
 .gitignore                                                  | 2 +-
 .../controllerconfig/controllerconfig/tidy_storage.py       | 4 ++--
 controllerconfig/controllerconfig/tox.ini                   | 5 ++++-
 sysinv/cgts-client/cgts-client/tox.ini                      | 5 ++++-
 sysinv/sysinv/sysinv/tox.ini                                | 6 +++++-
 sysinv/sysinv/sysinv/upper-constraints.txt                  | 5 +++++
 tox.ini                                                     | 4 +++-
 7 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 sysinv/sysinv/sysinv/upper-constraints.txt

diff --git a/.gitignore b/.gitignore
index fe6fa3c632..fff73ba26b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.a
-*.egg
+*.egg*
 *.egg-info
 *.o
 *.py[co]
diff --git a/controllerconfig/controllerconfig/controllerconfig/tidy_storage.py b/controllerconfig/controllerconfig/controllerconfig/tidy_storage.py
index bd1eecf714..0aa8baeb09 100644
--- a/controllerconfig/controllerconfig/controllerconfig/tidy_storage.py
+++ b/controllerconfig/controllerconfig/controllerconfig/tidy_storage.py
@@ -308,7 +308,7 @@ def tidy_storage(result_file):
             raise TidyStorageFail("Failed to get Cinder volume info")
 
         if pools:
-            host = pools[0].name
+            host = pools[0].name  # pylint: disable=no-member
 
         if v_t_d is None:
             v_t_d = 'ceph'
@@ -318,7 +318,7 @@ def tidy_storage(result_file):
         cinder_volume_l = [i.id.encode('utf-8') for i in volume_l]
 
         if avail_zones:
-            avail_z = avail_zones[0].zoneName
+            avail_z = avail_zones[0].zoneName  # pylint: disable=no-member
 
         try:
             output = subprocess.check_output(
diff --git a/controllerconfig/controllerconfig/tox.ini b/controllerconfig/controllerconfig/tox.ini
index 430282b750..23578e04c1 100644
--- a/controllerconfig/controllerconfig/tox.ini
+++ b/controllerconfig/controllerconfig/tox.ini
@@ -11,7 +11,10 @@ stxdir = {toxinidir}/../../..
 
 [testenv]
 whitelist_externals = find
-install_command = pip install  --no-cache-dir  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/pike/upper-constraints.txt} {opts} {packages}
+install_command = pip install \
+    --no-cache-dir \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    {opts} {packages}
 
 # Note: Developers can leave STX_PREFIX unset in their env, and it will default to "stx-".
 # Zuul sets STX_PREFIX to an empty string.
diff --git a/sysinv/cgts-client/cgts-client/tox.ini b/sysinv/cgts-client/cgts-client/tox.ini
index ac38a89c21..f376efca3b 100644
--- a/sysinv/cgts-client/cgts-client/tox.ini
+++ b/sysinv/cgts-client/cgts-client/tox.ini
@@ -18,7 +18,10 @@ setenv = VIRTUAL_ENV={envdir}
          STX_PREFIX = {env:STX_PREFIX:stx-}
 basepython = python2.7
 usedevelop = True
-install_command = pip install  -U  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
+install_command = pip install \
+    -U \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        -e{[tox]stxdir}/{env:STX_PREFIX}update/tsconfig/tsconfig
diff --git a/sysinv/sysinv/sysinv/tox.ini b/sysinv/sysinv/sysinv/tox.ini
index d75a904feb..4ee19bc15b 100644
--- a/sysinv/sysinv/sysinv/tox.ini
+++ b/sysinv/sysinv/sysinv/tox.ini
@@ -21,7 +21,11 @@ sitepackages = True
 whitelist_externals = bash
                       find
 
-install_command = pip install -v -v -v -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/pike/upper-constraints.txt}  {opts} {packages}
+install_command = pip install \
+    -v -v -v \
+    -c{toxinidir}/upper-constraints.txt \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    {opts} {packages}
 
 # Note the hash seed is set to 0 until can be tested with a
 # random hash seed successfully.
diff --git a/sysinv/sysinv/sysinv/upper-constraints.txt b/sysinv/sysinv/sysinv/upper-constraints.txt
new file mode 100644
index 0000000000..f73620cda8
--- /dev/null
+++ b/sysinv/sysinv/sysinv/upper-constraints.txt
@@ -0,0 +1,5 @@
+# Override upstream constraints based on StarlingX load
+iso8601==0.1.11
+openstacksdk==0.25.0
+os-client-config==1.28.0
+paramiko==2.1.1
diff --git a/tox.ini b/tox.ini
index 0503b75b41..4d885fe6a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,9 @@ minversion = 2.3
 skipsdist = True
 
 [testenv]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages}
+install_command = pip install \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
          OS_STDERR_CAPTURE=1