34 files changed, 85 insertions, 32 deletions
diff --git a/data/QtipKey b/config/QtipKey
index 3f520775..3f520775 100644
--- a/data/QtipKey
+++ b/config/QtipKey
diff --git a/data/QtipKey.pub b/config/QtipKey.pub
index 7a40f91c..7a40f91c 100644
--- a/data/QtipKey.pub
+++ b/config/QtipKey.pub
diff --git a/heat/SampleHeat.yaml b/config/SampleHeat.yaml
index ae9f5667..ae9f5667 100644
--- a/heat/SampleHeat.yaml
+++ b/config/SampleHeat.yaml
diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh
index d766d46c..62f97c88 100755
--- a/docker/run_qtip.sh
+++ b/docker/run_qtip.sh
@@ -3,21 +3,21 @@ run_test_suite()
 {
     if [ "$TEST_CASE" == "compute" ]; then
         cd ${QTIP_DIR}  && python qtip.py -l default -f compute
-        cd ${QTIP_DIR} && python data/ref_results/suite_result.py compute
+        cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py compute
     elif [ "$TEST_CASE" == "storage" ]; then
         cd ${QTIP_DIR}  && python qtip.py -l default -f storage
-        cd ${QTIP_DIR} && python data/ref_results/suite_result.py storage
+        cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py storage
     elif [ "$TEST_CASE" == "network" ]; then
         cd ${QTIP_DIR}  && python qtip.py -l default -f network
-        cd ${QTIP_DIR} && python data/ref_results/suite_result.py network
+        cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py network
     elif [ "$TEST_CASE" == "all" ]; then
         cd ${QTIP_DIR}  && python qtip.py -l default -f compute
         cd ${QTIP_DIR}  && python qtip.py -l default -f storage
         cd ${QTIP_DIR}  && python qtip.py -l default -f network
 
-        cd ${QTIP_DIR} && python data/ref_results/suite_result.py compute
-        cd ${QTIP_DIR} && python data/ref_results/suite_result.py storage
-        cd ${QTIP_DIR} && python data/ref_results/suite_result.py network
+        cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py compute
+        cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py storage
+        cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py network
     fi
 }
 
diff --git a/func/driver.py b/func/driver.py
index bcda0ce1..9a011c2a 100644
--- a/func/driver.py
+++ b/func/driver.py
@@ -64,9 +64,9 @@ class Driver:
     def run_ansible_playbook(self, benchmark, extra_vars):
         logger.info(extra_vars)
         ansible_api = AnsibleApi()
