Move all clients to the base class

Author: alvarolopez

caso/extract/openstack/base.py

@@ -18,7 +18,11 @@
 
 import datetime
 
+import cinderclient.v3.client
+import glanceclient.client
 import keystoneauth1.exceptions.http
+import neutronclient.v2_0.client
+import novaclient.client
 from oslo_config import cfg
 from oslo_log import log
 
@@ -91,6 +95,27 @@ def _get_keystone_client(self):
         client = keystone_client.get_client(CONF, self.project)
         return client
 
+    def _get_cinder_client(self):
+        """Get Cinder client with keystone session."""
+        session = self._get_keystone_session()
+        return cinderclient.v3.client.Client(session=session)
+
+    def _get_glance_client(self):
+        """Get a glance client with a keystone session."""
+        session = self._get_keystone_session()
+        return glanceclient.client.Client(2, session=session)
+
+    def _get_neutron_client(self):
+        """Get a neutron client with a keystone session."""
+        session = self._get_keystone_session()
+        return neutronclient.v2_0.client.Client(session=session)
+
+    def _get_nova_client(self):
+        """Get a nova client with a keystone session."""
+        region_name = CONF.region_name
+        session = self._get_keystone_session()
+        return novaclient.client.Client(2, session=session, region_name=region_name)
+
     def _get_project_id(self):
         """Get the project ID from the project in the object."""
         return self.keystone.projects.get(self.project).id

caso/extract/openstack/cinder.py

@@ -18,7 +18,6 @@
 
 import operator
 
-import cinderclient.v3.client
 import dateutil.parser
 from oslo_config import cfg
 from oslo_log import log
@@ -43,11 +42,6 @@ def __init__(self, project, vo):
 
         self.cinder = self._get_cinder_client()
 
-    def _get_cinder_client(self):
-        """Get Cinder client with keystone session."""
-        session = self._get_keystone_session()
-        return cinderclient.v3.client.Client(session=session)
-
     def _build_record(self, volume, extract_from, extract_to):
         """Build an individual record."""
         user = self.users[volume.user_id]

caso/extract/openstack/neutron.py

@@ -19,7 +19,6 @@
 import collections
 import ipaddress
 
-import neutronclient.v2_0.client
 from oslo_config import cfg
 from oslo_log import log
 
@@ -44,10 +43,6 @@ def __init__(self, project, vo):
 
         self.neutron = self._get_neutron_client()
 
-    def _get_neutron_client(self):
-        session = self._get_keystone_session()
-        return neutronclient.v2_0.client.Client(session=session)
-
     def _build_ip_record(self, user_id, ip_count, version):
         user = self.users[user_id]
 

caso/extract/openstack/nova.py

@@ -22,9 +22,6 @@
 from dateutil.relativedelta import relativedelta
 from dateutil.rrule import MONTHLY
 from dateutil.rrule import rrule
-import glanceclient.client
-import neutronclient.v2_0.client
-import novaclient.client
 import novaclient.exceptions
 from oslo_config import cfg
 from oslo_log import log
@@ -111,22 +108,6 @@ def __init__(self, project, vo):
         self.flavors = self._get_flavors()
         self.images = self._get_images()
 
-    def _get_nova_client(self):
-        """Get a nova client with a keystone session."""
-        region_name = CONF.region_name
-        session = self._get_keystone_session()
-        return novaclient.client.Client(2, session=session, region_name=region_name)
-
-    def _get_glance_client(self):
-        """Get a glance client with a keystone session."""
-        session = self._get_keystone_session()
-        return glanceclient.client.Client(2, session=session)
-
-    def _get_neutron_client(self):
-        """Get a neutron client with a keystone session."""
-        session = self._get_keystone_session()
-        return neutronclient.v2_0.client.Client(session=session)
-
     def _build_acc_records(self, server, server_record, extract_from, extract_to):
         records = {}
         flavor = self.flavors.get(server.flavor["id"])