diff --git a/src/cucchiaiata/config.py b/src/cucchiaiata/config.py index ec0445c..5d68877 100644 --- a/src/cucchiaiata/config.py +++ b/src/cucchiaiata/config.py @@ -36,10 +36,4 @@ version: {version}""" self.allow_insecure_https = config.get('allow_insecure_https', False) -TO_JSON = {'session.server.get': ['content'], - 'session.servermodel.get': ['content'], - 'server.describe': ['configuration'], - 'server.exec.describe': ['return']} - - config = Config() diff --git a/src/cucchiaiata/parser.py b/src/cucchiaiata/parser.py index 325de84..3ba4156 100644 --- a/src/cucchiaiata/parser.py +++ b/src/cucchiaiata/parser.py @@ -5,7 +5,6 @@ from json import loads from tiramisu_cmdline_parser import TiramisuCmdlineParser from argparse import RawDescriptionHelpFormatter -from .config import TO_JSON from .common import Common, send_data @@ -29,27 +28,12 @@ class Parser(Common): parser.parse_args() def get(self): - def _to_json(res): - for key, value in res.items(): - if key in TO_JSON[message]: - res[key] = loads(value) - # get current message message = self.remote_config.option('message').value.get() payload = self.get_payload(message) # send message - result = send_data(message, - payload) - - # convert some results (file) to json - if message in TO_JSON: - if isinstance(result, list): - for res in result: - _to_json(res) - else: - _to_json(result) - - return result + return send_data(message, + payload) def get_payload(self, message: str):