From 5992895eb16f73f65fabe25d535da95395b80bfe Mon Sep 17 00:00:00 2001
From: ghanshyam <ghanshyammann@gmail.com>
Date: Thu, 26 Oct 2017 01:38:45 +0000
Subject: [PATCH] Fix 'tempest cleanup' for volume service client

In below patch, volume service clients alias in cleint.py
has been changed and out under version checks condition.
- I1400a870de483f5cdf125eae2a9be68b46b54343

But tempest cleanup cmd used the alias not present for all
version and get no attribute error if volume v2 or v3 version
is configured.

Change-Id: I1d0d86417ce6d92bfa0ef450ceb70dd480978fe1
Closes-Bug: #1727569
---
 tempest/cmd/cleanup_service.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py
index e61f9061f0..d1e80f1d92 100644
--- a/tempest/cmd/cleanup_service.py
+++ b/tempest/cmd/cleanup_service.py
@@ -141,7 +141,7 @@ class SnapshotService(BaseService):
 
     def __init__(self, manager, **kwargs):
         super(SnapshotService, self).__init__(kwargs)
-        self.client = manager.snapshots_client
+        self.client = manager.snapshots_client_latest
 
     def list(self):
         client = self.client
@@ -319,7 +319,7 @@ class FloatingIpService(BaseService):
 class VolumeService(BaseService):
     def __init__(self, manager, **kwargs):
         super(VolumeService, self).__init__(kwargs)
-        self.client = manager.volumes_client
+        self.client = manager.volumes_client_latest
 
     def list(self):
         client = self.client
@@ -344,7 +344,7 @@ class VolumeService(BaseService):
 class VolumeQuotaService(BaseService):
     def __init__(self, manager, **kwargs):
         super(VolumeQuotaService, self).__init__(kwargs)
-        self.client = manager.volume_quotas_client
+        self.client = manager.volume_quotas_v2_client
 
     def delete(self):
         client = self.client