diff options
| -rw-r--r-- | saharaclient/api/data_sources.py | 11 | ||||
| -rw-r--r-- | tox.ini | 12 |
2 files changed, 16 insertions, 7 deletions
diff --git a/saharaclient/api/data_sources.py b/saharaclient/api/data_sources.py index d5b8328..93a1efb 100644 --- a/saharaclient/api/data_sources.py +++ b/saharaclient/api/data_sources.py @@ -26,7 +26,7 @@ class DataSourceManagerV1(base.ResourceManager): def create(self, name, description, data_source_type, url, credential_user=None, credential_pass=None, - is_public=None, is_protected=None): + is_public=None, is_protected=None, s3_credentials=None): """Create a Data Source.""" data = { @@ -34,14 +34,15 @@ class DataSourceManagerV1(base.ResourceManager): 'description': description, 'type': data_source_type, 'url': url, - 'credentials': {} } - self._copy_if_defined(data['credentials'], + credentials = {} + self._copy_if_defined(credentials, user=credential_user, password=credential_pass) - + credentials = credentials or s3_credentials self._copy_if_defined(data, is_public=is_public, - is_protected=is_protected) + is_protected=is_protected, + credentials=credentials) return self._create('/data-sources', data, 'data_source') @@ -33,9 +33,17 @@ commands = oslo_debug_helper -t saharaclient/tests/unit {posargs} [testenv:cover] basepython = python3 +setenv = + {[testenv]setenv} + PYTHON=coverage run --source saharaclient --parallel-mode commands = - python setup.py test --coverage --testr-args='{posargs}' - coverage report + coverage erase + find . -type f -name "*.pyc" -delete + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml + coverage report [tox:jenkins] sitepackages = False |