X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Fdashboard%2Fdashboard%2Fconf%2Fconfig.py;h=48fed8894cc0d3e70c5eb40d707b391b47e3620a;hb=f9a4eeb385d42c60af5b68624da8ad2a46fbad3c;hp=2e0f1cabb32d7afc12f35e1f8f8022bbe237a6db;hpb=1b3487ca931821ef762ad103a32118dc99a6fb71;p=releng.git diff --git a/utils/test/dashboard/dashboard/conf/config.py b/utils/test/dashboard/dashboard/conf/config.py index 2e0f1cabb..48fed8894 100644 --- a/utils/test/dashboard/dashboard/conf/config.py +++ b/utils/test/dashboard/dashboard/conf/config.py @@ -23,11 +23,9 @@ class APIConfig: def __init__(self): self._default_config_location = "../etc/config.ini" - self.elastic_url = 'http://localhost:9200' - self.elastic_creds = None - self.destination = 'elasticsearch' + self.es_url = 'http://localhost:9200' + self.es_creds = None self.kibana_url = None - self.is_js = True self.js_path = None def _get_str_parameter(self, section, param): @@ -65,11 +63,9 @@ class APIConfig: raise ParseError("%s not found" % config_location) # Linking attributes to keys from file with their sections - obj.elastic_url = obj._get_str_parameter("elastic", "url") - obj.elastic_creds = obj._get_str_parameter("elastic", "creds") - obj.destination = obj._get_str_parameter("output", "destination") + obj.es_url = obj._get_str_parameter("elastic", "url") + obj.es_creds = obj._get_str_parameter("elastic", "creds") obj.kibana_url = obj._get_str_parameter("kibana", "url") - obj.is_js = obj._get_bool_parameter("kibana", "js") obj.js_path = obj._get_str_parameter("kibana", "js_path") return obj @@ -77,12 +73,8 @@ class APIConfig: def __str__(self): return "elastic_url = %s \n" \ "elastic_creds = %s \n" \ - "destination = %s \n" \ "kibana_url = %s \n" \ - "is_js = %s \n" \ - "js_path = %s \n" % (self.elastic_url, - self.elastic_creds, - self.destination, - self.kibana_url, - self.is_js, - self.js_path) + "js_path = %s \n" % (self.es_url, + self.es_creds, + self.kibana_url, + self.js_path)