Browse Source

Fix lower-constraints tox env to use proper constraints

- Bumps some of the lower constraints
- Fixes common/endpoint_utils.py to fallback to use auth_uri.

Change-Id: Ief0868d5feef3ee6b0689c6be27649ff009fbbcc
changes/63/651063/5
Rabi Mishra 2 years ago
parent
commit
87b4a92a62
  1. 5
      heat/common/endpoint_utils.py
  2. 8
      heat/tests/api/aws/test_api_ec2token.py
  3. 8
      heat/tests/test_common_context.py
  4. 10
      lower-constraints.txt
  5. 6
      requirements.txt
  6. 2
      test-requirements.txt
  7. 1
      tox.ini

5
heat/common/endpoint_utils.py

@ -34,5 +34,8 @@ def get_auth_uri(v3=True):
else:
# Import auth_token to have keystone_authtoken settings setup.
importutils.import_module('keystonemiddleware.auth_token')
auth_uri = cfg.CONF.keystone_authtoken.www_authenticate_uri
try:
auth_uri = cfg.CONF.keystone_authtoken.www_authenticate_uri
except cfg.NoSuchOptError:
auth_uri = cfg.CONF.keystone_authtoken.auth_uri
return auth_uri.replace('v2.0', 'v3') if auth_uri and v3 else auth_uri

8
heat/tests/api/aws/test_api_ec2token.py

@ -571,8 +571,12 @@ class Ec2TokenTest(common.HeatTestCase):
# Import auth_token to have keystone_authtoken settings setup.
importutils.import_module('keystonemiddleware.auth_token')
dummy_url = 'http://123:5000/v2.0'
cfg.CONF.set_override('www_authenticate_uri', dummy_url,
group='keystone_authtoken')
try:
cfg.CONF.set_override('www_authenticate_uri', dummy_url,
group='keystone_authtoken')
except cfg.NoSuchOptError:
cfg.CONF.set_override('auth_uri', dummy_url,
group='keystone_authtoken')
ec2 = ec2token.EC2Token(app='woot', conf={})
params = {'AWSAccessKeyId': 'foo', 'Signature': 'xyz'}
req_env = {'SERVER_NAME': 'heat',

8
heat/tests/test_common_context.py

@ -218,8 +218,12 @@ class TestRequestContext(common.HeatTestCase):
[clients_keystone] section.
"""
importutils.import_module('keystonemiddleware.auth_token')
cfg.CONF.set_override('www_authenticate_uri', 'http://abc/v2.0',
group='keystone_authtoken')
try:
cfg.CONF.set_override('www_authenticate_uri', 'http://abc/v2.0',
group='keystone_authtoken')
except cfg.NoSuchOptError:
cfg.CONF.set_override('auth_uri', 'http://abc/v2.0',
group='keystone_authtoken')
policy_check = 'heat.common.policy.Enforcer.check_is_admin'
with mock.patch(policy_check) as pc:
pc.return_value = False

10
lower-constraints.txt

@ -90,7 +90,7 @@ pika==0.10.0
ply==3.11
prettytable==0.7.2
psutil==5.4.3
psycopg2==2.6.2
psycopg2==2.7
pyasn1==0.4.2
pycadf==2.7.0
pycparser==2.18
@ -102,7 +102,7 @@ pyOpenSSL==17.5.0
pyparsing==2.2.0
pyperclip==1.6.0
python-barbicanclient==4.5.2
python-blazarclient===1.0.0
python-blazarclient===1.0.1
python-ceilometerclient==2.5.0
python-cinderclient==3.3.0
python-dateutil==2.7.0
@ -111,7 +111,7 @@ python-editor==1.0.3
python-glanceclient==2.8.0
python-heatclient==1.10.0
python-keystoneclient==3.8.0
python-magnumclient==2.1.0
python-magnumclient==2.3.0
python-manilaclient==1.16.0
python-mimeparse==1.6.0
python-mistralclient==3.1.0
@ -124,7 +124,7 @@ python-saharaclient==1.4.0
python-subunit==1.2.0
python-swiftclient==3.2.0
python-troveclient==2.2.0
python-zaqarclient==1.0.0
python-zaqarclient==1.3.0
python-zunclient==2.0.0
pytz==2013.6
PyYAML==3.12
@ -153,7 +153,7 @@ unittest2==1.1.0
urllib3==1.22
vine==1.1.4
voluptuous==0.11.1
warlock==1.3.0
warlock==1.2.0
WebOb==1.7.1
websocket-client==0.47.0
wrapt==1.10.11

6
requirements.txt

@ -33,13 +33,13 @@ oslo.versionedobjects>=1.31.2 # Apache-2.0
PasteDeploy>=1.5.0 # MIT
aodhclient>=0.9.0 # Apache-2.0
python-barbicanclient>=4.5.2 # Apache-2.0
python-blazarclient>=1.0.0 # Apache-2.0
python-blazarclient>=1.0.1 # Apache-2.0
python-cinderclient>=3.3.0 # Apache-2.0
python-designateclient>=2.7.0 # Apache-2.0
python-glanceclient>=2.8.0 # Apache-2.0
python-heatclient>=1.10.0 # Apache-2.0
python-keystoneclient>=3.8.0 # Apache-2.0
python-magnumclient>=2.1.0 # Apache-2.0
python-magnumclient>=2.3.0 # Apache-2.0
python-manilaclient>=1.16.0 # Apache-2.0
python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
python-monascaclient>=1.12.0 # Apache-2.0
@ -50,7 +50,7 @@ python-openstackclient>=3.12.0 # Apache-2.0
python-saharaclient>=1.4.0 # Apache-2.0
python-swiftclient>=3.2.0 # Apache-2.0
python-troveclient>=2.2.0 # Apache-2.0
python-zaqarclient>=1.0.0 # Apache-2.0
python-zaqarclient>=1.3.0 # Apache-2.0
python-zunclient>=2.0.0 # Apache-2.0
pytz>=2013.6 # MIT
PyYAML>=3.12 # MIT

2
test-requirements.txt

@ -11,7 +11,7 @@ kombu!=4.0.2,>=4.0.0 # BSD
mock>=2.0.0 # BSD
PyMySQL>=0.7.6 # MIT License
oslotest>=3.2.0 # Apache-2.0
psycopg2>=2.6.2 # LGPL/ZPL
psycopg2>=2.7 # LGPL/ZPL
stestr>=2.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT

1
tox.ini

@ -135,6 +135,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
[testenv:lower-constraints]
basepython = python3
install_command = pip install {opts} {packages}
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt

Loading…
Cancel
Save