openstack
/
ec2-api
Code Issues Proposed changes

Update botocore client and use cloned novaclient for functional tests 

Since botocore 1.0.0 is released we make ec2api functional tests
to be compatible with it.

Previously used novaclient modification (v14 of
https://review.openstack.org/#/c/152569/) is too obsolete. It is not
compatible with modern oslo libraries. Current version of this
modification (v34) is obsolete as well.

The proposed solution is to use a separate novaclient repository, which
can be maintained independently of community. Until microversions are
not supported by novaclient upstream.

Change-Id: I75e1bbcd81678a56a0940b696cfa5dbc2c159cc6
This commit is contained in:
Andrey Pavlov 2015-06-22 15:47:00 +03:00 committed by Feodor Tersin
parent 2c65bc7ea6
commit 45bde55bbb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/settings
View File

@ -9,10 +9,12 @@ enable_service ec2-api-s3
# but related changes are not done in the client release.
# So we temporary use a not commited patch
# https://review.openstack.org/#/c/152569/
# Since this patch become obsolete we temporary use our own maintained
# separate repository https://github.com/ftersin/python-novaclient
LIBS_FROM_GIT=python-novaclient
# Since legal way to set git repository do not work for a plugin,
# we set internal DevStack's variables directly
# NOVACLIENT_REPO=https://review.openstack.org/openstack/python-novaclient
# NOVACLIENT_BRANCH=refs/changes/69/152569/14
GITREPO["python-novaclient"]=https://review.openstack.org/openstack/python-novaclient
GITBRANCH["python-novaclient"]=refs/changes/69/152569/14
GITREPO["python-novaclient"]=https://github.com/ftersin/python-novaclient
GITBRANCH["python-novaclient"]=refs/2.26.0_microversions

4
ec2api/tests/functional/botocoreclient.py
View File

@ -18,8 +18,8 @@ import botocore.session
def _get_ec2_client(url, region, access, secret):
connection_data = {
'config_file': (None, 'AWS_CONFIG_FILE', None),
'region': ('region', 'BOTO_DEFAULT_REGION', region),
'config_file': (None, 'AWS_CONFIG_FILE', None, None),
'region': ('region', 'BOTO_DEFAULT_REGION', region, None),
}
session = botocore.session.get_session(connection_data)
return session.create_client(