aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--benchmarks/perftest/dhrystone.yaml25
-rw-r--r--benchmarks/perftest/dpi.yaml26
-rw-r--r--benchmarks/perftest/fio.yaml29
-rw-r--r--benchmarks/perftest/iperf.yaml25
-rw-r--r--benchmarks/perftest/ramspeed.yaml24
-rw-r--r--benchmarks/perftest/ssl.yaml30
-rw-r--r--benchmarks/perftest/whetstone.yaml30
-rw-r--r--config/QtipKey27
-rw-r--r--config/QtipKey.pub1
-rw-r--r--docker/Dockerfile12
-rw-r--r--docker/README.md11
-rwxr-xr-xdocker/run_qtip.sh9
-rw-r--r--docker/supervisord.conf13
-rw-r--r--docs/configguide/configuration.rst60
-rw-r--r--docs/userguide/annex.rst2
-rw-r--r--docs/userguide/introduction.rst72
-rw-r--r--func/args_handler.py18
-rw-r--r--func/cli.py28
-rw-r--r--func/env_setup.py6
-rw-r--r--qtip.py2
-rw-r--r--restful_server/qtip_server.py8
-rw-r--r--scripts/cleanup_creds.sh14
-rwxr-xr-xscripts/file_permission.sh3
-rw-r--r--supporting/servers/roles/ssh/defaults/main.yml1
-rw-r--r--supporting/servers/roles/ssh/files/zhifeng.authorized_keys1
-rw-r--r--test_list/compute16
-rw-r--r--test_list/network9
-rw-r--r--test_list/storage8
-rw-r--r--tests/cli_test.py2
29 files changed, 262 insertions, 250 deletions
diff --git a/benchmarks/perftest/dhrystone.yaml b/benchmarks/perftest/dhrystone.yaml
index 5f83bbb0..7899bbd7 100644
--- a/benchmarks/perftest/dhrystone.yaml
+++ b/benchmarks/perftest/dhrystone.yaml
@@ -19,29 +19,29 @@
register: home_dir
- name: cleaning tempT
- shell: sudo rm -rf $HOME/tempT
+ file: path=$HOME/tempT state=absent
- name: cleaning qtip_result
- shell: sudo rm -rf $HOME/qtip_result
+ file: path=$HOME/qtip_result state=absent
- name: make directory
- shell: sudo mkdir $HOME/qtip_result
+ file: path=$HOME/qtip_result state=directory
- - include: ../common/sys_proxy_pbook.yaml
+ - include: ./common/sys_proxy_pbook.yaml
- - include: ../common/sys_info_pbook.yaml
+ - include: ./common/sys_info_pbook.yaml
vars:
network: false
- name: Installing UnixBench dependencies if CentOS
- shell: sudo yum install git gcc patch perl-Time-HiRes -y
+ shell: yum install git gcc patch perl-Time-HiRes -y
when: ansible_os_family == "RedHat"
- name: Installing UnixBench dependencies if Ubuntu
- shell: sudo apt-get install git gcc patch perl -y
+ shell: apt-get install git gcc patch perl -y
when: ansible_os_family == "Debian"
- - include: ../common/git_proxy_pbook.yaml
+ - include: ./common/git_proxy_pbook.yaml
- name: Clone unixbench
git: repo=https://github.com/kdlucas/byte-unixbench.git
@@ -88,11 +88,10 @@
with_items: "{{copy_log_results.stdout_lines}}"
- name: cleaning tempT
- shell: sudo rm -rf $HOME/tempT
+ file: path=$HOME/tempT state=absent
- name: cleaning_qtip_result
- shell: sudo rm -rf $HOME/qtip_result
-
+ file: path=$HOME/qtip_result state=absent
- hosts: localhost
connection: local
@@ -103,10 +102,10 @@
shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/)
- name: making_logs_folder
- shell: mkdir -p {{workingdir}}/{{Dest_dir}}/dhrystone/logs
+ file: path={{workingdir}}/{{Dest_dir}}/dhrystone/logs state=directory
- name: extracting_log
shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/logs)
- name: removing dhrystone_temp
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp
+ file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
diff --git a/benchmarks/perftest/dpi.yaml b/benchmarks/perftest/dpi.yaml
index 59d01d58..5ce5d09b 100644
--- a/benchmarks/perftest/dpi.yaml
+++ b/benchmarks/perftest/dpi.yaml
@@ -22,17 +22,17 @@
register: home_dir
- name: cleaning
- shell: sudo rm -rf $HOME/tempD
+ file: path=$HOME/tempD state=absent
- name: cleaning previous results
- shell: sudo rm -rf $HOME/qtip_result
+ file: path=$HOME/qtip_result state=absent
- name: make qtip_result
- shell: sudo mkdir $HOME/qtip_result
+ file: path=$HOME/qtip_result state=directory
- - include: ../common/sys_proxy_pbook.yaml
+ - include: ./common/sys_proxy_pbook.yaml
- - include: ../common/sys_info_pbook.yaml
+ - include: ./common/sys_info_pbook.yaml
vars:
network: false
@@ -45,9 +45,9 @@
when: ansible_os_family == "Debian"
- name: making nDPI temporary directory
- shell: sudo mkdir $HOME/tempD
+ file: path=$HOME/tempD state=directory
- - include: ../common/git_proxy_pbook.yaml
+ - include: ./common/git_proxy_pbook.yaml
- name: Clone nDPI
git: repo=https://github.com/ntop/nDPI.git
@@ -66,7 +66,7 @@
shell: cd $HOME/tempD/nDPI/example && wget http://build.opnfv.org/artifacts.opnfv.org/qtip/utilities/test.pcap
- name: fetch Averaging script
- copy: src=../etc/dpi_average.sh dest={{home_dir.stdout}}/tempD/nDPI/example mode=777
+ copy: src=./etc/dpi_average.sh dest={{home_dir.stdout}}/tempD/nDPI/example mode=777
- name: Run nDPI benchmark
shell: cd $HOME/tempD/nDPI/example && sudo ./dpi_average.sh
@@ -102,6 +102,12 @@
fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp
with_items: "{{copy_log_results.stdout_lines}}"
+ - name: cleaning tempD
+ file: path=$HOME/tempD state=absent
+
+ - name: cleaning_qtip_result
+ file: path=$HOME/qtip_result state=absent
+
- hosts: localhost
connection: local
gather_facts: no
@@ -111,10 +117,10 @@
shell: ( find {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/)
- name: making_logs_folder
- shell: mkdir -p {{workingdir}}/{{Dest_dir}}/dpi/logs
+ file: path={{workingdir}}/{{Dest_dir}}/dpi/logs state=directory
- name: extracting_log
shell: ( find {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/logs)
- name: removing dpi_temp
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp
+ file: path={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp state=absent
diff --git a/benchmarks/perftest/fio.yaml b/benchmarks/perftest/fio.yaml
index bd29c127..94a4c80d 100644
--- a/benchmarks/perftest/fio.yaml
+++ b/benchmarks/perftest/fio.yaml
@@ -19,21 +19,21 @@
shell: echo $HOME
register: home_dir
- - name: cleaning
- shell: sudo rm -rf $HOME/fio
+ - name: cleaning fio directory
+ file: path=$HOME/fio state=absent
- name: cleaning previous results
- shell: sudo rm -rf $HOME/qtip_result
+ file: path=$HOME/qtip_result state=absent
- name: making fio temporary directory
- shell: sudo mkdir $HOME/fio
+ file: path=$HOME/fio state=directory
- name: making results temporary directory
- shell: sudo mkdir $HOME/qtip_result
+ file: path=$HOME/qtip_result state=directory
- - include: ../common/sys_proxy_pbook.yaml
+ - include: ./common/sys_proxy_pbook.yaml
- - include: ../common/sys_info_pbook.yaml
+ - include: ./common/sys_info_pbook.yaml
vars:
network: false
@@ -47,13 +47,15 @@
- name: Fetching fio
shell: cd $HOME/fio/ && wget http://freecode.com/urls/3aa21b8c106cab742bf1f20d60629e3f -O fio.tar.gz
+
- name: Untar fio
shell: cd $HOME/fio/ && sudo tar -zxvf fio.tar.gz
+
- name: configure
shell: cd $HOME/fio/fio-2.1.10 && sudo ./configure && sudo make
- name: Fetching fio job
- copy: src=../etc/fio_test_job dest={{home_dir.stdout}}/fio/fio-2.1.10/
+ copy: src=./etc/fio_test_job dest={{home_dir.stdout}}/fio/fio-2.1.10/
- name: Benchmarking block storage through fio
shell: cd $HOME/fio/fio-2.1.10 && sudo ./fio --output-format=json --output=$HOME/qtip_result/fio_result.json fio_test_job
@@ -86,6 +88,12 @@
fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp
with_items: "{{copy_log_results.stdout_lines}}"
+ - name: cleaning fio
+ file: path=$HOME/fio state=absent
+
+ - name: cleaning_qtip_result
+ file: path=$HOME/qtip_result
+
- hosts: localhost
connection: local
gather_facts: no
@@ -95,11 +103,10 @@
shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/)
- name: making_logs_folder
- shell: mkdir -p {{workingdir}}/{{Dest_dir}}/fio/logs
+ file: path={{workingdir}}/{{Dest_dir}}/fio/logs state=directory
- name: extracting_log
shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/logs)
- name: removing fio_log
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/fio/fio_temp
-
+ file: {{workingdir}}/{{Dest_dir}}/fio/fio_temp state=absent
diff --git a/benchmarks/perftest/iperf.yaml b/benchmarks/perftest/iperf.yaml
index af5b836a..481a2e3e 100644
--- a/benchmarks/perftest/iperf.yaml
+++ b/benchmarks/perftest/iperf.yaml
@@ -39,21 +39,21 @@
shell: echo $HOME
register: home_dir
- - name: cleaning
- shell: sudo rm -rf $HOME/iperf
+ - name: cleaning iperf directory
+ file: path=$HOME/iperf state=absent
- name: cleaning previous results
- shell: sudo rm -rf $HOME/qtip_result
+ file: path=$HOME/qtip_result state=absent
- name: making Iperf temporary directory
- shell: sudo mkdir $HOME/iperf
+ file: path=$HOME/iperf state=directory
- name: making results temporary directory
- shell: sudo mkdir $HOME/qtip_result
+ file: path=$HOME/qtip_result state=directory
- - include: ../common/sys_proxy_pbook.yaml
+ - include: ./common/sys_proxy_pbook.yaml
- - include: ../common/sys_info_pbook.yaml
+ - include: ./common/sys_info_pbook.yaml
vars:
network: true
@@ -131,6 +131,11 @@
with_items: "{{copy_log_results.stdout_lines}}"
when: rolename =="2-host" and "{{ip2}}" == ''
+ - name: cleaning iperf directory
+ file: path=$HOME/iperf state=absent
+
+ - name: cleaning previous results
+ file: path=$HOME/qtip_result state=absent
- hosts: localhost
connection: local
@@ -147,15 +152,15 @@
when: rolename == "2-host"
- name: making_logs_folder
- shell: mkdir -p {{workingdir}}/{{Dest_dir}}/iperf/logs
+ file: path={{workingdir}}/{{Dest_dir}}/iperf/logs state=directory
- name: extracting_log
shell: ( find {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/iperf/logs)
when: rolename == "2-host"
- name: removing iperf_raw file
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json
+ file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json state=absent
when: rolename == "2-host"
- name: removing iperf_temp
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
+ file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp state=absent
diff --git a/benchmarks/perftest/ramspeed.yaml b/benchmarks/perftest/ramspeed.yaml
index f62c6056..fb624c85 100644
--- a/benchmarks/perftest/ramspeed.yaml
+++ b/benchmarks/perftest/ramspeed.yaml
@@ -19,19 +19,19 @@
shell: echo $HOME
register: home_dir
- - name: cleaning
- shell: sudo rm -rf $HOME/ramspeed
+ - name: cleaning ramspeed directory
+ file: path=$HOME/ramspeed state=absent
- name: cleaning previous results
- shell: sudo rm -rf $HOME/qtip_result
+ file: path=$HOME/qtip_result state=absent
- name: making ramspeed temporary directory
- shell: sudo mkdir $HOME/ramspeed
+ file: path=$HOME/ramspeed state=directory
- name: making results temporary directory
- shell: sudo mkdir $HOME/qtip_result
+ file: path=$HOME/qtip_result state=directory
- - include: ../common/sys_proxy_pbook.yaml
+ - include: ./common/sys_proxy_pbook.yaml
- include: ./common/sys_info_pbook.yaml
vars:
@@ -67,7 +67,7 @@
copy: src={{workdingdir}}/utils/transform/ramspeed_transform.py dest={{home_dir.stdout}}/qtip_result
- name: Transforming result
- shell: cd $HOME/qtip_result && sudo python ramspd_transform.py
+ shell: cd $HOME/qtip_result && sudo python ramspeed_transform.py
- name: copy report formation script
copy: src={{workingdir}}/utils/transform/final_report.py dest={{home_dir.stdout}}/qtip_result
@@ -91,6 +91,12 @@
fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp
with_items: "{{copy_log_results.stdout_lines}}"
+ - name: cleaning ramspeed directory
+ file: path=$HOME/ramspeed state=absent
+
+ - name: cleaning previous results
+ file: path=$HOME/qtip_result state=absent
+
- hosts: localhost
connection: local
gather_facts: no
@@ -100,10 +106,10 @@
shell: ( find {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/)
- name: making_logs_folder
- shell: mkdir -p {{workingdir}}/{{Dest_dir}}/ramspeed/logs
+ file: path={{workingdir}}/{{Dest_dir}}/ramspeed/logs state=directory
- name: extracting_log
shell: ( find {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/logs)
- name: removing ramspeed_log
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp
+ file: path={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp state=absent
diff --git a/benchmarks/perftest/ssl.yaml b/benchmarks/perftest/ssl.yaml
index 4b5f036a..ef36265e 100644
--- a/benchmarks/perftest/ssl.yaml
+++ b/benchmarks/perftest/ssl.yaml
@@ -18,21 +18,21 @@
shell: sudo echo $HOME
register: home_dir
- - name: cleaning
- shell: sudo rm -rf $HOME/Open_SSL
+ - name: cleaning Open_SSL directory
+ file: path=$HOME/Open_SSL state=absent
- - name: cleaning previous results
- shell: sudo rm -rf $HOME/qtip_result
+ - name: cleaning_qtip_result
+ file: path=$HOME/qtip_result state=absent
- name: making OpenSSL temporary directory
- shell: sudo mkdir $HOME/Open_SSL
+ file: path=$HOME/Open_SSL state=directory
- name: making results temporary directory
- shell: sudo mkdir $HOME/qtip_result
+ file: path=$HOME/qtip_result state=directory
- - include: ../common/sys_proxy_pbook.yaml
+ - include: ./common/sys_proxy_pbook.yaml
- - include: ../common/sys_info_pbook.yaml
+ - include: ./common/sys_info_pbook.yaml
vars:
network: false
@@ -53,10 +53,10 @@
shell: cd $HOME/Open_SSL/openssl-1.0.2f && sudo ./config
- name: make
- shell: cd $HOME/Open_SSL/openssl-1.0.2f && sudo make
+ shell: cd $HOME/Open_SSL/openssl-1.0.2f && sudo make
- name: make install
- shell: cd $HOME/Open_SSL/openssl-1.0.2f && sudo make install
+ shell: cd $HOME/Open_SSL/openssl-1.0.2f && sudo make install
- name: Benchmarking RSA signatures
shell: cd $HOME/Open_SSL/openssl-1.0.2f/apps && sudo ./openssl speed rsa >> $HOME/qtip_result/RSA_dump
@@ -92,6 +92,12 @@
fetch: src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
with_items: "{{copy_log_results.stdout_lines}}"
+ - name: cleaning Open_SSL directory
+ file: path=$HOME/Open_SSL state=absent
+
+ - name: cleaning_qtip_result
+ file: path=$HOME/qtip_result state=absent
+
- hosts: localhost
connection: local
gather_facts: no
@@ -104,10 +110,10 @@
shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/)
- name: making_logs_folder
- shell: mkdir -p {{workingdir}}/{{Dest_dir}}/ssl/logs
+ file: path={{workingdir}}/{{Dest_dir}}/ssl/logs state=directory
- name: extracting_log
shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/logs)
- name: removing ssl_temp
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
+ file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=absent
diff --git a/benchmarks/perftest/whetstone.yaml b/benchmarks/perftest/whetstone.yaml
index 32a22fe3..4dcddb99 100644
--- a/benchmarks/perftest/whetstone.yaml
+++ b/benchmarks/perftest/whetstone.yaml
@@ -18,18 +18,18 @@
shell: echo $HOME
register: home_dir
- - name: cleaning tempT
- shell: sudo rm -rf $HOME/tempT
+ - name: cleaning tempT directory
+ file: path=$HOME/tempT state=absent
- - name: cleaning_qtip_result
- shell: sudo rm -rf $HOME/qtip_result
+ - name: cleaning qtip result directory
+ file: path=$HOME/qtip_result state=absent
- - name: make directory
- shell: sudo mkdir $HOME/qtip_result
+ - name: making qtip_result directory
+ file: path=$HOME/qtip_result state=directory
- - include: ../common/sys_proxy_pbook.yaml
+ - include: ./common/sys_proxy_pbook.yaml
- - include: ../common/sys_info_pbook.yaml
+ - include: ./common/sys_info_pbook.yaml
vars:
network: false
@@ -41,7 +41,7 @@
shell: sudo apt-get install git gcc patch perl -y
when: ansible_os_family == "Debian"
- - include: ./git_proxy_pbook.yaml
+ - include: ./common/git_proxy_pbook.yaml
- name: Clone unixbench
git: repo=https://github.com/kdlucas/byte-unixbench.git
@@ -87,11 +87,11 @@
fetch: src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp
with_items: "{{copy_log_results.stdout_lines}}"
- - name: cleaning tempT
- shell: sudo rm -rf $HOME/tempT
+ - name: cleaning tempT directory
+ file: path=$HOME/tempT state=absent
- - name: cleaning_qtip_result
- shell: sudo rm -rf $HOME/qtip_result
+ - name: cleaning qtip result directory
+ file: path=$HOME/qtip_result state=absent
- hosts: localhost
connection: local
@@ -102,10 +102,10 @@
shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/)
- name: making_logs_folder
- shell: mkdir -p {{workingdir}}/{{Dest_dir}}/whetstone/logs
+ file: path={{workingdir}}/{{Dest_dir}}/whetstone/logs state=directory
- name: extracting_log
shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/logs)
- name: removing whetstone_temp
- shell: rm -rf {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp
+ file: {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp state=absent
diff --git a/config/QtipKey b/config/QtipKey
deleted file mode 100644
index 3f520775..00000000
--- a/config/QtipKey
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAxVpAC+Q8LTyftATCgVHIKvDkXYzHI/8CZeKlVWHlHUA0/6Eu
-qSrhzbpOwSaQi2C3x4Eszvh7/CfuVMql11yShsXwFD7aV6x0YG7q8IUScHILUFal
-m0Fx52No7IpB3llluUV+kh8ay68V9OGvMZrQ+wWw4ieh2alUnpvFwteXmb8NQtXW
-6pm2algUVixc4R3//YKLnGkj93pGFlQlDz5Q0vg+69jHNgodGewIrxCWeZk2pnn0
-vNAdWTQUTm7z/1uYz6AIeR/Wx66msmchFRmmDpP7aHXSSQEBySF7v/GEsZ1JwtBW
-07WebNiTv9wYoOfyKVuZuTbBwjqlT4x5CpIJEwIDAQABAoIBAFHcDZThJtTcwKG7
-F7LsaUrmgNMNAc08iZIZYNr5sD9h0pn2EZS55M+g5+nWRT6K77AhNKTlDQiax5EE
-PaYHEAA3Ok4rhAW50svtNiZuDCf4Jhk815R+oPCJm4wCDTBdhIRE/ys9G7BA/6qD
-slexD94Pjj9AkTHnuuHPW0hmhMuQaSg96EO6QUWCG/HeMFDGcorBlM0s+NeR46Jm
-dI8tOvt+rSa68oDtKEwhUbP5cATNdAITzo9+4We5EnYhW9/nRsaF/um2BPih6JnU
-zG9udvZwj+YARmEfxhXzeRDpi30qYil/+CUF+qdyd8eoPBvhsW6rr1TA6XYGmPDN
-SnlPLAECgYEA6RtgGqL34orxiqT3tDkA2Lb4aSq9Zntr09VAqwft4I3550XihHsa
-lqJoy2macX36f60oRDZEL3v4cH22zyjojav4MXe2fLlCiApy45xCzsGkWizxTe5D
-184jUIcRxb/sGbOulbXBdu8lmtNiyslvkAoj75bvL2MXhytbYgikhrMCgYEA2Lv1
-9Os+VXT9py/67dO/GY14NUpT1sFq2zxPYWpKxJD+j/NVZsflpPd/V5cGANZGovA0
-c8WNupJmCO1P20uldRX5dJ3EhhER2kn0yKhZuBBxmrELQZdnXGc9T8ub0xJVbo2u
-K3Km3C1Dx7Us4BwzGOO6K2kYbT1ij/vAbZWmpCECgYBdkhqStqYwbrukfrHbyyH2
-3AN9G6XpdFOFNc3+mXE4OWV+G4Rgz5WNr+XG+T4AnqQmChjmwK3ALdA9P4lZQL+Q
-1t4K5VYAXNFDEIarrPb4Tayucenu8VyUTO/KDF3q9i5M5t6Gw+3D0x1SN9YpNpCs
-zhU8wGaErA8uuA23nWaFlwKBgQDXSf6MB5GnucqtZI/R5uCRNWIPLYISdZb7p/EC
-R1912sHDpGdU7YREVkV8cFxaQH9yI0E3LyoWBo6sl28X2xDEOcvN91ncAuDFAWnS
-WMimek8e5nbT9N2LgFH7Dbn/9NpAMySrq/vsAlqt6l5lUB3Bv5SSwpatDKj3dZA0
-Ss95gQKBgQCvwxW4PSd+hxdofwGd6KBwhA404GPdcVLLmASGVYRNcVNyfhUmMCn+
-UF1WsBCOcnWjJ/pT864S9Rp1bbqzpQS8Pz1vJwhkaHEJD0a5l+KhD4llsWDjUNfI
-KfVffcmydNC3uRD59WPZEAgu+gOS8kRw7lybFTNuMS7B3dC5v9UtWg==
------END RSA PRIVATE KEY-----
diff --git a/config/QtipKey.pub b/config/QtipKey.pub
deleted file mode 100644
index 7a40f91c..00000000
--- a/config/QtipKey.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFWkAL5DwtPJ+0BMKBUcgq8ORdjMcj/wJl4qVVYeUdQDT/oS6pKuHNuk7BJpCLYLfHgSzO+Hv8J+5UyqXXXJKGxfAUPtpXrHRgburwhRJwcgtQVqWbQXHnY2jsikHeWWW5RX6SHxrLrxX04a8xmtD7BbDiJ6HZqVSem8XC15eZvw1C1dbqmbZqWBRWLFzhHf/9goucaSP3ekYWVCUPPlDS+D7r2Mc2Ch0Z7AivEJZ5mTamefS80B1ZNBRObvP/W5jPoAh5H9bHrqayZyEVGaYOk/toddJJAQHJIXu/8YSxnUnC0FbTtZ5s2JO/3Big5/IpW5m5NsHCOqVPjHkKkgkT root@foreman-jump.opnfv.com
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05286b09..8d951fc5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@
FROM ubuntu:14.04
-MAINTAINER Nauman Ahad <Nauman_Ahad@dell.com>
+MAINTAINER Yujun Zhang <zhang.yujunz@zte.com.cn>
LABEL version="0.1" description="OPNFV QTIP Docker container"
@@ -35,6 +35,7 @@ libjpeg62-dev \
zlib1g-dev \
python-tk \
curl \
+supervisor \
--no-install-recommends
RUN apt-add-repository ppa:ansible/ansible -y
@@ -60,4 +61,11 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng
RUN pip install -r $REPOS_DIR/qtip/requirements.txt
-CMD cd $REPOS_DIR/qtip && python restful_server/qtip_server.py>$HOME/qtip/logs/run.log
+#Config supervisor
+
+RUN mkdir -p /var/log/supervisor
+RUN locale-gen en_US en_US.UTF-8
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+
+CMD ["/usr/bin/supervisord"]
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 00000000..35ac0935
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,11 @@
+# QTIP The Indices for Performance
+
+[QTIP] is an [OPNFV] project.
+
+It aims to build a platform for creating and sharing indices of [NFVI] performance.
+
+See the [project vision](https://wiki.opnfv.org/display/qtip/Vision) for more details.
+
+[QTIP]: https://wiki.opnfv.org/display/qtip
+[OPNFV]: https://www.opnfv.org
+[NFVI]: https://en.wikipedia.org/wiki/Network_function_virtualization
diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh
index 62f97c88..a7a20501 100755
--- a/docker/run_qtip.sh
+++ b/docker/run_qtip.sh
@@ -1,4 +1,5 @@
#! /bin/bash
+
run_test_suite()
{
if [ "$TEST_CASE" == "compute" ]; then
@@ -21,8 +22,16 @@ run_test_suite()
fi
}
+rm -f ${QTIP_DIR}/config/QtipKey*
+
+echo "Generating ssh keypair"
+ssh-keygen -t rsa -N "" -f ${QTIP_DIR}/config/QtipKey -q
+
source ${QTIP_DIR}/docker/prepare_qtip_image.sh
run_test_suite
source ${QTIP_DIR}/docker/cleanup_qtip_image.sh
+
+echo "Remove ssh keypair"
+rm -f ${QTIP_DIR}/config/QtipKey*
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
new file mode 100644
index 00000000..35d16c7e
--- /dev/null
+++ b/docker/supervisord.conf
@@ -0,0 +1,13 @@
+[supervisord]
+nodaemon=true
+
+[program:qtip_server]
+command=bash -c "cd $REPOS_DIR/qtip&&python restful_server/qtip_server.py"
+numprocs=1
+autostart=true
+autorestart=true
+user=root
+environment=INSTALLER_TYPE="%(ENV_INSTALLER_TYPE)s",INSTALLER_IP="%(ENV_INSTALLER_IP)s",NODE_NAME="%(ENV_NODE_NAME)s"
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+
diff --git a/docs/configguide/configuration.rst b/docs/configguide/configuration.rst
index e5228541..d6d2fd5d 100644
--- a/docs/configguide/configuration.rst
+++ b/docs/configguide/configuration.rst
@@ -7,39 +7,14 @@
Configuration
*************
-QTIP currently supports by using a Docker image or by pulling the repo from
-the upstream repository found at https://git.opnfv.org/qtip. Detailed steps
-about setting up QTIP using both of these options can be found below.
+QTIP currently supports by using a Docker image. Detailed steps
+about setting up QTIP can be found below.
To use QTIP you should have access to an OpenStack environment, with at least
Nova, Neutron, Glance, Keystone and Heat installed. Add a brief introduction
to configure OPNFV with this specific installer
-Pre-configuration activities
-----------------------------
-
-
-Setting QTIP framework on Ubuntu 14.04
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Install dependencies:
-::
-
- sudo apt-get install python-dev
- sudo apt-get install python-pip
- sudo apt-get install build-essential
- sudo apt-get install git wget
- sudo pip install python-heatclient python-glanceclient python-neutronclient
-
-
-Download source code and install python dependencies:
-::
-
- git clone https://git.opnfv.org/qtip
- cd qtip
-
-
Installing QTIP using Docker
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -47,18 +22,25 @@ QTIP has a Docker images on the docker hub. Pulling opnfv/qtip docker image
from docker hub:
::
- sudo docker pull opnfv/qtip
+ docker pull opnfv/qtip
Verify that opnfv/qtip has been downloaded. It should be listed as an image by
running the following command.
::
- sudo docker images
+ docker images
-Run the Docker instance:
+Make dir to store the QTIP image which will be used to create vm in cloud.
::
- docker run -it opnfv/qtip /bin/bash
+ mkdir $HOME/imgstore
+
+Run and enter the Docker instance:
+::
+ envs="INSTALLER_TYPE={INSTALLER_TYPE} -e INSTALLER_IP={INSTALLER_IP}
+-e NODE_NAME={NODE_NAME}"
+ docker run --name qtip -id -e $envs -v "$HOME/imgstore:/home/opnfv/imgstore" opnfv/qtip
+ docker exec -i -t qtip /bin/bash
Now you are in the container and QTIP can be found in the /repos/qtip and can
be navigated to using the following command.
@@ -79,22 +61,22 @@ from the OpenStack *openrc* file. This can be done by running the following
command.
::
- source get_env_info.sh -n {INSTALLER_TYPE} -i {INSTALLER_IP}
+ source scripts/get_env_info.sh -n {INSTALLER_TYPE} -i {INSTALLER_IP}
source opnfv-creds.sh
This provides a ``opnfv-creds.sh`` file which can be sources to get the
-environment variables. For running QTIP manually, it is also necessary to
-export the installer type.
-::
-
- export INSTALLER_TYPE="{installer-type}"
+environment variables.
QTIP default key pair
""""""""""""""""""""""
-QTIP uses a SSH key pair to connect to the guest image. This key pair can
-be found in the ``config/`` directory.
+QTIP uses a SSH key pair to connect to the guest image. You should generate key pair
+before running QTIP test. And put key pair in the ``config/`` directory.
+::
+
+ ssh-keygen -t rsa -N "" -f config/QtipKey -q
+
Hardware configuration
diff --git a/docs/userguide/annex.rst b/docs/userguide/annex.rst
index ce1775d6..e8bf5555 100644
--- a/docs/userguide/annex.rst
+++ b/docs/userguide/annex.rst
@@ -15,4 +15,4 @@ Annex
Downloads
=========
-- :download:`Sample configuration <../download/sample_config.yaml>` \ No newline at end of file
+- :download:`Sample configuration <../download/sample_config.yaml>`
diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index 7a202a45..4876d0e2 100644
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -9,16 +9,16 @@ Introduction
************
This guide will serve as a first step to familiarize the user with how to
-run QTIP the first time when the user clones QTIP on to their host machine.
-In order to clone QTIP please follow the instructions in the
-installation.rst located in docs/userguide/installation.rst.
+run QTIP the first time when the user pull QTIP image on to their host machine.
+In order to install and config QTIP please follow the instructions in the
+configuration.rst located in docs/configguide/configuration.rst.
QTIP Directory structure:
-------------------------
The QTIP directory has been sectioned off into multiple folders to facilitate
segmenting information into relevant categories. The folders that concern
- the end user are `test_cases/` and `test_list/`.
+ the end user are `test_cases/` and `benchmarks/suite/`.
**test_cases/:**
@@ -58,7 +58,7 @@ distinguishes between a test to be run on the Virtual Machine or the compute
node itself, respectively.
-**test_list/:**
+**benchmarks/suite/:**
This folder contains three files, namely `compute`, `network` and `storage`.
These files list the benchmarks are to be run by the QTIP framework. Sample
@@ -132,11 +132,13 @@ The `Context` tag helps the user list the number of compute nodes they want
to run dhrystone on. The user can list all the compute nodes under the
`Host_Machines` tag. All the machines under test must be listed under the
`Host_Machines` and naming it incrementally higher. The `ip:` tag is used
- to specify the IP of the particular compute node. The `pw:` tag can be left
- blank because QTIP uses its own key for ssh. In order to run dhrystone on
- one compute node at a time the user needs to edit the `role:` tag. `role:
- host` for machine_1 and `role: server` for machine_2 will allow for
- dhrystone to be run on machine_1 and then run on machine_2.
+ to specify the IP of the particular compute node.The `ip:` tag can be left
+ blank when installer type is 'fuel',because QTIP will get ip
+ from installer. The `pw:` tag can be left blank because QTIP uses its own
+ key for ssh. In order to run dhrystone on one compute node at a time the user
+ needs to edit the `role:` tag. `role: host` for machine_1 and `role: server`
+ for machine_2 will allow for dhrystone to be run on machine_1 and then run
+ on machine_2.
::
@@ -312,71 +314,67 @@ Sample dhrystone_vm.yaml file:
Commands to run the Framework:
------------------------------
-In order to start QTIP on the default lab please use the following commands (asssuming you have prepared the config files in the test_cases/default/ directory and listed the intended suite in the test_list/<RELEVANT-SUITE-FILE>):
+In order to start QTIP on the default lab please use the following commands (asssuming your installer
+is 'fuel' or 'compass', you use the config files in the test_cases/default/ directory and listed the
+intended suite in the benchmarks/suite/<RELEVANT-SUITE-FILE>):
-First step is to export the necessary information to the environment.
-::
-
- source get_env_info.sh -n <INSTALLER_TYPE> -i <INSTALLER_IP>
-
-for running qtip on an openstack deployed using FUEL with the Installer IP 10.20.0.2
-::
-
- source get_env_info.sh -n fuel -i 10.20.0.2
+First step is to export the necessary information to the environment and generate QTIP key pair.
+Please follow the instructions in the configuration.rst.
-This will generate the `opnfv-creds.sh` file needed to use the python clients for keystone, glance, nova, and neutron.
+Secondary step download the QTIP image and upload it to the Cloud.QTIP will use this image
+to create VM when test VM performance.
::
- source opnfv-creds.sh
+ source docker/prepare_qtip_image.sh
-Running QTIP on the using `default` as the pod name and for the `compute` suite by cli
+Running QTIP on the using `default` as the pod name and for the `compute` suite by cli.
::
python qtip.py -l default -f compute
-Running QTIP on the using 'default' as the pod name and for the 'compute' suite 'bm' type by restful api
+Running QTIP on the using 'default' as the pod name and for the 'compute' suite 'bm' type by restful api.
::
- curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"compute", "type": "BM"}' -H "Content-Type: application/json" http://qtip_server_ip:5000/api/v1.0/jobs
+ curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"compute", "type": "BM"}' -H "Content-Type: application/json" http://127.0.0.1:5000/api/v1.0/jobs
-Running QTIP on the using 'default' as the pod name and for the 'compute' suite 'vm' type by restful api
+Running QTIP on the using 'default' as the pod name and for the 'compute' suite 'vm' type by restful api.
::
- curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"compute", "type": "VM"}' -H "Content-Type: application/json" http://qtip_server_ip:5000/api/v1.0/jobs
+ curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"compute", "type": "VM"}' -H "Content-Type: application/json" http://127.0.0.1:5000/api/v1.0/jobs
-Running QTIP on the using `default` as the pod name and for the `network` suite by cli
+Running QTIP on the using `default` as the pod name and for the `network` suite by cli.
::
python qtip.py -l default -f network
-Running QTIP on the using 'default' as the pod name and for the 'network' suite 'bm' type by restful api
+Running QTIP on the using 'default' as the pod name and for the 'network' suite 'bm' type by restful api.
::
- curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"network", "type": "BM"}' -H "Content-Type: application/json" http://qtip_server_ip:5000/api/v1.0/jobs
+ curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"network", "type": "BM"}' -H "Content-Type: application/json" http://127.0.0.1:5000/api/v1.0/jobs
-Running QTIP on the using `default` as the pod name and for the `storage` suite by cli
+Running QTIP on the using `default` as the pod name and for the `storage` suite by cli.
::
python qtip.py -l default -f network
-Running QTIP on the using 'default' as the pod name and for the 'storage' suite 'bm' type by restful api
+Running QTIP on the using 'default' as the pod name and for the 'storage' suite 'bm' type by restful api.
::
- curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"storage", "type": "BM"}' -H "Content-Type: application/json" http://qtip_server_ip:5000/api/v1.0/jobs
+ curl --trace-ascii debug.txt -X POST -d '{ "installer_ip": "10.20.6.2","installer_type":"fuel", "suite_name":"storage", "type": "BM"}' -H "Content-Type: application/json" http://127.0.0.1:5000/api/v1.0/jobs
Get running QTIP job status by restful api
::
- curl --trace-ascii debug.txt -X GET http://qtip_server_ip:5000/api/v1.0/jobs/job-id
+ curl --trace-ascii debug.txt -X GET http://127.0.0.1:5000/api/v1.0/jobs/job-id
For example:
- curl --trace-ascii debug.txt -X GET http://172.37.0.3:5000/api/v1.0/jobs/5b71f035-3fd6-425c-9cc7-86acd3a04214
+ curl --trace-ascii debug.txt -X GET http://127.0.0.1:5000/api/v1.0/jobs/5b71f035-3fd6-425c-9cc7-86acd3a04214
Stop running QTIP job by restful api.The job will finish the current benchmark test and stop.
::
- curl --trace-ascii debug.txt -X DELTET http://qtip_server_ip:5000/api/v1.0/jobs/job-id
+ curl --trace-ascii debug.txt -X DELTET http://127.0.0.1:5000/api/v1.0/jobs/job-id
For example:
- curl --trace-ascii debug.txt -X DELETE http://172.37.0.3:5000/api/v1.0/jobs/5b71f035-3fd6-425c-9cc7-86acd3a04214q
+ curl --trace-ascii debug.txt -X DELETE http://127.0.0.1:5000/api/v1.0/jobs/5b71f035-3fd6-425c-9cc7-86acd3a04214q
Results:
--------
diff --git a/func/args_handler.py b/func/args_handler.py
index 59712800..624f90c4 100644
--- a/func/args_handler.py
+++ b/func/args_handler.py
@@ -14,8 +14,8 @@ from func.spawn_vm import SpawnVM
from func.driver import Driver
-def get_files_in_test_list(suite_name, case_type='all'):
- benchmark_list = json.load(file('test_list/{0}'.format(suite_name)))
+def get_files_in_suite(suite_name, case_type='all'):
+ benchmark_list = json.load(file('benchmarks/suite/{0}'.format(suite_name)))
return reduce(add, benchmark_list.values()) \
if case_type == 'all' else benchmark_list[case_type]
@@ -30,8 +30,8 @@ def get_benchmark_path(lab, suit, benchmark):
return './test_cases/{0}/{1}/{2}'.format(lab, suit, benchmark)
-def check_suite_in_test_list(suite_name):
- return True if os.path.isfile('test_list/' + suite_name) else False
+def check_suite(suite_name):
+ return True if os.path.isfile('benchmarks/suite/' + suite_name) else False
def check_lab_name(lab_name):
@@ -59,10 +59,12 @@ def prepare_ansible_env(benchmark_test_case):
def run_benchmark(installer_type, pwd, benchmark, benchmark_details,
proxy_info, env_setup, benchmark_test_case):
driver = Driver()
- return driver.drive_bench(installer_type, pwd, benchmark,
- env_setup.roles_dict.items(),
- _get_f_name(benchmark_test_case),
- benchmark_details, env_setup.ip_pw_dict.items(), proxy_info)
+ result = driver.drive_bench(installer_type, pwd, benchmark,
+ env_setup.roles_dict.items(),
+ _get_f_name(benchmark_test_case),
+ benchmark_details, env_setup.ip_pw_dict.items(), proxy_info)
+ env_setup.cleanup_authorized_keys()
+ return result
def prepare_and_run_benchmark(installer_type, pwd, benchmark_test_case):
diff --git a/func/cli.py b/func/cli.py
index d914a2de..c5f5d2b7 100644
--- a/func/cli.py
+++ b/func/cli.py
@@ -11,6 +11,9 @@ import sys
import os
import args_handler
import argparse
+from utils import logger_utils
+
+logger = logger_utils.QtipLogger('cli').get
class Cli:
@@ -26,40 +29,41 @@ class Cli:
' The user should list default after -l . all the fields in'
' the files are necessary and should be filled')
parser.add_argument('-f', '--file', required=True, help='File in '
- 'test_list with the list of tests. there are three files'
+ 'benchmarks/suite/ with the list of tests. there are three files'
'\n compute '
'\n storage '
'\n network '
'They contain all the tests that will be run. They are listed by suite.'
'Please ensure there are no empty lines')
parser.add_argument('-b', '--benchmark', help='Name of the benchmark.'
- 'Can be found in test_lists/file_name')
+ 'Can be found in benchmarks/suite/file_name')
return parser.parse_args(args)
def __init__(self, args=sys.argv[1:]):
args = self._parse_args(args)
- if not args_handler.check_suite_in_test_list(args.file):
- print('\n\n ERROR: Test File Does not exist in test_list/ please enter correct file \n\n')
+ if not args_handler.check_suite(args.file):
+ logger.error("ERROR: This suite file doesn't exist under benchmarks/suite/.\
+ Please enter correct file." % str(args.file))
sys.exit(1)
if not args_handler.check_lab_name(args.lab):
- print('\n\n You have specified a lab that is not present in test_cases/ please enter \
- correct file. If unsure how to proceed, use -l default.\n\n')
+ logger.error("You have specified a lab that is not present under test_cases/.\
+ Please enter correct file. If unsure how to proceed, use -l default.")
sys.exit(1)
suite = args.file
- benchmarks = args_handler.get_files_in_test_list(suite)
+ benchmarks = args_handler.get_files_in_suite(suite)
test_cases = args_handler.get_files_in_test_case(args.lab, suite)
benchmarks_list = filter(lambda x: x in test_cases, benchmarks)
if args.benchmark:
if not args_handler.check_benchmark_name(args.lab, args.file, args.benchmark):
- print('\n\n You have specified an incorrect benchmark. Please'
- 'enter the correct one.\n\n')
+ logger.error("You have specified an incorrect benchmark.\
+ Please enter the correct one.")
sys.exit(1)
else:
- print("Starting with " + args.benchmark)
+ logger.info("Starting with " + args.benchmark)
args_handler.prepare_and_run_benchmark(
os.environ['INSTALLER_TYPE'], os.environ['PWD'],
args_handler.get_benchmark_path(args.lab.lower(), args.file, args.benchmark))
@@ -68,5 +72,5 @@ class Cli:
os.environ['INSTALLER_TYPE'], os.environ['PWD'],
args_handler.get_benchmark_path(args.lab.lower(), suite, x)), benchmarks_list)
- print('{0} is not a Template in the Directory Enter a Valid file name.'
- 'or use qtip.py -h for list'.format(filter(lambda x: x not in test_cases, benchmarks)))
+ logger.info("{0} is not a Template in the Directory Enter a Valid file name.\
+ or use qtip.py -h for list".format(filter(lambda x: x not in test_cases, benchmarks)))
diff --git a/func/env_setup.py b/func/env_setup.py
index 9e21a5b6..6027f904 100644
--- a/func/env_setup.py
+++ b/func/env_setup.py
@@ -208,3 +208,9 @@ class Env_setup:
def call_ssh_test(self):
self.ssh_test(self.ip_pw_list)
+
+ def cleanup_authorized_keys(self):
+ for ip, pw in self.ip_pw_list:
+ cmd = './scripts/cleanup_creds.sh %s' % ip
+ logger.info("cleanup authorized_keys: %s " % cmd)
+ os.system(cmd)
diff --git a/qtip.py b/qtip.py
index 493f014e..ea64b933 100644
--- a/qtip.py
+++ b/qtip.py
@@ -7,11 +7,9 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
from func.cli import Cli
-import os
def main():
- os.system('./scripts/file_permission.sh')
Cli()
diff --git a/restful_server/qtip_server.py b/restful_server/qtip_server.py
index d9dc52ad..7b55020a 100644
--- a/restful_server/qtip_server.py
+++ b/restful_server/qtip_server.py
@@ -146,8 +146,8 @@ default is all benchmarks in suite with specified type,
help='testdb_url should be test db http url,for example http://testresults.opnfv.org/test/api/v1')
parser.add_argument('node_name', type=str, required=False, default=None, help='node_name should be string')
args = parser.parse_args()
- if not args_handler.check_suite_in_test_list(args["suite_name"]):
- return abort(404, 'message:Test suite {0} does not exist in test_list'.format(args["suite_name"]))
+ if not args_handler.check_suite(args["suite_name"]):
+ return abort(404, 'message:Test suite {0} does not exist under benchmarks/suite'.format(args["suite_name"]))
if not args_handler.check_lab_name(args["pod_name"]):
return abort(404, 'message: You have specified a lab {0}\
that is not present in test_cases'.format(args['pod_name']))
@@ -156,8 +156,8 @@ default is all benchmarks in suite with specified type,
if not job_id:
return abort(409, 'message:It already has one job running now!')
- benchmarks = args_handler.get_files_in_test_list(args["suite_name"],
- args["type"].lower())
+ benchmarks = args_handler.get_files_in_suite(args["suite_name"],
+ args["type"].lower())
test_cases = args_handler.get_files_in_test_case(args["pod_name"],
args["suite_name"],
args["type"].lower())
diff --git a/scripts/cleanup_creds.sh b/scripts/cleanup_creds.sh
new file mode 100644
index 00000000..9bf44305
--- /dev/null
+++ b/scripts/cleanup_creds.sh
@@ -0,0 +1,14 @@
+#! /bin/bash
+
+DEST_IP=$1
+HOSTNAME=$(hostname)
+sshoptions="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+
+case "$INSTALLER_TYPE" in
+ fuel)
+ ssh $sshoptions -i ./config/QtipKey root@$DEST_IP "sed -i '/root@$HOSTNAME/d' /root/.ssh/authorized_keys"
+ ;;
+esac
+
+
+
diff --git a/scripts/file_permission.sh b/scripts/file_permission.sh
deleted file mode 100755
index a8af957e..00000000
--- a/scripts/file_permission.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-chmod 0600 config/QtipKey
-chmod 0600 config/QtipKey.pub
diff --git a/supporting/servers/roles/ssh/defaults/main.yml b/supporting/servers/roles/ssh/defaults/main.yml
index 59dfd086..41ee9853 100644
--- a/supporting/servers/roles/ssh/defaults/main.yml
+++ b/supporting/servers/roles/ssh/defaults/main.yml
@@ -3,3 +3,4 @@ users:
- { name: yujunz, comment: "Yujun Zhang <zhang.yujunz@zte.com.cn>" }
- { name: taseer, comment: "Taseer Ahmed <taseer94@gmail.com>" }
- { name: serena, comment: "Serena Feng <feng.xiaowei@zte.com.cn>" }
+ - { name: zhifeng, comment: "Zhifeng Jiang<jiang.zhifeng@zte.com.cn>" }
diff --git a/supporting/servers/roles/ssh/files/zhifeng.authorized_keys b/supporting/servers/roles/ssh/files/zhifeng.authorized_keys
new file mode 100644
index 00000000..195cfdca
--- /dev/null
+++ b/supporting/servers/roles/ssh/files/zhifeng.authorized_keys
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuck9a5uUXLtzlTaCYhwcLDffFH8o5ldhU4iKr0D4KaXlFfUsKD7VyHN+Zck3HBWTB4U7X9FEeFINtp2v2aoY8n74TS4LUGT8yqRYLyvsh2LgrhE4ouRvYgWlrZGice2x6ZZrcGM4uoGTC/lUHEvMDGDkDxUCfhxlFWcrplCUMcgd1V/5U14s0ufDgLGyEhXWWXFW4pNoqKBEGZNChBSvnq+NvOD7I4jgStUm9REooOp/VPpubH/6mSvDSTokCvrgWSCaNpcDqLCUjhwpoT/D1oFzEd4jBfPSV3jva+eAKPE2r/dnudQR5NR8T/eUz25YRGeJfrjDP6cMgXJoG43IXQ== root@fuel.domain.tld
diff --git a/test_list/compute b/test_list/compute
deleted file mode 100644
index 3bf1b184..00000000
--- a/test_list/compute
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "bm": [
- "dhrystone_bm.yaml",
- "whetstone_bm.yaml",
- "ramspeed_bm.yaml",
- "dpi_bm.yaml",
- "ssl_bm.yaml"
- ],
- "vm": [
- "dhrystone_vm.yaml",
- "whetstone_vm.yaml",
- "ramspeed_vm.yaml",
- "dpi_vm.yaml",
- "ssl_vm.yaml"
- ]
-}
diff --git a/test_list/network b/test_list/network
deleted file mode 100644
index 58ce5cb9..00000000
--- a/test_list/network
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "bm": [
- "iperf_bm.yaml"
- ],
- "vm": [
- "iperf_vm.yaml",
- "iperf_vm_2.yaml"
- ]
-}
diff --git a/test_list/storage b/test_list/storage
deleted file mode 100644
index f3068dd5..00000000
--- a/test_list/storage
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "bm": [
- "fio_bm.yaml"
- ],
- "vm": [
- "fio_vm.yaml"
- ]
-}
diff --git a/tests/cli_test.py b/tests/cli_test.py
index 43a11089..e47d99ad 100644
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -13,7 +13,7 @@ class TestClass:
(['-l',
'default',
'-f',
- 'test'], "Test File Does not exist in test_list")
+ 'test'], "This suite file doesn't exist under benchmarks/suite/")
])
def test_cli_error(self, capfd, test_input, expected):
k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel', 'PWD': '/home'})