diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-10-16 15:54:51 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-10-16 15:54:51 -0600 |
| commit | 530153597deb5030c296358431d9549d13b7288b (patch) | |
| tree | 1f5f4c6ad26ff8196582a3877e5b4e34b1ad22c9 /snaps/openstack/os_credentials.py | |
| parent | 8810b59c9a3a61013398bac256b84bbb365b4d87 (diff) | |
First of several patches for adding volume support.
* Added volume API version attribute to OSCreds
* Created utility for interfacing with the Cinder APIs
* Created QoS creator
* Added new tests to test_suite_builder.py
JIRA: SNAPS-195, SNAPS-194
Change-Id: I0c6a53b4cba6efea3e92d909b94b259fa07a35c3
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/os_credentials.py')
| -rw-r--r-- | snaps/openstack/os_credentials.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/snaps/openstack/os_credentials.py b/snaps/openstack/os_credentials.py index 6f25237..cff2dd8 100644 --- a/snaps/openstack/os_credentials.py +++ b/snaps/openstack/os_credentials.py @@ -15,7 +15,7 @@ from neutronclient.common.utils import str2bool import numbers from snaps import file_utils -from snaps.openstack.utils import glance_utils, keystone_utils +from snaps.openstack.utils import glance_utils, keystone_utils, cinder_utils __author__ = 'spisarski' @@ -42,6 +42,8 @@ class OSCreds: clients :param heat_api_version: The OpenStack's API version to use for Heat clients + :param volume_api_version: The OpenStack's API version to use + for Cinder clients :param user_domain_id: Used for v3 APIs (default='default') :param user_domain_name: Used for v3 APIs (default='Default') :param project_domain_id: Used for v3 APIs (default='default') @@ -85,6 +87,12 @@ class OSCreds: else: self.heat_api_version = float(kwargs['heat_api_version']) + if kwargs.get('volume_api_version') is None: + self.volume_api_version = cinder_utils.VERSION_2 + else: + self.volume_api_version = float( + kwargs['volume_api_version']) + self.user_domain_id = kwargs.get('user_domain_id', 'default') if kwargs.get('user_domain_name') is None: |