X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=snaps%2Fopenstack%2Fos_credentials.py;h=11ef8ff096438e345cb77285d3194f1f859be332;hb=refs%2Fchanges%2F15%2F64515%2F1;hp=db8d18cbeb5d41a7694b641683c8a9c6eda5ed8b;hpb=ce19be8891ef3f3e24800924a40f4480dec24bec;p=snaps.git diff --git a/snaps/openstack/os_credentials.py b/snaps/openstack/os_credentials.py index db8d18c..11ef8ff 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,17 +42,19 @@ class OSCreds: clients :param heat_api_version: The OpenStack's API version to use for Heat clients - :param user_domain_id: Used for v3 APIs (default=None) - :param user_domain_name: Used for v3 APIs (default='default') - :param project_domain_id: Used for v3 APIs (default=None) - :param project_domain_name: Used for v3 APIs (default='default') + :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') @@ -61,7 +63,7 @@ class OSCreds: self.project_name = kwargs.get('project_name') if kwargs.get('identity_api_version') is None: - self.identity_api_version = keystone_utils.V2_VERSION_NUM + self.identity_api_version = keystone_utils.V3_VERSION_NUM else: self.identity_api_version = float(kwargs['identity_api_version']) @@ -83,24 +85,36 @@ class OSCreds: if kwargs.get('heat_api_version') is None: self.heat_api_version = 1 else: - self.heat_api_version = float(kwargs['heat_api_version']) + val = kwargs['heat_api_version'] + ver = float(val) + self.heat_api_version = int(ver) - self.user_domain_id = kwargs.get('user_domain_id') + 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.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' + self.user_domain_name = 'Default' else: self.user_domain_name = kwargs['user_domain_name'] - self.project_domain_id = kwargs.get('project_domain_id') + self.project_domain_id = kwargs.get('project_domain_id', 'default') if kwargs.get('project_domain_name') is None: - self.project_domain_name = 'default' + self.project_domain_name = 'Default' else: 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'] @@ -157,7 +171,45 @@ class OSCreds: return new_url - @property + def to_dict(self): + """Converts object to a dict that can be used to construct another""" + return {'username': self.username, + 'password': self.password, + 'auth_url': self.auth_url, + 'project_name': self.project_name, + 'identity_api_version': self.identity_api_version, + 'image_api_version': self.image_api_version, + 'network_api_version': self.network_api_version, + 'compute_api_version': self.compute_api_version, + 'heat_api_version': self.heat_api_version, + 'user_domain_id': self.user_domain_id, + 'user_domain_name': self.user_domain_name, + 'project_domain_id': self.project_domain_id, + 'project_domain_name': self.project_domain_name, + 'interface': self.interface, + 'region_name': self.region_name, + 'proxy_settings': self.proxy_settings, + 'cacert': self.cacert} + + def __eq__(self, other): + return (self.username == other.username and + self.password == other.password and + self.auth_url == other.auth_url and + self.project_name == other.project_name and + float(self.identity_api_version) == float(other.identity_api_version) and + float(self.image_api_version) == float(other.image_api_version) and + float(self.network_api_version) == float(other.network_api_version) and + float(self.compute_api_version) == float(other.compute_api_version) and + float(self.heat_api_version) == float(other.heat_api_version) and + self.user_domain_id == other.user_domain_id and + self.user_domain_name == other.user_domain_name and + self.project_domain_id == other.project_domain_id and + self.project_domain_name == other.project_domain_name and + self.interface == other.interface and + self.region_name == other.region_name and + self.proxy_settings == other.proxy_settings and + self.cacert == other.cacert) + def __str__(self): """Converts object to a string""" return ('OSCreds - username=' + str(self.username) + @@ -192,7 +244,6 @@ class ProxySettings: :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')