# See the License for the specific language governing permissions and
# limitations under the License.
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'
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 magnum_api_version: The OpenStack's API version to use
+ for magnum 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')
+ :param project_domain_name: Used for v3 APIs (default='Default')
:param interface: Used to specify the endpoint type for keystone as
public, admin, internal
:param proxy_settings: instance of os_credentials.ProxySettings class
- :param cacert: Default to be True for http, or the certification file
- is specified for https verification, or set to be False
- to disable server certificate verification without cert
- file
+ :param cacert: True for https or the certification file for https
+ verification (default=False)
:param region_name: the region (optional default = None)
"""
self.username = kwargs.get('username')
else:
self.heat_api_version = float(kwargs['heat_api_version'])
- if kwargs.get('user_domain_id') is None:
- self.user_domain_id = 'default'
+ 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'])
+
+ if kwargs.get('magnum_api_version') is None:
+ self.magnum_api_version = 1
else:
- self.user_domain_id = kwargs['user_domain_id']
+ self.magnum_api_version = float(kwargs['magnum_api_version'])
+
+ self.user_domain_id = kwargs.get('user_domain_id', 'default')
+
+ if kwargs.get('user_domain_name') is None:
+ self.user_domain_name = 'Default'
+ else:
+ self.user_domain_name = kwargs['user_domain_name']
+
+ self.project_domain_id = kwargs.get('project_domain_id', 'default')
- if kwargs.get('project_domain_id') is None:
- self.project_domain_id = 'default'
+ if kwargs.get('project_domain_name') is None:
+ self.project_domain_name = 'Default'
else:
- self.project_domain_id = kwargs['project_domain_id']
+ self.project_domain_name = kwargs['project_domain_name']
if kwargs.get('interface') is None:
- self.interface = 'admin'
+ self.interface = 'public'
else:
self.interface = kwargs['interface']
raise OSCredsError('username, password, auth_url, and project_name'
' are required')
- auth_url_tokens = self.auth_url.split('/')
+ self.auth_url = self.__scrub_auth_url()
+
+ def __scrub_auth_url(self):
+ """
+ As the Python APIs are have more stringent requirements around how the
+ auth_url is formed than the CLI, this method will scrub any version
+ from the end of
+ :return:
+ """
+ auth_url_tokens = self.auth_url.rstrip('/').split('/')
last_token = auth_url_tokens[len(auth_url_tokens) - 1]
- if len(last_token) == 0:
- last_token = auth_url_tokens[len(auth_url_tokens) - 2]
+ token_iters = len(auth_url_tokens)
+ if last_token.startswith('v'):
+ token_iters -= 1
+ if self.identity_api_version == keystone_utils.V2_VERSION_NUM:
+ last_token = keystone_utils.V2_VERSION_STR
+ else:
+ last_token = 'v' + str(int(self.identity_api_version))
- if not last_token.startswith('v'):
- raise OSCredsError('auth_url last toke must start with \'v\'')
+ new_url = None
+ for ctr in range(0, token_iters):
+ if new_url:
+ new_url += '/' + auth_url_tokens[ctr]
+ else:
+ new_url = auth_url_tokens[ctr]
+ new_url += '/' + last_token
+
+ return new_url
- @property
def __str__(self):
"""Converts object to a string"""
return ('OSCreds - username=' + str(self.username) +
', image_api_version=' + str(self.image_api_version) +
', network_api_version=' + str(self.network_api_version) +
', compute_api_version=' + str(self.compute_api_version) +
+ ', heat_api_version=' + str(self.heat_api_version) +
', user_domain_id=' + str(self.user_domain_id) +
+ ', user_domain_name=' + str(self.user_domain_name) +
+ ', project_domain_id=' + str(self.project_domain_id) +
+ ', project_domain_name=' + str(self.project_domain_name) +
', interface=' + str(self.interface) +
+ ', region_name=' + str(self.region_name) +
', proxy_settings=' + str(self.proxy_settings) +
', cacert=' + str(self.cacert))
:param port: the HTTP proxy port
:param https_host: the HTTPS proxy host (defaults to host)
:param https_port: the HTTPS proxy port (defaults to port)
- :param port: the HTTP proxy port
:param ssh_proxy_cmd: the SSH proxy command string (optional)
"""
self.host = kwargs.get('host')
self.port = kwargs.get('port')
+ if self.port and isinstance(self.port, numbers.Number):
+ self.port = str(self.port)
self.https_host = kwargs.get('https_host', self.host)
self.https_port = kwargs.get('https_port', self.port)
+ if self.https_port and isinstance(self.https_port, numbers.Number):
+ self.https_port = str(self.https_port)
self.ssh_proxy_cmd = kwargs.get('ssh_proxy_cmd')
Code Review / snaps.git / blobdiff