diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-11-17 09:02:27 -0700 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-11-20 07:58:10 -0700 |
| commit | 2e8f0c27a1a9e16778f83dba7ca9489664bd92f2 (patch) | |
| tree | c55dd9a31c264a1568ef23c5be2cbb62feac1fc3 /snaps/openstack/tests/os_source_file_test.py | |
| parent | 88c180252d78226e06ecf53a23d4f0eca9815bb8 (diff) | |
Refactoring of ProjectSettings to extend ProjectConfig
ProjectSettings and keystone_utils have a runtime cyclical
dependency. This patch reduces this dependency and
deprecates the ProjectSettings class.
JIRA: SNAPS-221
Change-Id: I9e39f09fb8bb03dbd725f44b7256bacb05f26afc
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/tests/os_source_file_test.py')
| -rw-r--r-- | snaps/openstack/tests/os_source_file_test.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py index 1617f91..db54f10 100644 --- a/snaps/openstack/tests/os_source_file_test.py +++ b/snaps/openstack/tests/os_source_file_test.py @@ -14,13 +14,11 @@ # limitations under the License. import logging import pkg_resources -import requests -from requests.packages.urllib3.exceptions import InsecureRequestWarning import uuid import unittest from snaps import file_utils -from snaps.openstack.create_project import ProjectSettings +from snaps.config.project import ProjectConfig from snaps.openstack.create_user import UserSettings from snaps.openstack.tests import openstack_tests from snaps.openstack.utils import deploy_utils, keystone_utils @@ -29,8 +27,6 @@ from snaps.openstack.utils import deploy_utils, keystone_utils dev_os_env_file = pkg_resources.resource_filename( 'snaps.openstack.tests.conf', 'os_env.yaml') -requests.packages.urllib3.disable_warnings(InsecureRequestWarning) - class OSComponentTestCase(unittest.TestCase): @@ -149,7 +145,7 @@ class OSIntegrationTestCase(OSComponentTestCase): guid = self.__class__.__name__ + '-' + str(uuid.uuid4())[:-19] project_name = guid + '-proj' self.project_creator = deploy_utils.create_project( - self.admin_os_creds, ProjectSettings( + self.admin_os_creds, ProjectConfig( name=project_name, domain=self.admin_os_creds.project_domain_name)) |