refs #53118: return add envvar of the service

server/app/routes.py

@@ -338,6 +338,7 @@ def list_services():
         if current_configuration is None or configurations is None:
             abort(make_response(jsonify(message="service configuration %s unknown" % service), 404))
 
+        json_config = json.loads(json.loads(configurations)[current_configuration][1])
         pool_entities = config.get_entities(json.loads(json.loads(configurations)[current_configuration][1]))
 
         if not showall and flask.g.user.entity.entity_code not in pool_entities:
@@ -357,10 +358,20 @@ def list_services():
                 if len(pids) == 0:
                     busy = "yes"
                     pid = "**NO WORKER**"
+
+                default_cfg = config.get_default_storage(redis_db)
+                env_vars = default_cfg["docker"].get("envvar")
+                if not env_vars:
+                    env_vars = {}
+
+                env_vars.update(config.get_envvar(json_config))
+                # remove tech var
+                env_vars.pop('specific', None)
+                env_vars.pop('CORPUS_DIR', None)
                 res[service] = {'name': name, 'pid': pid,
                                 'usage': usage, 'queued': queued,
                                 'capacity': capacity, 'busy': busy,
-                                'detail': detail}
+                                'detail': detail, "envvar":env_vars}
     return flask.jsonify(res)
 
 

server/nmtwizard/configuration.py

@@ -3,6 +3,7 @@
 import logging
 import importlib
 import six
+from jsonpath_ng import parse
 
 logger = logging.getLogger(__name__)
 CONFIG_DEFAULT = "CONF_DEFAULT"
@@ -62,6 +63,15 @@ def get_docker(config, entity):
         return config["docker"]
 
 
+def get_envvar(json_cfg):
+    if is_polyentity_config(json_cfg):
+        var = parse('entities.*.docker.envvar').find(json_cfg)
+    else:
+        var = parse('docker.envvar').find(json_cfg)
+
+    return var[0].value if var else {}
+
+
 def get_entities_limit_rate(redis, service):
     service_config = _get_config_from_redis(redis, service)
     entities = service_config.get("entities")

server/requirements.txt

@@ -2,6 +2,7 @@ boto3
 enum34
 flask
 ovh
+jsonpath-ng
 paramiko
 redis>=3.0.0
 flask_ini