Use Block Storage API v3 instead of API v2stable/ussuri

Block Storage API v2 was deprecated during Pike cycle and is being
removed during Xena cycle, and current v3 API should be used instead.
Unused volume_client and network_client in integration test code are
also removed by this change.

Note:
granade tests is made non-voting temporally until the same issue is
fixed in stable/victoria.

Also, changes to use fedora 33 for tests.

Depends-on: https://review.opendev.org/802150/
Change-Id: I6a2b5afa13480791971bbd8bba1f43b9f2db8294
(cherry picked from commit 1828df32fa946d49d8449ff1d8a26c05b3990a65)

Move testing to Fedora 33

Now that the gate is unblocked, we can also test F33 for gating purposes
here.

Change-Id: Ie1c9075623d85b27aaf1ac67a3063e219726bc6f
(cherry picked from commit 6a9c35d89804057b56e1b0b995265ce3eb68129d)

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,