summaryrefslogtreecommitdiffstats
path: root/ogcli
diff options
context:
space:
mode:
authorAlejandro Sirgo Rica <asirgo@soleta.eu>2024-11-06 13:19:26 +0100
committerAlejandro Sirgo Rica <asirgo@soleta.eu>2024-11-11 09:14:27 +0100
commita219bc7ff729516aea7ddea8516b50d96e7d9363 (patch)
treecad91b8861fe8b6b31cdfac8e87444ed93e0607a /ogcli
parent3d0aff3d1d47a053a678ecbec69d585cf1bbb275 (diff)
ogcli: move configuration data into a different file
Move the configuration into its own file so it is easier to access from multiple files.
Diffstat (limited to 'ogcli')
-rwxr-xr-xogcli18
1 files changed, 1 insertions, 17 deletions
diff --git a/ogcli b/ogcli
index f4b55d5..8ed9903 100755
--- a/ogcli
+++ b/ogcli
@@ -15,8 +15,6 @@ import argparse
import json
import sys
-OG_CLI_CFG_PATH = "/opt/opengnsys/etc/ogcli.json"
-
def sigint_handler(signum, frame):
print("User has pressed ctrl-C, interrupting...")
sys.exit(1)
@@ -25,22 +23,8 @@ class CLI():
def __init__(self):
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
signal.signal(signal.SIGINT, sigint_handler)
- try:
- with open(OG_CLI_CFG_PATH, 'r') as json_file:
- self.cfg = json.load(json_file)
- except json.JSONDecodeError:
- sys.exit(f'ERROR: Failed parse malformed JSON file '
- f'{OG_CLI_CFG_PATH}')
- except:
- sys.exit(f'ERROR: cannot open {OG_CLI_CFG_PATH}')
-
- required_cfg_params = {'api_token', 'ip', 'port'}
- difference_cfg_params = required_cfg_params - self.cfg.keys()
- if len(difference_cfg_params) > 0:
- sys.exit(f'Missing {difference_cfg_params} key in '
- f'json config file')
- self.ogcli = OgCLI(self.cfg)
+ self.ogcli = OgCLI()
parser = argparse.ArgumentParser(prog='ogcli')
parser.add_argument('command', help='Subcommand to run', nargs='?',