-        ansible_api.execute_playbook('./data/hosts',
+        ansible_api.execute_playbook('./config/hosts',
                                      './benchmarks/playbooks/{0}.yaml'.format(benchmark),
-                                     './data/QtipKey', extra_vars)
+                                     './config/QtipKey', extra_vars)
         return self.get_ansible_result(extra_vars['role'], ansible_api.get_detail_playbook_stats())
 
     def drive_bench(self, installer_type, pwd, benchmark, roles, benchmark_fname,
diff --git a/func/env_setup.py b/func/env_setup.py
index ca83f040..9e21a5b6 100644
--- a/func/env_setup.py
+++ b/func/env_setup.py
@@ -46,7 +46,7 @@ class Env_setup:
 
     @staticmethod
     def write_to_file(role):
-        f_name_2 = open('./data/hosts', 'w')
+        f_name_2 = open('./config/hosts', 'w')
         print role.items()
         for k in role:
             f_name_2.write('[' + k + ']\n')
@@ -58,29 +58,29 @@ class Env_setup:
     @staticmethod
     def ssh_test(hosts):
         for ip, pw in hosts:
-            print '\nBeginning SSH Test: %s \n' % ip
-            os.system('ssh-keyscan %s >> ~/.ssh/known_hosts' % ip)
+            logger.info('Beginning SSH Test: %s \n' % ip)
+            os.system('ssh-keyscan %s >> /root/.ssh/known_hosts' % ip)
             time.sleep(2)
 
-            ssh_cmd = './data/qtip_creds.sh %s' % ip
-            print "run command: %s " % ssh_cmd
+            ssh_cmd = './scripts/qtip_creds.sh %s' % ip
+            logger.info("run command: %s " % ssh_cmd)
             os.system(ssh_cmd)
 
             ssh = paramiko.SSHClient()
             ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-            ssh.connect(ip, key_filename='./data/QtipKey')
+            ssh.connect(ip, key_filename='./config/QtipKey')
 
             for attempts in range(100):
                 try:
                     stdin, stdout, stderr = ssh.exec_command('uname')
                     if not stderr.readlines():
-                        print('SSH successful')
+                        logger.info('SSH successful')
                         break
                 except socket.error:
-                    print 'SSH is still unavailable, retry!'
+                    logger.error('SSH is still unavailable, retry!')
                     time.sleep(2)
                     if attempts == 99:
-                        print "Try 99 times, SSH failed: %s" % ip
+                        logger.error("Try 99 times, SSH failed: %s" % ip)
 
     @staticmethod
     def ping_test(lister, attempts=30):
@@ -109,7 +109,7 @@ class Env_setup:
         if not installer_ip:
             raise RuntimeError("undefine environment variable INSTALLER_IP")
 
-        cmd = "bash ./data/fetch_compute_ips.sh -i %s -a %s" % \
+        cmd = "bash ./scripts/fetch_compute_ips.sh -i %s -a %s" % \
             (installer_type, installer_ip)
         logger.info(cmd)
         os.system(cmd)
diff --git a/func/spawn_vm.py b/func/spawn_vm.py
index c45af00e..3a16e02d 100644
--- a/func/spawn_vm.py
+++ b/func/spawn_vm.py
@@ -65,15 +65,15 @@ class SpawnVM(Env_setup):
     def heat_template_vm(self, vm_params, installer):
         Heat_Dic = {}
         try:
-            with open('./heat/SampleHeat.yaml', 'r+') as H_temp:
+            with open('./config/SampleHeat.yaml', 'r+') as H_temp:
                 Heat_Dic = yaml.safe_load(H_temp)
         except yaml.YAMLError as exc:
             if hasattr(exc, 'problem_mark'):
                 mark = exc.problem_mark
-                print 'Error in qtip/heat/SampleHeat.yaml at: (%s,%s)' % (mark.line + 1, mark.column + 1)
+                print 'Error in qtip/config/SampleHeat.yaml at: (%s,%s)' % (mark.line + 1, mark.column + 1)
                 print 'EXITING PROGRAM. Correct File and restart'
                 sys.exit(1)
-        fopen = open('./data/QtipKey.pub', 'r')
+        fopen = open('./config/QtipKey.pub', 'r')
         fopenstr = fopen.read()
         fopenstr = fopenstr.rstrip()
         scriptcmd = '#!/bin/bash \n echo {0} >>  foo.txt \n echo {1} >> /root/.ssh/authorized_keys'.format(
@@ -243,7 +243,7 @@ class SpawnVM(Env_setup):
                 if i['output_key'] == 'KeyPair_PublicKey':
                     sshkey = str(i['output_value'])
 
-        with open('./data/my_key.pem', 'w') as fopen:
+        with open('./config/my_key.pem', 'w') as fopen:
             fopen.write(sshkey)
         fopen.close()
         print Env_setup.ip_pw_list
diff --git a/data/fetch_compute_ips.sh b/scripts/fetch_compute_ips.sh
index ebe817a6..ebe817a6 100755
--- a/data/fetch_compute_ips.sh
+++ b/scripts/fetch_compute_ips.sh
diff --git a/data/fetch_os_creds.sh b/scripts/fetch_os_creds.sh
index 3b493e14..3b493e14 100755
--- a/data/fetch_os_creds.sh
+++ b/scripts/fetch_os_creds.sh
diff --git a/data/file_permission.sh b/scripts/file_permission.sh
index 01a77d50..01a77d50 100755
--- a/data/file_permission.sh
+++ b/scripts/file_permission.sh
diff --git a/get_env_info.sh b/scripts/get_env_info.sh
index 2fb0d22b..4b362fac 100755
--- a/get_env_info.sh
+++ b/scripts/get_env_info.sh
@@ -34,4 +34,4 @@ if [ $INSTALLER_TYPE == "apex" ]
 fi
 
 
-./data/fetch_os_creds.sh -d ./opnfv-creds.sh
+./scripts/fetch_os_creds.sh -d ./opnfv-creds.sh
diff --git a/data/qtip_creds.sh b/scripts/qtip_creds.sh
index beb4659f..beb4659f 100755
--- a/data/qtip_creds.sh
+++ b/scripts/qtip_creds.sh
diff --git a/data/__init__.py b/scripts/ref_results/__init__.py
index e69de29b..e69de29b 100644
--- a/data/__init__.py
+++ b/scripts/ref_results/__init__.py
diff --git a/data/ref_results/compute_benchmarks_indices.py b/scripts/ref_results/compute_benchmarks_indices.py
index 9012cefc..9012cefc 100644
--- a/data/ref_results/compute_benchmarks_indices.py
+++ b/scripts/ref_results/compute_benchmarks_indices.py
diff --git a/data/ref_results/generator_ref_json.py b/scripts/ref_results/generator_ref_json.py
index 6b2d813c..6b2d813c 100644
--- a/data/ref_results/generator_ref_json.py
+++ b/scripts/ref_results/generator_ref_json.py
diff --git a/data/ref_results/index_calculation.py b/scripts/ref_results/index_calculation.py
index 5ca4a46e..5ca4a46e 100644
--- a/data/ref_results/index_calculation.py
+++ b/scripts/ref_results/index_calculation.py
diff --git a/data/ref_results/network_benchmarks_indices.py b/scripts/ref_results/network_benchmarks_indices.py
index c19d18eb..c19d18eb 100644
--- a/data/ref_results/network_benchmarks_indices.py
+++ b/scripts/ref_results/network_benchmarks_indices.py
diff --git a/data/ref_results/reference.json b/scripts/ref_results/reference.json
index cfcbfc3b..cfcbfc3b 100644
--- a/data/ref_results/reference.json
+++ b/scripts/ref_results/reference.json
diff --git a/data/ref_results/result_accum.py b/scripts/ref_results/result_accum.py
index 6cd55886..6cd55886 100644
--- a/data/ref_results/result_accum.py
+++ b/scripts/ref_results/result_accum.py
diff --git a/data/ref_results/storage_benchmarks_indices.py b/scripts/ref_results/storage_benchmarks_indices.py
index a5aef638..a5aef638 100644
--- a/data/ref_results/storage_benchmarks_indices.py
+++ b/scripts/ref_results/storage_benchmarks_indices.py
diff --git a/data/ref_results/suite_result.py b/scripts/ref_results/suite_result.py
index d0b4647f..d0b4647f 100644
--- a/data/ref_results/suite_result.py
+++ b/scripts/ref_results/suite_result.py
diff --git a/data/ssh_exch.exp b/scripts/ssh_exch.exp
index c52140b7..c52140b7 100644
--- a/data/ssh_exch.exp
+++ b/scripts/ssh_exch.exp
diff --git a/setup.py b/setup.py
index 52874dd3..85dc966b 100644
--- a/setup.py
+++ b/setup.py
@@ -7,4 +7,4 @@ setup(name='qtip',
       py_modules=['qtip'],
       version='1.0',
       author='opnfv',
-      packages=['func', 'data.ref_results', 'data.report'])
+      packages=['func', 'scripts.ref_results', 'utils.report'])
diff --git a/supporting/servers/roles/elk/handlers/main.yml b/supporting/servers/roles/elk/handlers/main.yml
index 35585363..46bd76c7 100644
--- a/supporting/servers/roles/elk/handlers/main.yml
+++ b/supporting/servers/roles/elk/handlers/main.yml
@@ -1,4 +1,8 @@
 ---
+- name: starting docker service
+  become: true
+  service: name=docker state=started
+
 - name: restart nginx
   become: true
   service: name=nginx state=restarted
diff --git a/supporting/servers/roles/elk/tasks/main.yml b/supporting/servers/roles/elk/tasks/main.yml
index 8673b3d2..7628f378 100644
--- a/supporting/servers/roles/elk/tasks/main.yml
+++ b/supporting/servers/roles/elk/tasks/main.yml
@@ -1,4 +1,53 @@
 ---
+- name: adding keys
+  become: true
+  apt_key: keyserver=hkp://p80.pool.sks-keyservers.net id=0X58118E89F3A912897C070ADBF76221572C52609D
+
+- name: adding entry for ubuntu
+  become: true
+  apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-xenial main' state=present filename='docker'
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "16.04"
+
+- name: installing from docker repo
+  become: true
+  shell: apt-cache policy docker-engine
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_version== "16.04"
+
+- name: adding entry for ubuntu
+  become: true
+  apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-trusty main' state=present filename='docker'
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04"
+
+- name: updating
+  become: true
+  apt: update_cache=yes
+
+- name: installing docker engine
+  become: true
+  apt: name=docker-engine
+
+- name: pulling elasticsearch and kibana
+  become: true
+  docker_image: name={{ item }} state=present
+  with_items:
+    - elasticsearch
+    - kibana
+
+- name: setting up elasticsearch
+  become: true
+  docker_container:
+    name: esearch
+    image: elasticsearch
+    published_ports: 9200:9200
+
+- name: setting up kibana
+  become: true
+  docker_container:
+    name: kibana
+    image: kibana
+    published_ports: 5601:5601
+    links: esearch:elasticsearch
+
 - name: nginx is installed
   become: true
   package: name=nginx state=present
diff --git a/tests/ansible_api_test.py b/tests/ansible_api_test.py
index e9f0a77d..613d5f7e 100644
--- a/tests/ansible_api_test.py
+++ b/tests/ansible_api_test.py
@@ -14,6 +14,6 @@ class TestClass:
         ansible_api = AnsibleApi()
         ret = ansible_api.execute_playbook('tests/data/hosts',
                                            'tests/data/test.yml',
-                                           'data/QtipKey',
+                                           'config/QtipKey',
                                            {'keys': 'test'})
         assert ret == 3
diff --git a/tests/cli_test.py b/tests/cli_test.py
index 12d0abb0..43a11089 100644
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -11,7 +11,7 @@ class TestClass:
           '-f',
           'compute'], "You have specified a lab that is not present in test_cases"),
         (['-l',
-          'zte-pod1',
+          'default',
           '-f',
           'test'], "Test File Does not exist in test_list")
     ])
@@ -26,10 +26,10 @@ class TestClass:
 
     @pytest.mark.parametrize("test_input, expected", [
         (['-l',
-          'zte-pod1',
+          'default',
           '-f',
-          'storage'], [('fuel', '/home', './test_cases/zte-pod1/storage/fio_bm.yaml'),
-                       ('fuel', '/home', './test_cases/zte-pod1/storage/fio_vm.yaml')])
+          'storage'], [('fuel', '/home', './test_cases/default/storage/fio_bm.yaml'),
+                       ('fuel', '/home', './test_cases/default/storage/fio_vm.yaml')])
     ])
     @mock.patch('func.cli.args_handler.prepare_and_run_benchmark')
     def test_cli_successful(self, mock_args_handler, test_input, expected):
diff --git a/tests/env_setup_test.py b/tests/env_setup_test.py
index cc3c6b60..a0bbf640 100644
--- a/tests/env_setup_test.py
+++ b/tests/env_setup_test.py
@@ -64,7 +64,7 @@ class TestClass:
         test_class.fetch_compute_ips = mock_ips
         test_class.parse("tests/test_case/bm_without_proxy.yaml")
         test_class.update_ansible()
-        result = filecmp.cmp('tests/output/hosts', 'data/hosts')
+        result = filecmp.cmp('tests/output/hosts', 'config/hosts')
         assert result
 
     def test_ping(self, capfd):
diff --git a/tests/qtip_server_test.py b/tests/qtip_server_test.py
index 9def21f8..81bb302b 100644
--- a/tests/qtip_server_test.py
+++ b/tests/qtip_server_test.py
@@ -46,7 +46,7 @@ class TestClass:
           'result': 0}),
         ({'installer_type': 'fuel',
           'installer_ip': '10.20.0.2',
-          'pod_name': 'zte-pod1',
+          'pod_name': 'default',
           'max_minutes': 20,
           'suite_name': 'compute',
           'type': 'VM',
@@ -56,7 +56,7 @@ class TestClass:
          {'job_id': '',
           'installer_type': 'fuel',
           'installer_ip': '10.20.0.2',
-          'pod_name': 'zte-pod1',
+          'pod_name': 'default',
           'suite_name': 'compute',
           'max_minutes': 20,
           'type': 'VM',
diff --git a/data/report/Qtip_Report.py b/utils/report/Qtip_Report.py
index cd20d57c..cd20d57c 100644
--- a/data/report/Qtip_Report.py
+++ b/utils/report/Qtip_Report.py
diff --git a/data/ref_results/__init__.py b/utils/report/__init__.py
index e69de29b..e69de29b 100644
--- a/data/ref_results/__init__.py
+++ b/utils/report/__init__.py
diff --git a/data/report/get_indices.py b/utils/report/get_indices.py
index 91219c0b..91219c0b 100644
--- a/data/report/get_indices.py
+++ b/utils/report/get_indices.py
diff --git a/data/report/get_results.py b/utils/report/get_results.py
index 23fd5383..23fd5383 100644
--- a/data/report/get_results.py
+++ b/utils/report/get_results.py
diff --git a/data/report/qtip_graph.py b/utils/report/qtip_graph.py
index acbda40c..acbda40c 100644
--- a/data/report/qtip_graph.py
+++ b/utils/report/qtip_graph.py