blob: a92d16a0a6f860d7843b0822d0af32da610bd45d [file] [log] [blame]
Matthew Treinishc791ac42014-07-16 09:15:23 -04001# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
2#
3# Licensed under the Apache License, Version 2.0 (the "License"); you may
4# not use this file except in compliance with the License. You may obtain
5# a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12# License for the specific language governing permissions and limitations
13# under the License.
14
15import hashlib
16import os
Matthew Treinish96e9e882014-06-09 18:37:19 -040017
Doug Hellmann583ce2c2015-03-11 14:55:46 +000018from oslo_concurrency import lockutils
19from oslo_log import log as logging
Matthew Treinish1c517a22015-04-23 11:39:44 -040020import six
Matthew Treinishc791ac42014-07-16 09:15:23 -040021import yaml
22
Matthew Treinishf83f35c2015-04-10 11:59:11 -040023from tempest import clients
Matthew Treinishf83f35c2015-04-10 11:59:11 -040024from tempest.common import fixed_network
Matthew Treinishc791ac42014-07-16 09:15:23 -040025from tempest import exceptions
Andrea Frittoli (andreaf)db9672e2016-02-23 14:07:24 -050026from tempest.lib import auth
Matthew Treinish00ab6be2016-10-07 16:29:18 -040027from tempest.lib.common import cred_provider
Andrea Frittoli (andreaf)db9672e2016-02-23 14:07:24 -050028from tempest.lib import exceptions as lib_exc
Matthew Treinishc791ac42014-07-16 09:15:23 -040029
Matthew Treinishc791ac42014-07-16 09:15:23 -040030LOG = logging.getLogger(__name__)
31
32
33def read_accounts_yaml(path):
Matthew Treinishd89db1b2015-12-16 17:29:14 -050034 try:
35 with open(path, 'r') as yaml_file:
Dao Cong Tien40d02082017-01-16 16:59:18 +070036 accounts = yaml.safe_load(yaml_file)
Matthew Treinishd89db1b2015-12-16 17:29:14 -050037 except IOError:
Matthew Treinish4217a702016-10-07 17:27:11 -040038 raise lib_exc.InvalidConfiguration(
Matthew Treinishd89db1b2015-12-16 17:29:14 -050039 'The path for the test accounts file: %s '
40 'could not be found' % path)
Matthew Treinishc791ac42014-07-16 09:15:23 -040041 return accounts
42
43
Andrea Frittoli (andreaf)f9e01262015-05-22 10:24:12 -070044class PreProvisionedCredentialProvider(cred_provider.CredentialProvider):
Matthew Treinishc791ac42014-07-16 09:15:23 -040045
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +010046 # Exclude from the hash fields specific to v2 or v3 identity API
47 # i.e. only include user*, project*, tenant* and password
48 HASH_CRED_FIELDS = (set(auth.KeystoneV2Credentials.ATTRIBUTES) &
49 set(auth.KeystoneV3Credentials.ATTRIBUTES))
50
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +010051 def __init__(self, identity_version, test_accounts_file,
52 accounts_lock_dir, name=None, credentials_domain=None,
53 admin_role=None, object_storage_operator_role=None,
54 object_storage_reseller_admin_role=None):
55 """Credentials provider using pre-provisioned accounts
56
57 This credentials provider loads the details of pre-provisioned
58 accounts from a YAML file, in the format specified by
59 `etc/accounts.yaml.sample`. It locks accounts while in use, using the
60 external locking mechanism, allowing for multiple python processes
61 to share a single account file, and thus running tests in parallel.
62
63 The accounts_lock_dir must be generated using `lockutils.get_lock_path`
64 from the oslo.concurrency library. For instance:
65
66 accounts_lock_dir = os.path.join(lockutils.get_lock_path(CONF),
67 'test_accounts')
68
69 Role names for object storage are optional as long as the
70 `operator` and `reseller_admin` credential types are not used in the
71 accounts file.
72
73 :param identity_version: identity version of the credentials
74 :param admin_role: name of the admin role
75 :param test_accounts_file: path to the accounts YAML file
76 :param accounts_lock_dir: the directory for external locking
77 :param name: name of the hash file (optional)
78 :param credentials_domain: name of the domain credentials belong to
79 (if no domain is configured)
80 :param object_storage_operator_role: name of the role
81 :param object_storage_reseller_admin_role: name of the role
82 """
Andrea Frittoli (andreaf)f9e01262015-05-22 10:24:12 -070083 super(PreProvisionedCredentialProvider, self).__init__(
Andrea Frittoli (andreaf)1eb04962015-10-09 14:48:06 +010084 identity_version=identity_version, name=name,
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +010085 admin_role=admin_role, credentials_domain=credentials_domain)
86 self.test_accounts_file = test_accounts_file
Matthew Treinishd89db1b2015-12-16 17:29:14 -050087 if test_accounts_file:
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +010088 accounts = read_accounts_yaml(self.test_accounts_file)
Matthew Treinishb19eeb82014-09-04 09:57:46 -040089 else:
Andrea Frittoli (andreaf)ee5d56b2016-06-08 11:19:09 +010090 raise lib_exc.InvalidCredentials("No accounts file specified")
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +010091 self.hash_dict = self.get_hash_dict(
92 accounts, admin_role, object_storage_operator_role,
93 object_storage_reseller_admin_role)
94 self.accounts_dir = accounts_lock_dir
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -070095 self._creds = {}
Matthew Treinishc791ac42014-07-16 09:15:23 -040096
97 @classmethod
Matthew Treinish976e8df2014-12-19 14:21:54 -050098 def _append_role(cls, role, account_hash, hash_dict):
99 if role in hash_dict['roles']:
100 hash_dict['roles'][role].append(account_hash)
101 else:
102 hash_dict['roles'][role] = [account_hash]
103 return hash_dict
104
105 @classmethod
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +0100106 def get_hash_dict(cls, accounts, admin_role,
107 object_storage_operator_role=None,
108 object_storage_reseller_admin_role=None):
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400109 hash_dict = {'roles': {}, 'creds': {}, 'networks': {}}
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +0100110
Matthew Treinish976e8df2014-12-19 14:21:54 -0500111 # Loop over the accounts read from the yaml file
Matthew Treinishc791ac42014-07-16 09:15:23 -0400112 for account in accounts:
Matthew Treinish976e8df2014-12-19 14:21:54 -0500113 roles = []
114 types = []
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400115 resources = []
Matthew Treinish976e8df2014-12-19 14:21:54 -0500116 if 'roles' in account:
117 roles = account.pop('roles')
118 if 'types' in account:
119 types = account.pop('types')
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400120 if 'resources' in account:
121 resources = account.pop('resources')
Matthew Treinishc791ac42014-07-16 09:15:23 -0400122 temp_hash = hashlib.md5()
guo yunxian7bbbec12016-08-21 20:03:10 +0800123 account_for_hash = dict((k, v) for (k, v) in account.items()
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +0100124 if k in cls.HASH_CRED_FIELDS)
125 temp_hash.update(six.text_type(account_for_hash).encode('utf-8'))
Matthew Treinish976e8df2014-12-19 14:21:54 -0500126 temp_hash_key = temp_hash.hexdigest()
127 hash_dict['creds'][temp_hash_key] = account
128 for role in roles:
129 hash_dict = cls._append_role(role, temp_hash_key,
130 hash_dict)
131 # If types are set for the account append the matching role
132 # subdict with the hash
133 for type in types:
134 if type == 'admin':
Andrea Frittoli (andreaf)29491a72015-10-13 11:24:17 +0100135 hash_dict = cls._append_role(admin_role, temp_hash_key,
136 hash_dict)
Matthew Treinish976e8df2014-12-19 14:21:54 -0500137 elif type == 'operator':
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +0100138 if object_storage_operator_role:
139 hash_dict = cls._append_role(
140 object_storage_operator_role, temp_hash_key,
141 hash_dict)
142 else:
143 msg = ("Type 'operator' configured, but no "
144 "object_storage_operator_role specified")
145 raise lib_exc.InvalidCredentials(msg)
Matthew Treinish976e8df2014-12-19 14:21:54 -0500146 elif type == 'reseller_admin':
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +0100147 if object_storage_reseller_admin_role:
148 hash_dict = cls._append_role(
149 object_storage_reseller_admin_role,
150 temp_hash_key,
151 hash_dict)
152 else:
153 msg = ("Type 'reseller_admin' configured, but no "
154 "object_storage_reseller_admin_role specified")
155 raise lib_exc.InvalidCredentials(msg)
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400156 # Populate the network subdict
157 for resource in resources:
158 if resource == 'network':
159 hash_dict['networks'][temp_hash_key] = resources[resource]
160 else:
Jordan Pittier525ec712016-12-07 17:51:26 +0100161 LOG.warning(
162 'Unknown resource type %s, ignoring this field',
163 resource
164 )
Matthew Treinishc791ac42014-07-16 09:15:23 -0400165 return hash_dict
166
Matthew Treinish09f17832014-08-15 15:22:50 -0400167 def is_multi_user(self):
Andrea Frittoli (andreaf)ee5d56b2016-06-08 11:19:09 +0100168 return len(self.hash_dict['creds']) > 1
Matthew Treinish09f17832014-08-15 15:22:50 -0400169
Yair Fried76488d72014-10-21 10:13:19 +0300170 def is_multi_tenant(self):
171 return self.is_multi_user()
172
Matthew Treinish09f17832014-08-15 15:22:50 -0400173 def _create_hash_file(self, hash_string):
174 path = os.path.join(os.path.join(self.accounts_dir, hash_string))
Matthew Treinishc791ac42014-07-16 09:15:23 -0400175 if not os.path.isfile(path):
Matthew Treinish4041b262015-02-27 11:18:54 -0500176 with open(path, 'w') as fd:
177 fd.write(self.name)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400178 return True
179 return False
180
181 @lockutils.synchronized('test_accounts_io', external=True)
182 def _get_free_hash(self, hashes):
Matthew Treinish976e8df2014-12-19 14:21:54 -0500183 # Cast as a list because in some edge cases a set will be passed in
184 hashes = list(hashes)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400185 if not os.path.isdir(self.accounts_dir):
186 os.mkdir(self.accounts_dir)
187 # Create File from first hash (since none are in use)
188 self._create_hash_file(hashes[0])
189 return hashes[0]
Matthew Treinish4041b262015-02-27 11:18:54 -0500190 names = []
Matthew Treinish09f17832014-08-15 15:22:50 -0400191 for _hash in hashes:
192 res = self._create_hash_file(_hash)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400193 if res:
Matthew Treinish09f17832014-08-15 15:22:50 -0400194 return _hash
Matthew Treinish4041b262015-02-27 11:18:54 -0500195 else:
196 path = os.path.join(os.path.join(self.accounts_dir,
197 _hash))
198 with open(path, 'r') as fd:
199 names.append(fd.read())
200 msg = ('Insufficient number of users provided. %s have allocated all '
201 'the credentials for this allocation request' % ','.join(names))
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +0100202 raise lib_exc.InvalidCredentials(msg)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400203
Matthew Treinish976e8df2014-12-19 14:21:54 -0500204 def _get_match_hash_list(self, roles=None):
205 hashes = []
206 if roles:
207 # Loop over all the creds for each role in the subdict and generate
208 # a list of cred lists for each role
209 for role in roles:
210 temp_hashes = self.hash_dict['roles'].get(role, None)
211 if not temp_hashes:
Andrea Frittoli (andreaf)848e3482015-10-12 14:17:21 +0100212 raise lib_exc.InvalidCredentials(
Matthew Treinish976e8df2014-12-19 14:21:54 -0500213 "No credentials with role: %s specified in the "
214 "accounts ""file" % role)
215 hashes.append(temp_hashes)
216 # Take the list of lists and do a boolean and between each list to
217 # find the creds which fall under all the specified roles
218 temp_list = set(hashes[0])
219 for hash_list in hashes[1:]:
220 temp_list = temp_list & set(hash_list)
221 hashes = temp_list
222 else:
223 hashes = self.hash_dict['creds'].keys()
224 # NOTE(mtreinish): admin is a special case because of the increased
zhufl0892cb22016-05-06 14:46:00 +0800225 # privilege set which could potentially cause issues on tests where
226 # that is not expected. So unless the admin role isn't specified do
227 # not allocate admin.
Andrea Frittoli (andreaf)29491a72015-10-13 11:24:17 +0100228 admin_hashes = self.hash_dict['roles'].get(self.admin_role,
Matthew Treinish976e8df2014-12-19 14:21:54 -0500229 None)
Andrea Frittoli (andreaf)29491a72015-10-13 11:24:17 +0100230 if ((not roles or self.admin_role not in roles) and
Matthew Treinish976e8df2014-12-19 14:21:54 -0500231 admin_hashes):
232 useable_hashes = [x for x in hashes if x not in admin_hashes]
233 else:
234 useable_hashes = hashes
235 return useable_hashes
236
Matthew Treinishfd683e82015-04-13 20:30:06 -0400237 def _sanitize_creds(self, creds):
238 temp_creds = creds.copy()
239 temp_creds.pop('password')
240 return temp_creds
241
Matthew Treinish976e8df2014-12-19 14:21:54 -0500242 def _get_creds(self, roles=None):
Matthew Treinish976e8df2014-12-19 14:21:54 -0500243 useable_hashes = self._get_match_hash_list(roles)
Andrea Frittoli (andreaf)16d4a9a2016-06-02 17:12:44 +0100244 if len(useable_hashes) == 0:
245 msg = 'No users configured for type/roles %s' % roles
246 raise lib_exc.InvalidCredentials(msg)
Matthew Treinish976e8df2014-12-19 14:21:54 -0500247 free_hash = self._get_free_hash(useable_hashes)
Matthew Treinishfd683e82015-04-13 20:30:06 -0400248 clean_creds = self._sanitize_creds(
249 self.hash_dict['creds'][free_hash])
Jordan Pittier525ec712016-12-07 17:51:26 +0100250 LOG.info('%s allocated creds:\n%s', self.name, clean_creds)
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400251 return self._wrap_creds_with_network(free_hash)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400252
253 @lockutils.synchronized('test_accounts_io', external=True)
Matthew Treinish09f17832014-08-15 15:22:50 -0400254 def remove_hash(self, hash_string):
255 hash_path = os.path.join(self.accounts_dir, hash_string)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400256 if not os.path.isfile(hash_path):
257 LOG.warning('Expected an account lock file %s to remove, but '
Jordan Pittier525ec712016-12-07 17:51:26 +0100258 'one did not exist', hash_path)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400259 else:
260 os.remove(hash_path)
261 if not os.listdir(self.accounts_dir):
262 os.rmdir(self.accounts_dir)
263
264 def get_hash(self, creds):
Matthew Treinish976e8df2014-12-19 14:21:54 -0500265 for _hash in self.hash_dict['creds']:
266 # Comparing on the attributes that are expected in the YAML
Andrea Frittoli (andreaf)f39f9f32015-04-13 20:55:31 +0100267 init_attributes = creds.get_init_attributes()
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +0100268 # Only use the attributes initially used to calculate the hash
269 init_attributes = [x for x in init_attributes if
270 x in self.HASH_CRED_FIELDS]
Andrea Frittoli (andreaf)f39f9f32015-04-13 20:55:31 +0100271 hash_attributes = self.hash_dict['creds'][_hash].copy()
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +0100272 # NOTE(andreaf) Not all fields may be available on all credentials
273 # so defaulting to None for that case.
274 if all([getattr(creds, k, None) == hash_attributes.get(k, None) for
Andrea Frittoli (andreaf)f39f9f32015-04-13 20:55:31 +0100275 k in init_attributes]):
Matthew Treinish09f17832014-08-15 15:22:50 -0400276 return _hash
Matthew Treinishc791ac42014-07-16 09:15:23 -0400277 raise AttributeError('Invalid credentials %s' % creds)
278
279 def remove_credentials(self, creds):
Matthew Treinish09f17832014-08-15 15:22:50 -0400280 _hash = self.get_hash(creds)
Matthew Treinishfd683e82015-04-13 20:30:06 -0400281 clean_creds = self._sanitize_creds(self.hash_dict['creds'][_hash])
Matthew Treinish09f17832014-08-15 15:22:50 -0400282 self.remove_hash(_hash)
Jordan Pittier525ec712016-12-07 17:51:26 +0100283 LOG.info("%s returned allocated creds:\n%s", self.name, clean_creds)
Matthew Treinishc791ac42014-07-16 09:15:23 -0400284
285 def get_primary_creds(self):
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700286 if self._creds.get('primary'):
287 return self._creds.get('primary')
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400288 net_creds = self._get_creds()
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700289 self._creds['primary'] = net_creds
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400290 return net_creds
Matthew Treinishc791ac42014-07-16 09:15:23 -0400291
292 def get_alt_creds(self):
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700293 if self._creds.get('alt'):
294 return self._creds.get('alt')
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400295 net_creds = self._get_creds()
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700296 self._creds['alt'] = net_creds
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400297 return net_creds
Matthew Treinishc791ac42014-07-16 09:15:23 -0400298
Matthew Treinish976e8df2014-12-19 14:21:54 -0500299 def get_creds_by_roles(self, roles, force_new=False):
300 roles = list(set(roles))
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700301 exist_creds = self._creds.get(six.text_type(roles).encode(
Matthew Treinish1c517a22015-04-23 11:39:44 -0400302 'utf-8'), None)
Matthew Treinish976e8df2014-12-19 14:21:54 -0500303 # The force kwarg is used to allocate an additional set of creds with
304 # the same role list. The index used for the previously allocation
Ken'ichi Ohmichiedff8862015-10-13 01:10:53 +0000305 # in the _creds dict will be moved.
Matthew Treinish976e8df2014-12-19 14:21:54 -0500306 if exist_creds and not force_new:
307 return exist_creds
308 elif exist_creds and force_new:
Andrea Frittoli52d3ffa2016-12-13 18:17:45 +0000309 # NOTE(andreaf) In py3.x encode returns bytes, and b'' is bytes
310 # In py2.7 encode returns strings, and b'' is still string
311 new_index = six.text_type(roles).encode('utf-8') + b'-' + \
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700312 six.text_type(len(self._creds)).encode('utf-8')
313 self._creds[new_index] = exist_creds
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400314 net_creds = self._get_creds(roles=roles)
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700315 self._creds[six.text_type(roles).encode('utf-8')] = net_creds
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400316 return net_creds
Matthew Treinish976e8df2014-12-19 14:21:54 -0500317
Andrea Frittoli (andreaf)17209bb2015-05-22 10:16:57 -0700318 def clear_creds(self):
319 for creds in self._creds.values():
Matthew Treinishc791ac42014-07-16 09:15:23 -0400320 self.remove_credentials(creds)
321
322 def get_admin_creds(self):
Andrea Frittoli (andreaf)29491a72015-10-13 11:24:17 +0100323 return self.get_creds_by_roles([self.admin_role])
Matthew Treinish976e8df2014-12-19 14:21:54 -0500324
Matthew Treinish4a596932015-03-06 20:37:01 -0500325 def is_role_available(self, role):
Andrea Frittoli (andreaf)ee5d56b2016-06-08 11:19:09 +0100326 if self.hash_dict['roles'].get(role):
327 return True
328 return False
Matthew Treinish4a596932015-03-06 20:37:01 -0500329
330 def admin_available(self):
Andrea Frittoli (andreaf)29491a72015-10-13 11:24:17 +0100331 return self.is_role_available(self.admin_role)
Andrea Frittolib1c23fc2014-09-03 13:40:08 +0100332
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400333 def _wrap_creds_with_network(self, hash):
334 creds_dict = self.hash_dict['creds'][hash]
Andrea Frittoli (andreaf)c625bcf2015-10-09 12:09:05 +0100335 # Make sure a domain scope if defined for users in case of V3
Sean Dagueed6e5862016-04-04 10:49:13 -0400336 # Make sure a tenant is available in case of V2
Andrea Frittoli (andreaf)c625bcf2015-10-09 12:09:05 +0100337 creds_dict = self._extend_credentials(creds_dict)
338 # This just builds a Credentials object, it does not validate
339 # nor fill with missing fields.
340 credential = auth.get_credentials(
341 auth_url=None, fill_in=False,
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400342 identity_version=self.identity_version, **creds_dict)
343 net_creds = cred_provider.TestResources(credential)
344 net_clients = clients.Manager(credentials=credential)
John Warren9487a182015-09-14 18:12:56 -0400345 compute_network_client = net_clients.compute_networks_client
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400346 net_name = self.hash_dict['networks'].get(hash, None)
Matthew Treinishbe855fd2015-04-16 13:10:49 -0400347 try:
348 network = fixed_network.get_network_from_name(
349 net_name, compute_network_client)
Andrea Frittoli (andreaf)940f8c62015-10-30 16:39:24 +0900350 except exceptions.InvalidTestResource:
Matthew Treinishbe855fd2015-04-16 13:10:49 -0400351 network = {}
Matthew Treinishf83f35c2015-04-10 11:59:11 -0400352 net_creds.set_resources(network=network)
353 return net_creds
354
Andrea Frittoli (andreaf)c625bcf2015-10-09 12:09:05 +0100355 def _extend_credentials(self, creds_dict):
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +0100356 # Add or remove credential domain fields to fit the identity version
357 domain_fields = set(x for x in auth.KeystoneV3Credentials.ATTRIBUTES
358 if 'domain' in x)
359 msg = 'Assuming they are valid in the default domain.'
Andrea Frittoli (andreaf)c625bcf2015-10-09 12:09:05 +0100360 if self.identity_version == 'v3':
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +0100361 if not domain_fields.intersection(set(creds_dict.keys())):
362 msg = 'Using credentials %s for v3 API calls. ' + msg
363 LOG.warning(msg, self._sanitize_creds(creds_dict))
364 creds_dict['domain_name'] = self.credentials_domain
Sean Dagueed6e5862016-04-04 10:49:13 -0400365 if self.identity_version == 'v2':
Andrea Frittoli (andreaf)52deb8b2016-05-18 19:14:22 +0100366 if domain_fields.intersection(set(creds_dict.keys())):
367 msg = 'Using credentials %s for v2 API calls. ' + msg
368 LOG.warning(msg, self._sanitize_creds(creds_dict))
369 # Remove all valid domain attributes
370 for attr in domain_fields.intersection(set(creds_dict.keys())):
371 creds_dict.pop(attr)
Andrea Frittoli (andreaf)c625bcf2015-10-09 12:09:05 +0100372 return creds_dict