From 530153597deb5030c296358431d9549d13b7288b Mon Sep 17 00:00:00 2001 From: spisarski Date: Mon, 16 Oct 2017 15:54:51 -0600 Subject: 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 --- snaps/openstack/os_credentials.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'snaps/openstack/os_credentials.py') 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: -- cgit 1.2.3-korg