Update Xtesting to 0.70

Change-Id: Ib2427112f1ec2e89aa349740c1bb82db1a3622f5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest/ci/logging.debug.ini b/functest/ci/logging.debug.ini
index 51ee359..764a4e2 100644 (file)
--- a/functest/ci/logging.debug.ini
+++ b/functest/ci/logging.debug.ini
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,energy,xutils,sfc,baro,warnings
+keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,xutils,sfc,baro,warnings
 
 [handlers]
 keys=console,wconsole,file,dfile
@@ -61,11 +61,6 @@ level=NOTSET
 handlers=console
 qualname=xtesting.core
 
-[logger_energy]
-level=NOTSET
-handlers=wconsole
-qualname=xtesting.energy
-
 [logger_xutils]
 level=NOTSET
 handlers=wconsole

diff --git a/functest/ci/logging.ini b/functest/ci/logging.ini
index 278529e..e2a4409 100644 (file)
--- a/functest/ci/logging.ini
+++ b/functest/ci/logging.ini
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,energy,xutils,sfc,baro,warnings
+keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,xutils,sfc,baro,warnings
 
 [handlers]
 keys=console,wconsole,file,null
@@ -61,11 +61,6 @@ level=NOTSET
 handlers=console
 qualname=xtesting.core
 
-[logger_energy]
-level=NOTSET
-handlers=wconsole
-qualname=xtesting.energy
-
 [logger_xutils]
 level=NOTSET
 handlers=wconsole

diff --git a/functest/utils/env.py b/functest/utils/env.py
index 5814020..c5869e4 100644 (file)
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -29,9 +29,6 @@ INPUTS = {
     'NODE_NAME': env.INPUTS['NODE_NAME'],
     'POD_ARCH': None,
     'TEST_DB_URL': env.INPUTS['TEST_DB_URL'],
-    'ENERGY_RECORDER_API_URL': env.INPUTS['ENERGY_RECORDER_API_URL'],
-    'ENERGY_RECORDER_API_USER': env.INPUTS['ENERGY_RECORDER_API_USER'],
-    'ENERGY_RECORDER_API_PASSWORD': env.INPUTS['ENERGY_RECORDER_API_PASSWORD'],
     'VOLUME_DEVICE_NAME': 'vdb',
     'IMAGE_PROPERTIES': '',
     'FLAVOR_EXTRA_SPECS': '',

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 00c0984..9ee41a7 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -15,6 +15,6 @@ robotframework-httplibrary===0.4.2
 robotframework-requests===0.5.0
 robotframework-sshlibrary===3.3.0
 ansible===2.3.2.0
-xtesting===0.62.0
+xtesting===0.70.0
 bandit===1.1.0
 ruamel.yaml.jinja2==0.2.2