-
Notifications
You must be signed in to change notification settings - Fork 239
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
v1auth: support endpoint_data_for() api
...so we can be used with openstacksdk. Also, add a few functests that use openstacksdk. Change-Id: Ie6987f5de48914ec8932254cde79a973a0264877
- Loading branch information
Showing
6 changed files
with
221 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| # Copyright (c) 2014 Christian Schwede <[email protected]> | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| # implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import os | ||
| from six.moves import configparser | ||
|
|
||
| TEST_CONFIG = None | ||
|
|
||
|
|
||
| def _load_config(force_reload=False): | ||
| global TEST_CONFIG | ||
| if not force_reload and TEST_CONFIG is not None: | ||
| return TEST_CONFIG | ||
|
|
||
| config_file = os.environ.get('SWIFT_TEST_CONFIG_FILE', | ||
| '/etc/swift/test.conf') | ||
| parser = configparser.ConfigParser({'auth_version': '1'}) | ||
| parser.read(config_file) | ||
| conf = {} | ||
| if parser.has_section('func_test'): | ||
| if parser.has_option('func_test', 'auth_uri'): | ||
| conf['auth_url'] = parser.get('func_test', 'auth_uri') | ||
| try: | ||
| conf['auth_version'] = parser.get('func_test', 'auth_version') | ||
| except configparser.NoOptionError: | ||
| last_piece = conf['auth_url'].rstrip('/').rsplit('/', 1)[1] | ||
| if last_piece.endswith('.0'): | ||
| last_piece = last_piece[:-2] | ||
| if last_piece in ('1', '2', '3'): | ||
| conf['auth_version'] = last_piece | ||
| else: | ||
| raise | ||
| else: | ||
| auth_host = parser.get('func_test', 'auth_host') | ||
| auth_port = parser.getint('func_test', 'auth_port') | ||
| auth_ssl = parser.getboolean('func_test', 'auth_ssl') | ||
| auth_prefix = parser.get('func_test', 'auth_prefix') | ||
| conf['auth_version'] = parser.get('func_test', 'auth_version') | ||
| if auth_ssl: | ||
| auth_url = "https://" | ||
| else: | ||
| auth_url = "http://" | ||
| auth_url += "%s:%s%s" % (auth_host, auth_port, auth_prefix) | ||
| if conf['auth_version'] == "1": | ||
| auth_url += 'v1.0' | ||
| conf['auth_url'] = auth_url | ||
|
|
||
| try: | ||
| conf['account_username'] = parser.get('func_test', | ||
| 'account_username') | ||
| except configparser.NoOptionError: | ||
| conf['account'] = parser.get('func_test', 'account') | ||
| conf['username'] = parser.get('func_test', 'username') | ||
| conf['account_username'] = "%s:%s" % (conf['account'], | ||
| conf['username']) | ||
| else: | ||
| # Still try to get separate account/usernames for keystone tests | ||
| try: | ||
| conf['account'] = parser.get('func_test', 'account') | ||
| conf['username'] = parser.get('func_test', 'username') | ||
| except configparser.NoOptionError: | ||
| pass | ||
|
|
||
| conf['password'] = parser.get('func_test', 'password') | ||
|
|
||
| # For keystone v3 | ||
| try: | ||
| conf['account4'] = parser.get('func_test', 'account4') | ||
| conf['username4'] = parser.get('func_test', 'username4') | ||
| conf['domain4'] = parser.get('func_test', 'domain4') | ||
| conf['password4'] = parser.get('func_test', 'password4') | ||
| except configparser.NoOptionError: | ||
| pass | ||
|
|
||
| TEST_CONFIG = conf | ||
|
|
||
|
|
||
| try: | ||
| _load_config() | ||
| except configparser.NoOptionError: | ||
| TEST_CONFIG = None # sentinel used in test setup |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| # Copyright (c) 2019 Tim Burke <[email protected]> | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| # implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import unittest | ||
| import uuid | ||
|
|
||
| import openstack | ||
|
|
||
| from . import TEST_CONFIG | ||
|
|
||
| PREFIX = 'test-swiftclient-' | ||
|
|
||
|
|
||
| class TestOpenStackSDK(unittest.TestCase): | ||
| @classmethod | ||
| def setUpClass(cls): | ||
| # NB: Only runs for v1 auth, to exercise our keystoneauth plugin | ||
| cls.skip_tests = (TEST_CONFIG is None or | ||
| TEST_CONFIG['auth_version'] != '1') | ||
| if not cls.skip_tests: | ||
| cls.conn = openstack.connect( | ||
| auth_type='v1password', | ||
| auth_url=TEST_CONFIG['auth_url'], | ||
| username=TEST_CONFIG['account_username'], | ||
| password=TEST_CONFIG['password'], | ||
| ) | ||
| cls.object_store = cls.conn.object_store | ||
|
|
||
| def setUp(self): | ||
| if self.skip_tests: | ||
| raise unittest.SkipTest('SKIPPING V1-AUTH TESTS') | ||
|
|
||
| def tearDown(self): | ||
| if self.skip_tests: | ||
| return | ||
| for c in self.object_store.containers(): | ||
| if c.name.startswith(PREFIX): | ||
| for o in self.object_store.objects(c.name): | ||
| self.object_store.delete_object( | ||
| o.name, container=c.name) | ||
| self.object_store.delete_container(c.name) | ||
|
|
||
| def test_containers(self): | ||
| meta = self.object_store.get_account_metadata() | ||
| count_before = meta.account_container_count | ||
| containers = sorted(PREFIX + str(uuid.uuid4()) | ||
| for _ in range(10)) | ||
| for c in containers: | ||
| self.object_store.create_container(c) | ||
| self.assertEqual([ | ||
| c.name for c in self.object_store.containers() | ||
| if c.name.startswith(PREFIX) | ||
| ], containers) | ||
| meta = self.object_store.get_account_metadata() | ||
| self.assertEqual(count_before + len(containers), | ||
| meta.account_container_count) | ||
|
|
||
| def test_objects(self): | ||
| container = PREFIX + str(uuid.uuid4()) | ||
| self.object_store.create_container(container) | ||
| objects = sorted(str(uuid.uuid4()) for _ in range(10)) | ||
| for o in objects: | ||
| self.object_store.create_object(container, o, data=b'x') | ||
| self.assertEqual([ | ||
| o.name for o in self.object_store.objects(container) | ||
| ], objects) | ||
| meta = self.object_store.get_container_metadata(container) | ||
| self.assertEqual(len(objects), meta.object_count) | ||
|
|
||
| def test_object_metadata(self): | ||
| container = PREFIX + str(uuid.uuid4()) | ||
| self.object_store.create_container(container) | ||
| obj = str(uuid.uuid4()) | ||
| obj_meta = {str(uuid.uuid4()): str(uuid.uuid4()) for _ in range(10)} | ||
| # NB: as of 0.36.0, create_object() doesn't play well with passing | ||
| # both data and metadata, so we do a PUT then POST | ||
| self.object_store.create_object(container, obj, data=b'x') | ||
| self.object_store.set_object_metadata(obj, container, **obj_meta) | ||
| meta = self.object_store.get_object_metadata(obj, container) | ||
| self.assertEqual(obj_meta, meta.metadata) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters