20 files changed, 23 insertions, 18 deletions
diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py
index 071e1dba..75c1d612 100644
--- a/dashboard/pushtoDB.py
+++ b/dashboard/pushtoDB.py
@@ -7,7 +7,7 @@ TEST_DB = 'http://testresults.opnfv.org/test/api/v1'
 suite_list = [('compute_result.json', 'compute_test_suite'),('network_result.json', 'network_test_suite'),('storage_result.json', 'storage_test_suite')]
 payload_list = { }
 
-def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us-testing-bm-1"):
+def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-pod1"):
 
     url = db_url + "/results"
     creation_date= str(datetime.datetime.utcnow().isoformat())
@@ -15,7 +15,7 @@ def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us
     pod_name = os.environ['NODE_NAME']
 
     params = {"project_name": "qtip", "case_name": case_name,
-              "pod_name": pod_name, "installer": installer, "creation_date": creation_date,
+              "pod_name": pod_name, "installer": installer, "start_date": creation_date,
               "version": "test" , "details": payload}
 
     headers = {'Content-Type': 'application/json'}
diff --git a/data/qtip_creds.sh b/data/qtip_creds.sh
index bf316b4d..6f19305a 100755
--- a/data/qtip_creds.sh
+++ b/data/qtip_creds.sh
@@ -14,7 +14,8 @@ case "$INSTALLER_TYPE" in
         PSWD="r00tme"
         sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root
         sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/root
-        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub"
+        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "grep -q '\-F /dev/null ' /usr/bin/ssh-copy-id || sed -i 's/\(ssh -i.*$\)/\1\n            -F \/dev\/null \\\/g' `which ssh-copy-id`"
+        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/QtipKey root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub"
         ;;
     compass)
         PSWD="root"
diff --git a/func/cli.py b/func/cli.py
index 76e0e19a..129ab96c 100644
--- a/func/cli.py
+++ b/func/cli.py
@@ -93,16 +93,16 @@ class cli():
                     if len(vm_info) != 0:
                         vmObj =''
                         vmObj = SpawnVM(vm_info)
-                    obj.callpingtest()
-                    obj.callsshtest()
-                    obj.updateAnsible()
-                    dvr = Driver()
-                    dvr.drive_bench(benchmark,
-                                    obj.roles_dict.items(),
-                                    self._get_fname(benchmarks[items]),
-                                    benchmark_details,
-                                    obj.ip_pw_dict.items(),
-                                    proxy_info)
+                    if obj.callpingtest():
+                        obj.callsshtest()
+                        obj.updateAnsible()
+                        dvr = Driver()
+                        dvr.drive_bench(benchmark,
+                                       obj.roles_dict.items(),
+                                       self._get_fname(benchmarks[items]),
+                                       benchmark_details,
+                                       obj.ip_pw_dict.items(),
+                                       proxy_info)
                 else:
                     print (benchmarks[items], ' is not a Template in the Directory - \
                                 Enter a Valid file name. or use qtip.py -h for list')
diff --git a/func/env_setup.py b/func/env_setup.py
index 487d7af3..c1e2a003 100644
--- a/func/env_setup.py
+++ b/func/env_setup.py
@@ -13,7 +13,6 @@ from collections import defaultdict
 import yaml
 import time
 import paramiko
-
 class Env_setup():
     roles_ip_list = []  # ROLE and its corresponding IP address list
     ip_pw_list = []  # IP and password, this will be used to ssh
@@ -90,18 +89,23 @@ class Env_setup():
                         print 'Retrying SSH'
 
     def pingtest(self, lister):
-
         pingFlag = 0
+        result = True
         for k, v in lister.iteritems():
             time.sleep(10)
             for val in v:
                 ipvar = val
                 ping_cmd = 'ping -D -c1 {0}'.format(ipvar)
-                while os.system(ping_cmd) != 0:
+                while (os.system(ping_cmd) != 0) &(pingFlag <=20):
                     print '\nWaiting for machine\n'
                     time.sleep(10)
