fixing CR comments

Signed-off-by: Leonid Chernin <[email protected]>

control/cephutils.py

@@ -22,49 +22,54 @@ def __init__(self, config):
         self.logger = GatewayLogger(config).logger
         self.ceph_conf = config.get_with_default("ceph", "config_file", "/etc/ceph/ceph.conf")
         self.rados_id = config.get_with_default("ceph", "id", "")
-        self.integer_list = []
+        self.anagroup_list = []
         self.last_sent = time.time()
 
+    def execute_ceph_monitor_command(self, cmd):
+         with rados.Rados(conffile=self.ceph_conf, rados_id=self.rados_id) as cluster:
+            rply = cluster.mon_command(cmd, b'')
+            return rply
+
     def get_number_created_gateways(self, pool, group):
         now = time.time()
-        if (now - self.last_sent) < 10 and self.integer_list :
-             self.logger.info(f" Caching responce of the monitor: {self.integer_list} ")
-             return self.integer_list
+        if (now - self.last_sent) < 10 and self.anagroup_list :
+             self.logger.info(f" Caching response of the monitor: {self.anagroup_list} ")
+             return self.anagroup_list
         else :
             try:
-                self.integer_list = []
+                self.anagroup_list = []
                 self.last_sent = now
-                with rados.Rados(conffile=self.ceph_conf, rados_id=self.rados_id) as cluster:
-                    str = '{"prefix":"nvme-gw show", "pool":'
-                    str += '"'+pool+'"' + ', "group":' + '"'+group+'"' + "}"
-                    self.logger.info(f"nvme-show string: {str} ")
-                    rply = cluster.mon_command(str, b'')
-                    self.logger.info(f"reply \"{rply}\"")
-                    conv_str = rply[1].decode()
-                    pos = conv_str.find("[")
-                    if pos!= -1:
-                        new_str = conv_str[pos+ len("[") :]
-                        pos     = new_str.find("]")
-                        new_str = new_str[: pos].strip()
-                        int_str = new_str.split(' ')
-                        self.logger.info(f"new_str : {new_str}")
-                        for x in int_str:
-                            self.integer_list.append(int(x))
-                        self.logger.info(self.integer_list)
-                    else:
-                        self.logger.info("Gws not found")
-                    return self.integer_list
+                str = '{' + f'"prefix":"nvme-gw show", "pool":"{pool}", "group":"{group}"' + '}'
+                self.logger.info(f"nvme-show string: {str} ")
+                rply = self.execute_ceph_monitor_command(str)
+                self.logger.info(f"reply \"{rply}\"")
+                conv_str = rply[1].decode()
+                pos = conv_str.find("[")
+                if pos!= -1:
+                    new_str = conv_str[pos+ len("[") :]
+                    pos     = new_str.find("]")
+                    new_str = new_str[: pos].strip()
+                    int_str_list = new_str.split(' ')
+                    self.logger.info(f"new_str : {new_str}")
+                    for x in int_str_list:
+                        self.anagroup_list.append(int(x))
+                    self.logger.info(self.anagroup_list)
+                else:
+                    self.logger.info("Gws not found")
+
             except Exception:
                 self.logger.exception(f"Failure get number created gateways:")
+                self.anagroup_list = []
                 pass
 
+            return self.anagroup_list
+
     def fetch_and_display_ceph_version(self):
         try:
-            with rados.Rados(conffile=self.ceph_conf, rados_id=self.rados_id) as cluster:
-                rply = cluster.mon_command('{"prefix":"mon versions"}', b'')
-                ceph_ver = rply[1].decode().removeprefix("{").strip().split(":")[0].removeprefix('"').removesuffix('"')
-                ceph_ver = ceph_ver.removeprefix("ceph version ")
-                self.logger.info(f"Connected to Ceph with version \"{ceph_ver}\"")
+            rply = self.execute_ceph_monitor_command('{"prefix":"mon versions"}')
+            ceph_ver = rply[1].decode().removeprefix("{").strip().split(":")[0].removeprefix('"').removesuffix('"')
+            ceph_ver = ceph_ver.removeprefix("ceph version ")
+            self.logger.info(f"Connected to Ceph with version \"{ceph_ver}\"")
         except Exception:
             self.logger.exception(f"Failure fetching Ceph version:")
             pass
@@ -125,4 +130,4 @@ def create_image(self, pool_name, image_name, size) -> bool:
         if rc_ex != None:
             raise rc_ex
 
-        return rc
+        return rc

control/grpc.py

@@ -169,8 +169,8 @@ def __init__(self, config: GatewayConfig, gateway_state: GatewayStateHandler, om
         self.bdev_params  = {}
         self.subsystem_nsid_bdev = defaultdict(dict)
         self.subsystem_nsid_anagrp = defaultdict(dict)
-        self.gateway_group = self.config.get("gateway", "group")
-        self.gateway_pool =  self.config.get("ceph", "pool")
+        self.gateway_group = self.config.get_with_default("gateway", "group", "")
+        self.gateway_pool =  self.config.get_with_default("ceph", "pool", "")
         self._init_cluster_context()
         self.subsys_ha = {}
         self.subsys_max_ns = {}