python2/3 compatibilty for spdk/util using oslo.log

replacing print with log.info Change-Id: I127484e0c27f7d82e51351b5cbde58198c9eef9f
openstack · Sep 11, 2018 · 715f039 · 715f039
1 parent 08588d0
commit 715f039
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/cyborg/accelerator/drivers/spdk/util/pyspdk/nvmf_client.py b/cyborg/accelerator/drivers/spdk/util/pyspdk/nvmf_client.py
@@ -1,5 +1,9 @@
 import json
 
+from oslo_log import log as logging
+
+LOG = logging.getLogger(__name__)
+
 
 class NvmfTgt(object):
 
@@ -20,28 +24,28 @@ def get_bdevs(self):
     def delete_bdev(self, name):
         sub_args = [name]
         res = self.py.exec_rpc('delete_bdev', '10.0.2.15', sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def kill_instance(self, sig_name):
         sub_args = [sig_name]
         res = self.py.exec_rpc('kill_instance', '10.0.2.15', sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def construct_aio_bdev(self, filename, name, block_size):
         sub_args = [filename, name, str(block_size)]
         res = self.py.exec_rpc(
             'construct_aio_bdev',
             '10.0.2.15',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def construct_error_bdev(self, basename):
         sub_args = [basename]
         res = self.py.exec_rpc(
             'construct_error_bdev',
             '10.0.2.15',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def construct_nvme_bdev(
             self,
@@ -84,15 +88,15 @@ def construct_malloc_bdev(self, total_size, block_size):
             'construct_malloc_bdev',
             '10.0.2.15',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def delete_nvmf_subsystem(self, nqn):
         sub_args = [nqn]
         res = self.py.exec_rpc(
             'delete_nvmf_subsystem',
             '10.0.2.15',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def construct_nvmf_subsystem(
             self,
@@ -106,7 +110,7 @@ def construct_nvmf_subsystem(
             'construct_nvmf_subsystem',
             '10.0.2.15',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def get_nvmf_subsystems(self):
         subsystems = self._get_json_objs(

diff --git a/cyborg/accelerator/drivers/spdk/util/pyspdk/py_spdk.py b/cyborg/accelerator/drivers/spdk/util/pyspdk/py_spdk.py
@@ -3,6 +3,10 @@
 import os
 import subprocess
 
+from oslo_log import log as logging
+
+LOG = logging.getLogger(__name__)
+
 
 class PySPDK(object):
 
@@ -16,7 +20,7 @@ def start_server(self, spdk_dir, server_name):
             self.init_hugepages(spdk_dir)
             server_dir = os.path.join(spdk_dir, 'app/')
             file_dir = self._search_file(server_dir, server_name)
-            print file_dir
+            LOG.info(file_dir)
             os.chdir(file_dir)
             p = subprocess.Popen(
                 'sudo ./%s' % server_name,
@@ -28,7 +32,7 @@ def start_server(self, spdk_dir, server_name):
     def init_hugepages(self, spdk_dir):
         huge_dir = os.path.join(spdk_dir, 'scripts/')
         file_dir = self._search_file(huge_dir, 'setup.sh')
-        print file_dir
+        LOG.info(file_dir)
         os.chdir(file_dir)
         p = subprocess.Popen(
             'sudo ./setup.sh',
@@ -52,8 +56,8 @@ def _get_process_id(self):
                     self.pid = pinfo.get('pid')
                     return self.pid
             except psutil.NoSuchProcess:
-                print "NoSuchProcess:%s" % self.pname
-        print "NoSuchProcess:%s" % self.pname
+                LOG.info("NoSuchProcess:%s" % self.pname)
+        LOG.info("NoSuchProcess:%s" % self.pname)
         return self.pid
 
     def is_alive(self):

diff --git a/cyborg/accelerator/drivers/spdk/util/pyspdk/vhost_client.py b/cyborg/accelerator/drivers/spdk/util/pyspdk/vhost_client.py
@@ -1,5 +1,9 @@
 import json
 
+from oslo_log import log as logging
+
+LOG = logging.getLogger(__name__)
+
 
 class VhostTgt(object):
 
@@ -49,28 +53,28 @@ def get_bdevs(self):
     def delete_bdev(self, name):
         sub_args = [name]
         res = self.py.exec_rpc('delete_bdev', '127.0.0.1', sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def kill_instance(self, sig_name):
         sub_args = [sig_name]
         res = self.py.exec_rpc('kill_instance', '127.0.0.1', sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def construct_aio_bdev(self, filename, name, block_size):
         sub_args = [filename, name, str(block_size)]
         res = self.py.exec_rpc(
             'construct_aio_bdev',
             '127.0.0.1',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def construct_error_bdev(self, basename):
         sub_args = [basename]
         res = self.py.exec_rpc(
             'construct_error_bdev',
             '127.0.0.1',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def construct_nvme_bdev(
             self,
@@ -113,7 +117,7 @@ def construct_malloc_bdev(self, total_size, block_size):
             'construct_malloc_bdev',
             '10.0.2.15',
             sub_args=sub_args)
-        print res
+        LOG.info(res)
 
     def _get_json_objs(self, method, server_ip):
         res = self.py.exec_rpc(method, server_ip)