summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit HERARD <benoit.herard@orange.com>2017-09-27 14:01:28 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-28 15:18:50 +0200
commit1f64eac0ac58f1616c75a3f85b384b2b8e77b024 (patch)
tree989daadbb0132d81b5edc1ed2a98f3587759e42f
parent4108e6a707b39872be8714d6e54984a93f920413 (diff)
Add log details on SDK first connection.
On first call to energy recording API, if API is unreachable, SDK don't do anything anymore. This change add logs on error for this first connection. Change-Id: I88892c769d6208c6ddf5d714d438ab584826844e Signed-off-by: Benoit HERARD <benoit.herard@orange.com> (cherry picked from commit 405a0872282f5b29bb9e60ba19b11b17c8047647)
-rw-r--r--functest/energy/energy.py19
-rw-r--r--functest/tests/unit/energy/test_functest_energy.py18
2 files changed, 19 insertions, 18 deletions
diff --git a/functest/energy/energy.py b/functest/energy/energy.py
index 508f18e74..2aabc06da 100644
--- a/functest/energy/energy.py
+++ b/functest/energy/energy.py
@@ -78,7 +78,7 @@ class EnergyRecorder(object):
INITIAL_STEP = "running"
# Default connection timeout
- CONNECTION_TIMOUT = urllib3.Timeout(connect=1, read=3)
+ CONNECTION_TIMEOUT = urllib3.Timeout(connect=1, read=3)
@staticmethod
def load_config():
@@ -122,11 +122,12 @@ class EnergyRecorder(object):
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT)
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT)
api_available = json.loads(resp.text)["status"] == "OK"
- except Exception: # pylint: disable=broad-except
- EnergyRecorder.logger.error(
- "Energy recorder API is not available")
+ except Exception as exc: # pylint: disable=broad-except
+ EnergyRecorder.logger.info(
+ "Energy recorder API is not available, cause=%s",
+ exc.message)
api_available = False
# Final config
EnergyRecorder.energy_recorder_api = {
@@ -165,7 +166,7 @@ class EnergyRecorder(object):
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code != 200:
EnergyRecorder.logger.error(
@@ -227,7 +228,7 @@ class EnergyRecorder(object):
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code != 200:
EnergyRecorder.logger.error(
@@ -269,7 +270,7 @@ class EnergyRecorder(object):
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code != 200:
EnergyRecorder.logger.error(
@@ -302,7 +303,7 @@ class EnergyRecorder(object):
response = requests.get(
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code == 200:
return_value = json.loads(response.text)
diff --git a/functest/tests/unit/energy/test_functest_energy.py b/functest/tests/unit/energy/test_functest_energy.py
index 5e2254ad1..738bd3e14 100644
--- a/functest/tests/unit/energy/test_functest_energy.py
+++ b/functest/tests/unit/energy/test_functest_energy.py
@@ -99,7 +99,7 @@ class EnergyRecorderTest(unittest.TestCase):
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
@@ -113,7 +113,7 @@ class EnergyRecorderTest(unittest.TestCase):
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
@@ -127,7 +127,7 @@ class EnergyRecorderTest(unittest.TestCase):
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
@@ -141,7 +141,7 @@ class EnergyRecorderTest(unittest.TestCase):
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
@@ -155,7 +155,7 @@ class EnergyRecorderTest(unittest.TestCase):
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
@@ -169,7 +169,7 @@ class EnergyRecorderTest(unittest.TestCase):
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.delete',
@@ -182,7 +182,7 @@ class EnergyRecorderTest(unittest.TestCase):
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.delete',
@@ -195,7 +195,7 @@ class EnergyRecorderTest(unittest.TestCase):
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.delete',
@@ -208,7 +208,7 @@ class EnergyRecorderTest(unittest.TestCase):
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@energy.enable_recording