aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile8
-rwxr-xr-xdocker/run_qtip.sh37
-rwxr-xr-xget_env_info.sh (renamed from data/get_env_info.sh)2
-rw-r--r--test_cases/default/compute/.whetstone_serial.yaml.swp (renamed from test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp)bin12288 -> 12288 bytes
-rw-r--r--test_cases/default/compute/dhrystone_parallel.yaml (renamed from test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml)0
-rw-r--r--test_cases/default/compute/dhrystone_serial.yaml (renamed from test_cases/dell_santa_clara/compute/dhrystone_serial.yaml)0
-rw-r--r--test_cases/default/compute/dpi_parallel.yaml (renamed from test_cases/dell_santa_clara/compute/dpi_parallel.yaml)0
-rw-r--r--test_cases/default/compute/dpi_serial.yaml (renamed from test_cases/dell_santa_clara/compute/dpi_serial.yaml)0
-rw-r--r--test_cases/default/compute/ssl_parallel.yaml (renamed from test_cases/dell_santa_clara/compute/ssl_parallel.yaml)0
-rw-r--r--test_cases/default/compute/ssl_serial.yaml (renamed from test_cases/dell_santa_clara/compute/ssl_serial.yaml)0
-rw-r--r--test_cases/default/compute/whetstone_parallel.yaml (renamed from test_cases/dell_santa_clara/compute/whetstone_parallel.yaml)0
-rw-r--r--test_cases/default/compute/whetstone_serial.yaml (renamed from test_cases/dell_santa_clara/compute/whetstone_serial.yaml)0
-rw-r--r--test_cases/default/network/iperf_topology_1.yaml (renamed from test_cases/dell_santa_clara/network/iperf_topology_1.yaml)0
-rw-r--r--test_cases/default/network/iperf_topology_2.yaml (renamed from test_cases/dell_santa_clara/network/iperf_topology_2.yaml)0
-rw-r--r--test_cases/default/network/iperf_topology_3.yaml (renamed from test_cases/dell_santa_clara/network/iperf_topology_3.yaml)0
-rw-r--r--test_cases/default/network/netperf.yaml (renamed from test_cases/dell_santa_clara/network/netperf.yaml)0
-rw-r--r--test_cases/default/network/pktgen.yaml (renamed from test_cases/dell_santa_clara/network/pktgen.yaml)0
-rw-r--r--test_cases/default/storage/fio_baremetal.yaml (renamed from test_cases/dell_santa_clara/storage/fio_baremetal.yaml)0
-rw-r--r--test_cases/default/storage/fio_vm.yaml (renamed from test_cases/dell_santa_clara/storage/fio_vm.yaml)0
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml35
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml45
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml34
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml35
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml31
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml36
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml34
-rw-r--r--test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml44
-rw-r--r--test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml43
-rw-r--r--test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml43
-rw-r--r--test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml60
-rw-r--r--test_cases/dell-us-deploying-bm-3/network/netperf.yaml42
-rw-r--r--test_cases/dell-us-deploying-bm-3/network/pktgen.yaml44
-rw-r--r--test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml39
-rw-r--r--test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml44
-rw-r--r--test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml4
-rw-r--r--test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml4
36 files changed, 648 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0087689c..f9f8f10f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -36,16 +36,16 @@ RUN apt-get install ansible --force-yes -y
-RUN mkdir -p ${repos_dir}
+RUN mkdir -p ${REPOS_DIR}
RUN mkdir -p /root/.ssh
RUN chmod 700 /root/.ssh
#Cloning Repos
RUN git config --global http.sslVerify false
-RUN git clone https://gerrit.opnfv.org/gerrit/qtip $repos_dir/qtip
-RUN git clone https://gerrit.opnfv.org/gerrit/releng $repos_dir/releng
+RUN git clone https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip
+RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng
-RUN pip install -r $repos_dir/qtip/docker/packages.pip
+RUN pip install -r $REPOS_DIR/qtip/docker/packages.pip
diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh
index dd3d322f..f6a78e74 100755
--- a/docker/run_qtip.sh
+++ b/docker/run_qtip.sh
@@ -1,16 +1,39 @@
#! /bin/bash
+
+
cp ${REPOS_DIR}/releng/utils/fetch_os_creds.sh ${QTIP_DIR}/data/
-cd ${QTIP_DIR}/data && source get_env_info.sh -n ${INSTALLER_TYPE} -i ${INSTALLER_IP}
+cd ${QTIP_DIR} && source get_env_info.sh \
+-n ${INSTALLER_TYPE} \
+-i ${INSTALLER_IP}
+
source ${QTIP_DIR}/data/opnfv-creds.sh
-cd ${QTIP_DIR} && python qtip.py -l ${LAB} -f compute.txt
-cd ${QTIP_DIR} && python qtip.py -l ${LAB} -f storage.txt
-cd ${QTIP_DIR} && python qtip.py -l ${LAB} -f network.txt
-cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
-cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
-cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+if [ "$TEST_CASE" == "compute" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f compute.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
+fi
+
+if [ "$TEST_CASE" == "storage" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f storage.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
+fi
+
+if [ "$TEST_CASE" == "network" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f network.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+fi
+
+
+if [ "$TEST_CASE" == "all" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f compute.txt
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f storage.txt
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f network.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
+ cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
+ cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+fi
diff --git a/data/get_env_info.sh b/get_env_info.sh
index 98ad6dd6..77af011b 100755
--- a/data/get_env_info.sh
+++ b/get_env_info.sh
@@ -19,4 +19,4 @@ while getopts ":n:i:" optchar; do
usage ;;
esac
done
-./fetch_os_creds.sh -d opnfv-creds.sh
+./data/fetch_os_creds.sh -d ./data/opnfv-creds.sh
diff --git a/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp b/test_cases/default/compute/.whetstone_serial.yaml.swp
index bbfd3be2..bbfd3be2 100644
--- a/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp
+++ b/test_cases/default/compute/.whetstone_serial.yaml.swp
Binary files differ
diff --git a/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml b/test_cases/default/compute/dhrystone_parallel.yaml
index 29de6d6f..29de6d6f 100644
--- a/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml
+++ b/test_cases/default/compute/dhrystone_parallel.yaml
diff --git a/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml b/test_cases/default/compute/dhrystone_serial.yaml
index e15e8ecc..e15e8ecc 100644
--- a/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml
+++ b/test_cases/default/compute/dhrystone_serial.yaml
diff --git a/test_cases/dell_santa_clara/compute/dpi_parallel.yaml b/test_cases/default/compute/dpi_parallel.yaml
index 0f6afdce..0f6afdce 100644
--- a/test_cases/dell_santa_clara/compute/dpi_parallel.yaml
+++ b/test_cases/default/compute/dpi_parallel.yaml
diff --git a/test_cases/dell_santa_clara/compute/dpi_serial.yaml b/test_cases/default/compute/dpi_serial.yaml
index b39597a2..b39597a2 100644
--- a/test_cases/dell_santa_clara/compute/dpi_serial.yaml
+++ b/test_cases/default/compute/dpi_serial.yaml
diff --git a/test_cases/dell_santa_clara/compute/ssl_parallel.yaml b/test_cases/default/compute/ssl_parallel.yaml
index eb46d8d8..eb46d8d8 100644
--- a/test_cases/dell_santa_clara/compute/ssl_parallel.yaml
+++ b/test_cases/default/compute/ssl_parallel.yaml
diff --git a/test_cases/dell_santa_clara/compute/ssl_serial.yaml b/test_cases/default/compute/ssl_serial.yaml
index 4d92526e..4d92526e 100644
--- a/test_cases/dell_santa_clara/compute/ssl_serial.yaml
+++ b/test_cases/default/compute/ssl_serial.yaml
diff --git a/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml b/test_cases/default/compute/whetstone_parallel.yaml
index 48bc7230..48bc7230 100644
--- a/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml
+++ b/test_cases/default/compute/whetstone_parallel.yaml
diff --git a/test_cases/dell_santa_clara/compute/whetstone_serial.yaml b/test_cases/default/compute/whetstone_serial.yaml
index 25cefbf8..25cefbf8 100644
--- a/test_cases/dell_santa_clara/compute/whetstone_serial.yaml
+++ b/test_cases/default/compute/whetstone_serial.yaml
diff --git a/test_cases/dell_santa_clara/network/iperf_topology_1.yaml b/test_cases/default/network/iperf_topology_1.yaml
index 18eba8ac..18eba8ac 100644
--- a/test_cases/dell_santa_clara/network/iperf_topology_1.yaml
+++ b/test_cases/default/network/iperf_topology_1.yaml
diff --git a/test_cases/dell_santa_clara/network/iperf_topology_2.yaml b/test_cases/default/network/iperf_topology_2.yaml
index 301a9916..301a9916 100644
--- a/test_cases/dell_santa_clara/network/iperf_topology_2.yaml
+++ b/test_cases/default/network/iperf_topology_2.yaml
diff --git a/test_cases/dell_santa_clara/network/iperf_topology_3.yaml b/test_cases/default/network/iperf_topology_3.yaml
index 9e7b73e7..9e7b73e7 100644
--- a/test_cases/dell_santa_clara/network/iperf_topology_3.yaml
+++ b/test_cases/default/network/iperf_topology_3.yaml
diff --git a/test_cases/dell_santa_clara/network/netperf.yaml b/test_cases/default/network/netperf.yaml
index 267b288d..267b288d 100644
--- a/test_cases/dell_santa_clara/network/netperf.yaml
+++ b/test_cases/default/network/netperf.yaml
diff --git a/test_cases/dell_santa_clara/network/pktgen.yaml b/test_cases/default/network/pktgen.yaml
index 13fae68f..13fae68f 100644
--- a/test_cases/dell_santa_clara/network/pktgen.yaml
+++ b/test_cases/default/network/pktgen.yaml
diff --git a/test_cases/dell_santa_clara/storage/fio_baremetal.yaml b/test_cases/default/storage/fio_baremetal.yaml
index 4778c385..4778c385 100644
--- a/test_cases/dell_santa_clara/storage/fio_baremetal.yaml
+++ b/test_cases/default/storage/fio_baremetal.yaml
diff --git a/test_cases/dell_santa_clara/storage/fio_vm.yaml b/test_cases/default/storage/fio_vm.yaml
index dcd27252..dcd27252 100644
--- a/test_cases/dell_santa_clara/storage/fio_vm.yaml
+++ b/test_cases/default/storage/fio_vm.yaml
diff --git a/test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml
new file mode 100644
index 00000000..022cf5ee
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml
@@ -0,0 +1,35 @@
+
+Scenario:
+ benchmark: dhrystone
+ host: machine_1, machine_2
+ server:
+
+Context:
+ Host_Machines:
+ machine_1:
+ ip: 10.20.0.4
+ pw:
+ role: host
+ machine_2:
+ ip: 10.20.0.5
+ pw:
+ role: host
+
+ Virtual_Machines:
+
+
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "dhrystone"
+ Overview: >
+ ''' This test will run the dhrystone benchmark in parallel on machine_1 and machine_2.\n
+ if you wish to add a virtual machine add the following information under the Virtual_Machine tag
+
+ virtualmachine_1:
+ availability_zone:
+ public_network:
+ OS_image:
+ flavor:
+ role: '''
+
+
diff --git a/test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml
new file mode 100644
index 00000000..c14399b1
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml
@@ -0,0 +1,45 @@
+Scenario:
+ benchmark: dhrystone
+ host: virtualmachine_1, virtualmachine_2
+ server: blakc
+
+Context:
+ Host_Machines:
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ public_network: 'net04_ext'
+ OS_image: QTIP_CentOS
+ flavor: m1.large
+ role: host
+ virtualmachine_2:
+ availability_zone: compute2
+ public_network: 'net04_ext'
+ OS_image: QTIP_CentOS
+ flavor: m1.large
+ role: host
+
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "dhrystone"
+ Overview: >
+ '''This test will run the dhrystone benchmark in parallel on machine_1 and machine_2.\n
+ if you wish to add a virtual machine add the following information under the Virtual_Machine tag
+ machine_1:
+ ip: 172.18.0.16
+ pw: Op3nStack
+ role: host
+ machine_2:
+ ip: 172.18.0.15
+ pw: Op3nStack
+ role: host
+
+ virtualmachine_1:
+ availability_zone:
+ public_network:
+ OS_image:
+ flavor:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml
new file mode 100644
index 00000000..f161aa3f
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml
@@ -0,0 +1,34 @@
+Scenario:
+ benchmark: dpi
+ host: machine_1,machine_2
+
+Context:
+ Host_Machines:
+ machine_1:
+ ip: 10.20.0.4
+ pw: Op3nStack
+ role: 1host
+ machine_2:
+ ip: 10.20.0.5
+ pw: Op3nStack
+ role: 1host
+ Virtual_Machines:
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "dpi"
+ Overview: >
+ '''This test will run the DPI benchmark in serial on virutalmachine_1 and virtualmachine_2.\n
+ if you wish to add a host machine add the following information under the Host_Machine tag
+ virtualmachine_2:
+ availability_zone: compute1
+ OS_image: QTIP_CentOS
+ public_network: 'provider_network'
+
+ role: 1host
+ flavor: m1.large
+ machine_1:
+ ip:
+ pw:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml
new file mode 100644
index 00000000..8a157e7a
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml
@@ -0,0 +1,35 @@
+Scenario:
+ benchmark: dpi
+ 1Run : virtualmachine_1, virtualmachine_2
+
+Context:
+ Host_Machines:
+
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 1Run
+ flavor: m1.large
+ virtualmachine_2:
+ availability_zone: compute4
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 1Run
+ flavor: m1.large
+
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "dpi"
+ Overview: >
+ '''This test will run the DPI benchmark in parallel on virutalmachine_1 and virtualmachine_2.\n
+ if you wish to add a host machine add the following information under the Host_Machine tag
+
+ machine_1:
+ ip:
+ pw:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml
new file mode 100644
index 00000000..bded6d2d
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml
@@ -0,0 +1,31 @@
+Scenario:
+ benchmark: ssl
+ 1Run: machine_1,machine_2
+
+Context:
+ Host_Machines:
+ machine_1:
+ ip: 10.20.0.4
+ pw:
+ role: 1Run
+ machine_2:
+ ip: 10.20.0.5
+ pw:
+ role: 1Run
+ Virtual_Machines:
+
+
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "ssl"
+ Overview: >
+ '''This test will run the SSL benchmark in parallel on machine_1 and machine_1.
+ If you wish to add a virtual machine add the following information under the Virtual_Machine tag
+
+ virtualmachine_1:
+ availability_zone:
+ public_network:
+ OS_image:
+ flavor:
+ role:
+ '''
diff --git a/test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml
new file mode 100644
index 00000000..cbacf088
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml
@@ -0,0 +1,36 @@
+Scenario:
+ benchmark: ssl
+ host: virtualmachine_1, virtualmachine_2
+
+Context:
+ Host_Machines:
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ public_network: 'net04_ext'
+ OS_image: 'QTIP_CentOS'
+ flavor: 'm1.large'
+ role: host
+ virtualmachine_2:
+ availability_zone: compute2
+ public_network: 'net04_ext'
+ OS_image: 'QTIP_CentOS'
+ flavor: 'm1.large'
+ role: host
+
+
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "ssl"
+ Overview: >
+ '''This test will run the SSL benchmark in parallel on virtualmachine_1 and machine_1.\n
+ if you wish to add a virtual machine add the following information under the Virtual_Machine tag
+
+ virtualmachine_1:
+ availability_zone:
+ public_network:
+ OS_image:
+ flavor:
+ role:
+ '''
diff --git a/test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml b/test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml
new file mode 100644
index 00000000..136ac2b0
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml
@@ -0,0 +1,34 @@
+
+Scenario:
+ benchmark: whetstone
+ host: machine_1, machine_2
+
+
+Context:
+ Host_Machines:
+ machine_1:
+ ip: 10.20.0.4
+ pw:
+ role: host
+ machine_2:
+ ip: 10.20.0.5
+ pw:
+ role: host
+ Virtual_Machines:
+
+
+
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "whetstone"
+ Overview: >
+ ''' This test will run the whetstone benchmark in parallel on machine_1 and machine_2.\n
+ if you wish to add a baremetal machine add the following information under the Virtual_Machine tag
+
+ machine_3:
+ ip:
+ pw:
+ role:
+ '''
+
+
diff --git a/test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml b/test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml
new file mode 100644
index 00000000..17928fa1
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml
@@ -0,0 +1,44 @@
+Scenario:
+ benchmark: whetstone
+ host: virtualmachine_1, virtualmachine_1
+ server:
+
+Context:
+ Host_Machines:
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ public_network: 'net04_ext'
+ OS_image: QTIP_CentOS
+ flavor: m1.large
+ role: host
+ virtualmachine_2:
+ availability_zone: compute2
+ public_network: 'net04_ext'
+ OS_image: QTIP_CentOS
+ flavor: m1.large
+ role: host
+
+
+Test_Description:
+ Test_category: "Compute"
+ Benchmark: "dhrystone"
+ Overview: >
+ '''This test will run the whetstone benchmark in parallel on machine_1 and machine_2.\n
+ if you wish to add a virtual machine add the following information under the Virtual_Machine tag
+ virtualmachine_1:
+ availability_zone: nova
+ public_network: 'net04_ext'
+ OS_image: QTIP_CentOS
+ flavor: m1.large
+ role: host
+
+ virtualmachine_1:
+ availability_zone:
+ public_network:
+ OS_image:
+ flavor:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml
new file mode 100644
index 00000000..18eba8ac
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml
@@ -0,0 +1,43 @@
+Scenario:
+ benchmark: iperf
+ topology: Client and Server on ONE compute
+ server : virtualmachine_1
+ client: virtualmachine_2
+ benchmark_details:
+ duration: 20
+ protocol: tcp
+ bandwidthGbps: 10
+
+Context:
+ Host_Machines:
+
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 1-server
+ flavor: m1.large
+
+ virtualmachine_2:
+ availability_zone: compute1
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 2-host
+ flavor: m1.large
+
+Test_Description:
+ Test_category: "network"
+ Benchmark: "iperf"
+ Overview: >
+ '''This test will run the IPERF benchmark on virutalmachine_1 and virtualmachine_2. On the\n
+ same compute node
+ if you wish to add a host machine add the following information under the Host_Machine tag
+
+ machine_1:
+ ip:
+ pw:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml
new file mode 100644
index 00000000..301a9916
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml
@@ -0,0 +1,43 @@
+Scenario:
+ benchmark: iperf
+ topology: Client and Server on different Compute nodes
+ server: virtualmachine_1
+ client: virtualmachine_2
+ benchmark_details:
+ duration: 20
+ protocol: tcp
+ bandwidthGbps: 10
+
+Context:
+ Host_Machines:
+
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 1-server
+ flavor: m1.large
+
+ virtualmachine_2:
+ availability_zone: compute2
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 2-host
+ flavor: m1.large
+
+Test_Description:
+ Test_category: "network"
+ Benchmark: "iperf"
+ Overview: >
+ '''This test will run the IPERF benchmark on virutalmachine_1 and virtualmachine_2. On the\n
+ same compute node
+ if you wish to add a host machine add the following information under the Host_Machine tag
+
+ machine_1:
+ ip:
+ pw:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml
new file mode 100644
index 00000000..9e7b73e7
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml
@@ -0,0 +1,60 @@
+Scenario:
+ benchmark: iperf
+ topology: 2 Client on one compute and 2 servers on another machine
+ 1Run : virtualmachine_1, virtualmachine_2
+ 2Run:
+ benchmark_details:
+ duration: 20
+ protocol: udp
+ bandwidthGbps: 1
+
+Context:
+ Host_Machines:
+
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ OS_image: QTIP_CentOS
+ public_network: 'provider_network'
+ role: 1-server
+ flavor: m1.large
+
+ virtualmachine_2:
+ availability_zone: compute2
+ OS_image: QTIP_CentOS
+ public_network: 'provider_network'
+ role: 1-server
+ flavor: m1.large
+
+ virtualmachine_3:
+ availability_zone: compute3
+ OS_image: QTIP_CentOS
+ public_network: 'provider_network'
+ role: 1-server
+ flavor: m1.large
+
+ virtualmachine_4:
+ availability_zone: compute4
+ OS_image: QTIP_CentOS
+ public_network: 'provider_network'
+ role: 1-server
+ flavor: m1.large
+
+
+
+
+Test_Description:
+ Test_category: "network"
+ Benchmark: "iperf"
+ Overview: >
+ '''This test will run the IPERF benchmark on virutalmachine_1 and virtualmachine_2. On the\n
+ same compute node
+ if you wish to add a host machine add the following information under the Host_Machine tag
+
+ machine_1:
+ ip:
+ pw:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/network/netperf.yaml b/test_cases/dell-us-deploying-bm-3/network/netperf.yaml
new file mode 100644
index 00000000..267b288d
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/network/netperf.yaml
@@ -0,0 +1,42 @@
+Scenario:
+ benchmark: netperf
+ topology: Client and Server on ONE compute
+ server : virtualmachine_1
+ client: virtualmachine_2
+ benchmark_details:
+ duration: 10
+ teststream: udp_stream
+
+Context:
+ Host_Machines:
+
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute2
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 1-server
+ flavor: m1.large
+
+ virtualmachine_2:
+ availability_zone: compute2
+ OS_image: QTIP_CentOS
+ public_network: 'net04_ext'
+ role: 2-host
+ flavor: m1.large
+
+Test_Description:
+ Test_category: "network"
+ Benchmark: "netperf"
+ Overview: >
+ '''This test will run the NETPERF benchmark on virutalmachine_1 and virtualmachine_2. On the\n
+ same compute node
+ if you wish to add a host machine add the following information under the Host_Machine tag
+
+ machine_1:
+ ip:
+ pw:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/network/pktgen.yaml b/test_cases/dell-us-deploying-bm-3/network/pktgen.yaml
new file mode 100644
index 00000000..13fae68f
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/network/pktgen.yaml
@@ -0,0 +1,44 @@
+Scenario:
+ benchmark: pktgen
+ topology: Client and Server on ONE compute
+ server : virtualmachine_1
+ client: virtualmachine_2
+ benchmark_details:
+ duration: "10"
+ packetsize: "64"
+ ipaddr: "10.10.17.4"
+ numberofports: "10"
+
+Context:
+ Host_Machines:
+
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute2
+ OS_image: pktgenready
+ public_network: 'provider_network'
+ role: 1-server
+ flavor: m1.large
+
+ virtualmachine_2:
+ availability_zone: compute2
+ OS_image: pktgenready
+ public_network: 'provider_network'
+ role: 2-host
+ flavor: m1.large
+
+Test_Description:
+ Test_category: "network"
+ Benchmark: "iperf"
+ Overview: >
+ '''This test will run the IPERF benchmark on virutalmachine_1 and virtualmachine_2. On the\n
+ same compute node
+ if you wish to add a host machine add the following information under the Host_Machine tag
+
+ machine_1:
+ ip:
+ pw:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml b/test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml
new file mode 100644
index 00000000..4778c385
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml
@@ -0,0 +1,39 @@
+Scenario:
+ benchmark: fio
+ host: machine_1, machine_2
+ server: blakc
+
+Context:
+ Host_Machines:
+ machine_1:
+ ip: 10.20.0.7
+ pw: r00tme
+ role: host
+ machine_2:
+ ip: 10.20.0.6
+ pw: r00tme
+ role: host
+
+
+ Virtual_Machines:
+
+
+Test_Description:
+ Test_category: "Storage"
+ Benchmark: "FIO"
+ Overview: >
+ '''This test will run the FIO benchmark in parallel on host machines "machine_1" and "machine_2".\n
+ The fio job specifications can be found in qtip/benchmarks/fio_jobs/test_job.
+ The job conists of an fio load of:
+ 1.50% rand read 50% rand write
+ 2.Asynch engine
+ 3.Direct IO.
+ 4.Queing depth of 2
+
+ if you wish to add another machine add the following information under the Host_Machines tag
+ machine_3:
+ ip: 172.18.0.16
+ pw: Op3nStack
+ role: host
+ '''
+
diff --git a/test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml b/test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml
new file mode 100644
index 00000000..dcd27252
--- /dev/null
+++ b/test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml
@@ -0,0 +1,44 @@
+Scenario:
+ benchmark: fio
+ host: machine_1, machine_2
+ server: blakc
+
+Context:
+ Host_Machines:
+
+ Virtual_Machines:
+ virtualmachine_1:
+ availability_zone: compute1
+ public_network: 'net04_ext'
+ OS_image: QTIP_CentOS
+ flavor: m1.large
+ role: host
+ virtualmachine_2:
+ availability_zone: compute2
+ public_network: 'net04_ext'
+ OS_image: QTIP_CentOS
+ flavor: m1.large
+ role: host
+
+Test_Description:
+ Test_category: "Storage"
+ Benchmark: "FIO"
+ Overview: >
+ '''This test will run the FIO benchmark in parallel on virtualmachine_1 and virtualmachine_2.\n
+ The fio job specifications can be found in qtip/benchmarks/fio_jobs/test_job.
+ The job conists of an fio load of:
+ 1.50% rand read 50% rand write
+ 2.Asynch engine
+ 3.Direct IO.
+ 4.Queing depth of 2
+
+ if you wish to add a virtual machine add the following information under the Virtual_Machine tag
+
+ virtualmachine_3:
+ availability_zone:
+ public_network:
+ OS_image:
+ flavor:
+ role:
+ '''
+
diff --git a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml
index b7347a69..810224bc 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml
@@ -6,11 +6,11 @@ Context:
Host_Machines:
machine_1:
ip: 10.20.0.6
- pw: Op3nStack
+ pw:
role: 1host
machine_2:
ip: 10.20.0.5
- pw: Op3nStack
+ pw:
role: 1host
Virtual_Machines:
Test_Description:
diff --git a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml b/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml
index 4778c385..4b78f084 100644
--- a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml
@@ -7,11 +7,11 @@ Context:
Host_Machines:
machine_1:
ip: 10.20.0.7
- pw: r00tme
+ pw:
role: host
machine_2:
ip: 10.20.0.6
- pw: r00tme
+ pw:
role: host