Bugfix: update test case base on node parameters in ci

JIRA: YARDSTICK-1082

Change-Id: I00080d0317a54b73a6cd571198e9446962c11b5a
Signed-off-by: rexlee8776 <limingjiang@huawei.com>

44 files changed, 125 insertions, 125 deletions

diff --git a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
index 00dccab95..4fd76596f 100644
--- a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-bar-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-bar-ha_daily.yaml
index 35bc0ebd8..d49b11343 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-bar-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-bar-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node4.LF","target": "node5.LF"}'
+        "host": "node4","target": "node5"}'
 -
     file_name: opnfv_yardstick_tc019.yaml
     constraint:
@@ -113,7 +113,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC055"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
     constraint:
@@ -121,7 +121,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC063"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc069.yaml
 -
@@ -147,7 +147,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node1.LF"}'
+        "host": "node1"}'
 -
     file_name: opnfv_yardstick_tc027.yaml
     constraint:
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-bar-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-bar-noha_daily.yaml
index 26e92e704..362c7316c 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-bar-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-bar-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml
index 1be7d13af..854adf11b 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml
index 42bc651b2..b5a30487d 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml
index eb8d0f307..ea0853cb1 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
index 625fa6ea0..ef47b9f72 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
@@ -40,7 +40,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -48,7 +48,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -64,4 +64,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
index 3a3ed3779..2def5c2a6 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
@@ -40,7 +40,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -48,7 +48,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml
index ef09f3c8b..ee25c1287 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml
@@ -40,7 +40,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -48,7 +48,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -64,4 +64,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml
index a800c5649..8603c1438 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml
@@ -40,7 +40,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -48,7 +48,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
index 9de6ab2bb..a249a81e2 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
@@ -41,7 +41,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -49,7 +49,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -65,4 +65,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
index eed5da44d..40fec9fe3 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
@@ -41,7 +41,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -49,7 +49,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -65,4 +65,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
index 2807d799e..fa3c7898b 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
@@ -55,7 +55,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node4.LF","target": "node5.LF"}'
+        "host": "node4","target": "node5"}'
 -
     file_name: opnfv_yardstick_tc055.yaml
     constraint:
@@ -63,7 +63,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC055"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
     constraint:
@@ -71,7 +71,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC063"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc073.yaml
     constraint:
@@ -86,7 +86,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node1.LF"}'
+        "host": "node1"}'
 
 # Feature test cases
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml
index 6700db406..6a6a53b2a 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-openbaton-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-openbaton-ha_daily.yaml
index d1b4cce1a..5dccf015b 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-openbaton-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-openbaton-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
index 9418e42f4..0375abcc6 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node4.LF","target": "node5.LF"}'
+        "host": "node4","target": "node5"}'
 -
     file_name: opnfv_yardstick_tc045.yaml
     constraint:
@@ -97,7 +97,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC055"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
     constraint:
@@ -105,7 +105,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC063"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc069.yaml
 -
@@ -121,7 +121,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node1.LF"}'
+        "host": "node1"}'
 -
     file_name: opnfv_yardstick_tc027.yaml
     constraint:
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml
index 3a540f27a..13eda5bc6 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml
index abc336041..969e47aa2 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-ha_daily.yaml
index 10772e0cc..822191504 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-noha_daily.yaml
index 9b2be3710..e0f6dec7b 100644
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml
index 3f2fe18a3..1b10a4e31 100644
--- a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml
index fcc7a9bb2..dba42cc48 100644
--- a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl-nofeature-ha_daily.yaml
index 1ab16e5d1..13cc710f3 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl-nofeature-ha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -61,4 +61,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl-nofeature-noha_daily.yaml
index 825555d39..42a170a89 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl-nofeature-noha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-odl-ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl-ovs-ha_daily.yaml
index b5e53b94c..ce36ca0bf 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl-ovs-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl-ovs-ha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -61,4 +61,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl-sfc-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl-sfc-ha_daily.yaml
index b464bfeae..6c3f22f57 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl-sfc-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl-sfc-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl-sfc-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl-sfc-noha_daily.yaml
index ba870417d..08027373f 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl-sfc-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl-sfc-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
index 43aae7101..78f461d82 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
@@ -21,7 +21,7 @@ test_cases:
       pod: ericsson-pod2
   task_args:
       ericsson-pod2: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
-      "host": "node1.LF","target": "node2.LF"}'
+      "host": "node1","target": "node2"}'
 -
   file_name: opnfv_yardstick_tc002.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
index 372012928..820db3771 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
@@ -21,7 +21,7 @@ test_cases:
       pod: ericsson-pod2
   task_args:
       ericsson-pod2: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
-      "host": "node1.LF","target": "node2.LF"}'
+      "host": "node1","target": "node2"}'
 -
   file_name: opnfv_yardstick_tc002.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml
index 16c04de37..03a533872 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-noha_daily.yaml
index cff147720..1dcdeae8e 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml
index b8b8c4695..78883c9da 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -61,4 +61,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml
index cd352cc1b..163c21716 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -61,4 +61,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml
index 1dde1cb25..86e84916d 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml
index 8d7098160..4101fa970 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml
index a503db99e..d7e7bbb87 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -61,4 +61,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml
index e83aaec9d..6b29394ce 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml
index 4165c5464..c347a80b9 100644
--- a/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml
@@ -37,7 +37,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -45,7 +45,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -61,4 +61,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml
index ed8894ce1..536341b0f 100644
--- a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml
index 94390d525..119297563 100644
--- a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml
index 18e27d6d6..3ad6122dd 100644
--- a/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml
index d56be6152..b86599f72 100644
--- a/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
diff --git a/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml
index 567642eda..dbbda6872 100644
--- a/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml
@@ -35,7 +35,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC055"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
   constraint:
@@ -43,7 +43,7 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node5.yardstick-TC063"}'
+      "host": "node5"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
 -
@@ -59,4 +59,4 @@ test_cases:
       pod: huawei-pod1
   task_args:
       huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-      "host": "node1.LF"}'
+      "host": "node1"}'
diff --git a/tests/opnfv/test_suites/opnfv_performance.yaml b/tests/opnfv/test_suites/opnfv_performance.yaml
index 948d0633e..10bc6071c 100644
--- a/tests/opnfv/test_suites/opnfv_performance.yaml
+++ b/tests/opnfv/test_suites/opnfv_performance.yaml
@@ -35,7 +35,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node4.LF","target": "node5.LF"}'
+        "host": "node4","target": "node5"}'
 -
     file_name: opnfv_yardstick_tc055.yaml
     constraint:
@@ -43,7 +43,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC055"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
     constraint:
@@ -51,7 +51,7 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC063"}'
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc069.yaml
 -
@@ -67,4 +67,4 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node1.LF"}'
+        "host": "node1"}'