Merge "Do not use shell to execute commands in tempest"

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

diff --git a/functest/energy/energy.py b/functest/energy/energy.py
index ec03e18..2835e05 100644 (file)
--- a/functest/energy/energy.py
+++ b/functest/energy/energy.py
@@ -12,10 +12,10 @@
 
 import json
 import logging
-import urllib
 
 from functools import wraps
 import requests
+from six.moves import urllib
 
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
@@ -26,6 +26,9 @@ def finish_session(current_scenario):
     if current_scenario is None:
         EnergyRecorder.stop()
     else:
+        EnergyRecorder.logger.debug("Restoring previous scenario (%s/%s)",
+                                    current_scenario["scenario"],
+                                    current_scenario["step"])
         EnergyRecorder.submit_scenario(
             current_scenario["scenario"],
             current_scenario["step"]
@@ -77,7 +80,7 @@ class EnergyRecorder(object):
     INITIAL_STEP = "running"
 
     # Default connection timeout
-    CONNECTION_TIMOUT = 1
+    CONNECTION_TIMEOUT = 4
 
     @staticmethod
     def load_config():
@@ -100,18 +103,16 @@ class EnergyRecorder(object):
             assert environment
 
             uri_comp = "/recorders/environment/"
-            uri_comp += urllib.quote_plus(environment)
-            EnergyRecorder.logger.debug(
-                "API recorder at: " + energy_recorder_uri + uri_comp)
+            uri_comp += urllib.parse.quote_plus(environment)
 
             # Creds
-            user = ft_utils.get_functest_config(
+            creds_usr = ft_utils.get_functest_config(
                 "energy_recorder.api_user")
-            password = ft_utils.get_functest_config(
+            creds_pass = ft_utils.get_functest_config(
                 "energy_recorder.api_password")
 
-            if user != "" and password != "":
-                energy_recorder_api_auth = (user, password)
+            if creds_usr != "" and creds_pass != "":
+                energy_recorder_api_auth = (creds_usr, creds_pass)
             else:
                 energy_recorder_api_auth = None
 
@@ -121,11 +122,15 @@ 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")
+                EnergyRecorder.logger.info(
+                    "API recorder available at : %s",
+                    energy_recorder_uri + uri_comp)
+            except Exception as exc:  # pylint: disable=broad-except
+                EnergyRecorder.logger.info(
+                    "Energy recorder API is not available, cause=%s",
+                    str(exc))
                 api_available = False
             # Final config
             EnergyRecorder.energy_recorder_api = {
@@ -149,7 +154,8 @@ class EnergyRecorder(object):
             return_status = True
             # Ensure that connectyvity settings are loaded
             if EnergyRecorder.load_config():
-                EnergyRecorder.logger.debug("Submitting scenario")
+                EnergyRecorder.logger.debug("Submitting scenario (%s/%s)",
+                                            scenario, step)
 
                 # Create API payload
                 payload = {
@@ -164,7 +170,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(
@@ -226,7 +232,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(
@@ -268,7 +274,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(
@@ -301,7 +307,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)