diff options
Diffstat (limited to 'heat_integrationtests/common/clients.py')
| -rw-r--r-- | heat_integrationtests/common/clients.py | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/heat_integrationtests/common/clients.py b/heat_integrationtests/common/clients.py index d2cc92977..c70b81682 100644 --- a/heat_integrationtests/common/clients.py +++ b/heat_integrationtests/common/clients.py @@ -12,12 +12,10 @@ import os -from cinderclient import client as cinder_client from heat.common.i18n import _ from heatclient import client as heat_client from keystoneauth1.identity.generic import password from keystoneauth1 import session -from neutronclient.v2_0 import client as neutron_client from novaclient import client as nova_client from swiftclient import client as swift_client @@ -60,7 +58,6 @@ class ClientManager(object): calling various OpenStack APIs. """ - CINDERCLIENT_VERSION = '2' HEATCLIENT_VERSION = '1' NOVA_API_VERSION = '2.1' @@ -81,8 +78,6 @@ class ClientManager(object): self.identity_client = self._get_identity_client() self.orchestration_client = self._get_orchestration_client() self.compute_client = self._get_compute_client() - self.network_client = self._get_network_client() - self.volume_client = self._get_volume_client() self.object_client = self._get_object_client() def _username(self): @@ -154,22 +149,6 @@ class ClientManager(object): os_cache=False, http_log_debug=True) - def _get_network_client(self): - - return neutron_client.Client( - session=self.identity_client.session, - service_type='network', - region_name=self.conf.region, - endpoint_type='publicURL') - - def _get_volume_client(self): - return cinder_client.Client( - self.CINDERCLIENT_VERSION, - session=self.identity_client.session, - endpoint_type='publicURL', - region_name=self.conf.region, - http_log_debug=True) - def _get_object_client(self): args = { 'auth_version': self.auth_version, |