From 79fb58efedc20edd5a49a64d9db7a09381dabf20 Mon Sep 17 00:00:00 2001
From: Nikolay Stanchev <ns17@it-innovation.soton.ac.uk>
Date: Fri, 22 Jun 2018 09:36:41 +0100
Subject: [PATCH] Updated the aggregator's configuration validation
---
src/service/clmcservice/aggregationapi/utilities.py | 5 +++++
src/service/clmcservice/configapi/__init__.py | 1 +
src/service/clmcservice/whoamiapi/__init__.py | 1 +
3 files changed, 7 insertions(+)
diff --git a/src/service/clmcservice/aggregationapi/utilities.py b/src/service/clmcservice/aggregationapi/utilities.py
index 14fd1b4..4a54b29 100644
--- a/src/service/clmcservice/aggregationapi/utilities.py
+++ b/src/service/clmcservice/aggregationapi/utilities.py
@@ -154,6 +154,11 @@ def validate_conf_file(conf_file_path):
if key not in conf[AGGREGATOR_CONFIG_SECTION]:
return None # the configuration must include each configuration attribute
+ try:
+ int(conf[AGGREGATOR_CONFIG_SECTION]['aggregator_report_period'])
+ except ValueError:
+ return None # the configuration must contain a valid integer for the aggregator's report period
+
return conf
diff --git a/src/service/clmcservice/configapi/__init__.py b/src/service/clmcservice/configapi/__init__.py
index e69de29..81bb249 100644
--- a/src/service/clmcservice/configapi/__init__.py
+++ b/src/service/clmcservice/configapi/__init__.py
@@ -0,0 +1 @@
+__all__ = ['views']
diff --git a/src/service/clmcservice/whoamiapi/__init__.py b/src/service/clmcservice/whoamiapi/__init__.py
index e69de29..81bb249 100644
--- a/src/service/clmcservice/whoamiapi/__init__.py
+++ b/src/service/clmcservice/whoamiapi/__init__.py
@@ -0,0 +1 @@
+__all__ = ['views']
--
GitLab