diff --git a/py-dashboard/GrafanaRequest.py b/py-dashboard/GrafanaRequest.py index 37cbf3ae..f8ef4b96 100644 --- a/py-dashboard/GrafanaRequest.py +++ b/py-dashboard/GrafanaRequest.py @@ -27,7 +27,7 @@ class GrafanaRequest: self.debug = debug_ self.die_on_error = die_on_error_ self.headers = _headers - self.headers['Authorization'] = 'Bearer '+_api_token + self.headers['Authorization'] = 'Bearer ' + _api_token self.headers['Content-Type'] = 'application/json' self.grafanajson_url = "http://%s:%s" % (_grafanajson_host, _grafanajson_port) self.data = dict() @@ -40,7 +40,7 @@ class GrafanaRequest: pass def list_dashboards(self): - url=self.grafanajson_url + '/api/search?folderIds=0&query=&starred=false' + url = self.grafanajson_url + '/api/search?folderIds=0&query=&starred=false' return requests.get(url).text def create_dashboard(self, @@ -48,7 +48,8 @@ class GrafanaRequest: ): self.grafanajson_url = self.grafanajson_url + "/api/dashboards/db" - data = ('{ "dashboard": { "id": null, "title": "%s" , "tags": [ "templated" ], "timezone": "browser", "schemaVersion": 6, "version": 0 }, "overwrite": false }' % dashboard_name) + data = ( + '{ "dashboard": { "id": null, "title": "%s" , "tags": [ "templated" ], "timezone": "browser", "schemaVersion": 6, "version": 0 }, "overwrite": false }' % dashboard_name) return requests.get(self.grafanajson_url, headers=self.headers, data=data, verify=False) def delete_dashboard(self, @@ -58,3 +59,4 @@ class GrafanaRequest: def create_dashboard_from_data(self, json_file=None): + pass diff --git a/py-json/cv_test_manager.py b/py-json/cv_test_manager.py index 3b9aa028..62378f45 100644 --- a/py-json/cv_test_manager.py +++ b/py-json/cv_test_manager.py @@ -18,7 +18,7 @@ def cv_base_adjust_parser(args): # TODO: In future, can use TestRig once that GUI update has propagated args.set.append(["Test Rig ID:", args.test_rig]) - if args.influx_host != "": + if args.influx_host is not None: if (not args.pull_report): print("Specified influx host without pull_report, will enabled pull_request.") args.pull_report = True @@ -358,7 +358,7 @@ class cv_test(Realm): print("Not submitting to influx, no report-dir.\n") return - if args.influx_host == "": + if args.influx_host is None: # No influx configured, return. print("Not submitting to influx, influx_host not configured.\n") return diff --git a/py-scripts/GrafanaRequest.py b/py-scripts/GrafanaRequest.py deleted file mode 100644 index e69de29b..00000000