openstack
/
heat
Code Issues Proposed changes

Merge "Use keystone v3 and session for swiftclient"

This commit is contained in:
Jenkins 2017-02-18 09:41:32 +00:00 committed by Gerrit Code Review
parent 7e6ba07a6a 3188ea0f17
commit 11a1b54e9d
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
heat_integrationtests/common/clients.py
View File

@ -149,51 +149,39 @@ class ClientManager(object):
return KeystoneWrapperClient(auth, verify_cert) return KeystoneWrapperClient(auth, verify_cert)
def _get_compute_client(self): def _get_compute_client(self):
region = self.conf.region
# Create our default Nova client to use in testing # Create our default Nova client to use in testing
return nova_client.Client( return nova_client.Client(
self.NOVA_API_VERSION, self.NOVA_API_VERSION,
session=self.identity_client.session, session=self.identity_client.session,
service_type='compute', service_type='compute',
endpoint_type='publicURL', endpoint_type='publicURL',
region_name=region, region_name=self.conf.region,
os_cache=False, os_cache=False,
insecure=self.insecure,
cacert=self.ca_file,
http_log_debug=True) http_log_debug=True)
def _get_network_client(self): def _get_network_client(self):
return neutron_client.Client( return neutron_client.Client(
session=self.identity_client.session, session=self.identity_client.session,
endpoint_type='publicURL', service_type='network',
insecure=self.insecure, region_name=self.conf.region,
ca_cert=self.ca_file) endpoint_type='publicURL')
def _get_volume_client(self): def _get_volume_client(self):
region = self.conf.region
endpoint_type = 'publicURL'
return cinder_client.Client( return cinder_client.Client(
self.CINDERCLIENT_VERSION, self.CINDERCLIENT_VERSION,
session=self.identity_client.session, session=self.identity_client.session,
region_name=region, endpoint_type='publicURL',
endpoint_type=endpoint_type, region_name=self.conf.region,
insecure=self.insecure,
cacert=self.ca_file,
http_log_debug=True) http_log_debug=True)
def _get_object_client(self): def _get_object_client(self):
# swiftclient does not support keystone sessions yet
args = { args = {
'auth_version': self.auth_version, 'auth_version': self.auth_version,
'tenant_name': self._tenant_name(), 'session': self.identity_client.session,
'user': self._username(), 'os_options': {'endpoint_type': 'publicURL',
'key': self.conf.password, 'region_name': self.conf.region,
'authurl': self.conf.auth_url, 'service_type': 'object-store'},
'os_options': {'endpoint_type': 'publicURL'},
'insecure': self.insecure,
'cacert': self.ca_file,
} }
return swift_client.Connection(**args) return swift_client.Connection(**args)
@ -206,8 +194,6 @@ class ClientManager(object):
else: else:
args = { args = {
'session': self.identity_client.session, 'session': self.identity_client.session,
'insecure': self.insecure,
'cacert': self.ca_file,
'region_name': self.conf.region, 'region_name': self.conf.region,
'endpoint_type': 'publicURL', 'endpoint_type': 'publicURL',
'service_type': 'metering', 'service_type': 'metering',