From 1a2f0bc92ecb4c6d44904816fc2ca9967b05d12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=BCller?= <j.mueller@vr.rwth-aachen.de>
Date: Thu, 5 Mar 2020 14:28:10 +0100
Subject: [PATCH] Fix error invalid argument handling in
get_multimeter_measurements
---
access_node/controllers/nest_controller.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/access_node/controllers/nest_controller.py b/access_node/controllers/nest_controller.py
index 74de86e..20ff5be 100644
--- a/access_node/controllers/nest_controller.py
+++ b/access_node/controllers/nest_controller.py
@@ -115,18 +115,18 @@ def nest_get_multimeter_measurements(multimeter_id, attribute, _from=None, to=No
if mult['id'] == multimeter_id:
multimeter_exists = True
if attribute not in mult['attributes']:
- return Status(code=400, message="Given multimeter does not measure given attribute")
+ return "Given multimeter does not measure given attribute", 400
mult_gids = mult['gids']
break
if not multimeter_exists:
- return Status(code=400, message="Given multimeter does not exist")
+ return "Given multimeter does not exist", 400
if gids == None:
gids = mult_gids
else:
for gid in gids:
if gid not in mult_gids:
- return Status(code=400, message="Gid "+str(gid)+" is not measured by given Multimeter")
+ return "Gid "+str(gid)+" is not measured by given Multimeter", 400
init = True
sim_times = []
--
GitLab