-                pingFlag = 0
-                print ('\n\n %s is UP \n\n ' % ipvar)
+                    pingFlag = pingFlag+1
+                if pingFlag <= 2:
+                    print ('\n\n %s is UP \n\n ' % ipvar)
+                else:
+                    result = False
+        return result 
+              
 
     def GetHostMachineinfo(self, Hosttag):
 
diff --git a/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml b/test_cases/dell-pod1/compute/dhrystone_bm.yaml
index 2f8d0ec9..2f8d0ec9 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml
+++ b/test_cases/dell-pod1/compute/dhrystone_bm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml b/test_cases/dell-pod1/compute/dhrystone_vm.yaml
index 8f5a4165..8f5a4165 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml
+++ b/test_cases/dell-pod1/compute/dhrystone_vm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml b/test_cases/dell-pod1/compute/dpi_bm.yaml
index 45324184..45324184 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml
+++ b/test_cases/dell-pod1/compute/dpi_bm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/dpi_vm.yaml b/test_cases/dell-pod1/compute/dpi_vm.yaml
index 8a157e7a..8a157e7a 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dpi_vm.yaml
+++ b/test_cases/dell-pod1/compute/dpi_vm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml b/test_cases/dell-pod1/compute/ramspeed_bm.yaml
index af220b80..af220b80 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml
+++ b/test_cases/dell-pod1/compute/ramspeed_bm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml b/test_cases/dell-pod1/compute/ramspeed_vm.yaml
index a6a4363f..a6a4363f 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml
+++ b/test_cases/dell-pod1/compute/ramspeed_vm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml b/test_cases/dell-pod1/compute/ssl_bm.yaml
index 6b14c4e6..6b14c4e6 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml
+++ b/test_cases/dell-pod1/compute/ssl_bm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml b/test_cases/dell-pod1/compute/ssl_vm.yaml
index 37824896..37824896 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml
+++ b/test_cases/dell-pod1/compute/ssl_vm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml b/test_cases/dell-pod1/compute/whetstone_bm.yaml
index 128075a1..128075a1 100644
--- a/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml
+++ b/test_cases/dell-pod1/compute/whetstone_bm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml b/test_cases/dell-pod1/compute/whetstone_vm.yaml
index 0f1e8748..0f1e8748 100644
--- a/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml
+++ b/test_cases/dell-pod1/compute/whetstone_vm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml b/test_cases/dell-pod1/network/iperf_bm.yaml
index b2d2a958..b2d2a958 100644
--- a/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml
+++ b/test_cases/dell-pod1/network/iperf_bm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml b/test_cases/dell-pod1/network/iperf_vm.yaml
index d7079e99..d7079e99 100644
--- a/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml
+++ b/test_cases/dell-pod1/network/iperf_vm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml b/test_cases/dell-pod1/network/iperf_vm_2.yaml
index c5b94715..c5b94715 100644
--- a/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml
+++ b/test_cases/dell-pod1/network/iperf_vm_2.yaml
diff --git a/test_cases/dell-us-testing-bm-1/network/netperf.yaml b/test_cases/dell-pod1/network/netperf.yaml
index f4ce396b..f4ce396b 100644
--- a/test_cases/dell-us-testing-bm-1/network/netperf.yaml
+++ b/test_cases/dell-pod1/network/netperf.yaml
diff --git a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml b/test_cases/dell-pod1/storage/fio_bm.yaml
index 755bb730..755bb730 100644
--- a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml
+++ b/test_cases/dell-pod1/storage/fio_bm.yaml
diff --git a/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml b/test_cases/dell-pod1/storage/fio_vm.yaml
index 5ae90d2c..5ae90d2c 100644
--- a/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml
+++ b/test_cases/dell-pod1/storage/fio_vm.yaml