Get properly env vars or their default values

[functest.git] / functest / energy / energy.py

diff --git a/functest/energy/energy.py b/functest/energy/energy.py
index c666040..d5f6871 100644 (file)
--- a/functest/energy/energy.py
+++ b/functest/energy/energy.py
@@ -12,12 +12,14 @@
 
 import json
 import logging
-import os
+import traceback
 
 from functools import wraps
 import requests
 from six.moves import urllib
 
+from functest.utils import env
+
 
 def finish_session(current_scenario):
     """Finish a recording session."""
@@ -92,16 +94,15 @@ class EnergyRecorder(object):
         # Singleton pattern for energy_recorder_api static member
         # Load only if not previouly done
         if EnergyRecorder.energy_recorder_api is None:
-            environment = os.environ['NODE_NAME']
-            assert environment
-
-            # API URL
-            energy_recorder_uri = os.environ["ENERGY_RECORDER_API_URL"]
-            assert energy_recorder_uri
+            assert env.get('NODE_NAME')
+            assert env.get('ENERGY_RECORDER_API_URL')
+            environment = env.get('NODE_NAME')
+            energy_recorder_uri = env.get(
+                'ENERGY_RECORDER_API_URL')
 
             # Creds
-            creds_usr = os.environ.get("ENERGY_RECORDER_API_USER", "")
-            creds_pass = os.environ.get("ENERGY_RECORDER_API_PASSWORD", "")
+            creds_usr = env.get("ENERGY_RECORDER_API_USER")
+            creds_pass = env.get("ENERGY_RECORDER_API_PASSWORD")
 
             uri_comp = "/recorders/environment/"
             uri_comp += urllib.parse.quote_plus(environment)
@@ -179,8 +180,9 @@ class EnergyRecorder(object):
         except Exception:  # pylint: disable=broad-except
             # Default exception handler to ensure that method
             # is safe for caller
-            EnergyRecorder.logger.exception(
-                "Error while submitting scenarion to energy recorder API"
+            EnergyRecorder.logger.info(
+                "Error while submitting scenarion to energy recorder API\n%s",
+                traceback.format_exc()
             )
             return_status = False
         return return_status
@@ -205,8 +207,9 @@ class EnergyRecorder(object):
         except Exception:  # pylint: disable=broad-except
             # Default exception handler to ensure that method
             # is safe for caller
-            EnergyRecorder.logger.exception(
-                "Error while starting energy recorder API"
+            EnergyRecorder.logger.info(
+                "Error while starting energy recorder API\n%s",
+                traceback.format_exc()
             )
             return_status = False
         return return_status
@@ -241,8 +244,9 @@ class EnergyRecorder(object):
         except Exception:  # pylint: disable=broad-except
             # Default exception handler to ensure that method
             # is safe for caller
-            EnergyRecorder.logger.exception(
-                "Error while stoping energy recorder API"
+            EnergyRecorder.logger.info(
+                "Error while stoping energy recorder API\n%s",
+                traceback.format_exc()
             )
             return_status = False
         return return_status
@@ -283,8 +287,9 @@ class EnergyRecorder(object):
         except Exception:  # pylint: disable=broad-except
             # Default exception handler to ensure that method
             # is safe for caller
-            EnergyRecorder.logger.exception(
-                "Error while setting step on energy recorder API"
+            EnergyRecorder.logger.info(
+                "Error while setting step on energy recorder API\n%s",
+                traceback.format_exc()
             )
             return_status = False
         return return_status
@@ -323,8 +328,9 @@ class EnergyRecorder(object):
         except Exception:  # pylint: disable=broad-except
             # Default exception handler to ensure that method
             # is safe for caller
-            EnergyRecorder.logger.exception(
+            EnergyRecorder.logger.info(
                 "Error while getting current scenario from energy recorder API"
+                "\n%s", traceback.format_exc()
             )
             return_value = None
         return return_value