mgr/dashboard: nvmf apis broken for insecure channel

because when no certificate, it raises an exception which stops the api call
abruptly.

Signed-off-by: Nizamudeen A <[email protected]>

Author: nizamial09

src/pybind/mgr/dashboard/services/nvmeof_conf.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
 import json
+import logging
 
 from orchestrator import OrchestratorError
 
 from .. import mgr
 from ..exceptions import DashboardException
 from ..services.orchestrator import OrchClient
 
+logger = logging.getLogger('nvmeof_conf')
 
 class NvmeofGatewayAlreadyExists(Exception):
     def __init__(self, gateway_name):
@@ -87,12 +89,9 @@ def get_client_key(cls, service_name: str):
 
     @classmethod
     def get_root_ca_cert(cls, service_name: str):
-        try:
-            root_ca_cert = cls.from_cert_store('nvmeof_root_ca_cert', service_name)
-            return root_ca_cert.encode()
-        except DashboardException:
-            # If root_ca_cert is not set, use server_cert as root_ca_cert
-            return cls.get_server_cert(service_name)
+        root_ca_cert = cls.from_cert_store('nvmeof_root_ca_cert', service_name)
+        # If root_ca_cert is not set, use server_cert as root_ca_cert
+        return root_ca_cert.encode() if root_ca_cert else cls.get_server_cert(service_name)
 
     @classmethod
     def get_server_cert(cls, service_name: str):
@@ -108,7 +107,7 @@ def from_cert_store(cls, entity: str, service_name: str, key=False):
                     return orch.cert_store.get_key(entity, service_name)
                 return orch.cert_store.get_cert(entity, service_name)
             return None
-        except OrchestratorError as e:
-            raise DashboardException(
-                msg=f'Failed to get {entity} for {service_name}: {e}',
-            )
+        except OrchestratorError:
+            # just return None if any orchestrator error is raised
+            # otherwise nvmeof api will raise this error and doesn't proceed.
+            return None