Merge pull request #135 from dariusstefan/python-opensips

Python opensips

opensipscli/args.py

@@ -29,13 +29,15 @@ class OpenSIPSCLIArgs:
     Class that contains the default values of CLI Arguments
     """
     debug = False
+    print = False
     execute = True
     command = []
     config = None
     instance = defaults.DEFAULT_SECTION
     extra_options = {}
 
     __fields__ = ['debug',
+                  'print',
                   'execute',
                   'command',
                   'config',

opensipscli/cli.py

@@ -48,6 +48,7 @@ def __init__(self, options = None):
             options = args.OpenSIPSCLIArgs()
 
         self.debug = options.debug
+        self.print = options.print
         self.execute = options.execute
         self.command = options.command
         self.modules_dir_inserted = None
@@ -89,6 +90,9 @@ def __init__(self, options = None):
         # Opening the current working instance
         self.update_instance(cfg.current_instance)
 
+        if self.print:
+            logger.info(f"Config:\n" + "\n".join([f"{k}: {v}" for k, v in cfg.to_dict().items()]))
+
     def update_logger(self):
         """
         alter logging level

opensipscli/comm.py

@@ -19,36 +19,25 @@
 
 from opensipscli.logger import logger
 from opensipscli.config import cfg
-from opensipscli import communication
+from opensips.mi import OpenSIPSMI, OpenSIPSMIException
 
 comm_handler = None
 comm_handler_valid = None
 
 def initialize():
     global comm_handler
     comm_type = cfg.get('communication_type')
-    comm_func = 'opensipscli.communication.{}'.format(comm_type)
-    try:
-        comm_handler = __import__(comm_func, fromlist=[comm_type])
-    except ImportError as ie:
-        comm_handler = None
-        logger.error("cannot import '{}' handler: {}"
-            .format(comm_type, ie))
+    comm_handler = OpenSIPSMI(comm_type, **cfg.to_dict())
     valid()
 
 def execute(cmd, params=[], silent=False):
     global comm_handler
     try:
         ret = comm_handler.execute(cmd, params)
-    except communication.jsonrpc_helper.JSONRPCError as ex:
+    except OpenSIPSMIException as ex:
         if not silent:
             logger.error("command '{}' returned: {}".format(cmd, ex))
         return None
-    except communication.jsonrpc_helper.JSONRPCException as ex:
-        if not silent:
-            logger.error("communication exception for '{}' returned: {}".format(cmd, ex))
-            logger.error("Is OpenSIPS running?")
-        return None
     return ret
 
 def valid():