bug fix: wrong POD name used in result dispatchers

Change-Id: I04a300b3478dd075208f9c904dcb281d74089344
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
(cherry picked from commit 84a5fd5cea31dd957fb1d0283144306e20d8e97b)

diff --git a/ci/prepare_env.sh b/ci/prepare_env.sh
index c00c079..a51938c 100755 (executable)
--- a/ci/prepare_env.sh
+++ b/ci/prepare_env.sh
@@ -13,7 +13,7 @@
 : ${INSTALLER_TYPE:='fuel'}
 : ${INSTALLER_IP:='10.20.0.2'}
 
-: ${POD_NAME:='opnfv-jump-2'}
+: ${NODE_NAME:='opnfv-jump-2'}
 : ${EXTERNAL_NETWORK:='net04_ext'}
 
 # Extract network name from EXTERNAL_NETWORK
@@ -32,4 +32,4 @@ if [ ! -f $OPENRC ]; then
 fi
 source $OPENRC
 
-export EXTERNAL_NETWORK INSTALLER_TYPE POD_NAME
+export EXTERNAL_NETWORK INSTALLER_TYPE NODE_NAME

diff --git a/yardstick/dispatcher/http.py b/yardstick/dispatcher/http.py
index 90238ad..f84ad09 100644 (file)
--- a/yardstick/dispatcher/http.py
+++ b/yardstick/dispatcher/http.py
@@ -49,7 +49,7 @@ class HttpDispatcher(DispatchBase):
         self.result = {
             "project_name": "yardstick",
             "description": "yardstick test cases result",
-            "pod_name": os.environ.get('POD_NAME', 'unknown'),
+            "pod_name": os.environ.get('NODE_NAME', 'unknown'),
             "installer": os.environ.get('INSTALLER_TYPE', 'unknown'),
             "version": os.environ.get('YARDSTICK_VERSION', 'unknown')
         }

diff --git a/yardstick/dispatcher/influxdb.py b/yardstick/dispatcher/influxdb.py
index f61912d..efa5669 100644 (file)
--- a/yardstick/dispatcher/influxdb.py
+++ b/yardstick/dispatcher/influxdb.py
@@ -65,7 +65,7 @@ class InfluxdbDispatcher(DispatchBase):
         self.task_id = -1
         self.runners_info = {}
         self.static_tags = {
-            "pod_name": os.environ.get('POD_NAME', 'unknown'),
+            "pod_name": os.environ.get('NODE_NAME', 'unknown'),
             "installer": os.environ.get('INSTALLER_TYPE', 'unknown'),
             "version": os.environ.get('YARDSTICK_VERSION', 'unknown')
         }