From 23b627df622eeafafa215ce19764310c1d55dd55 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Sun, 8 Jan 2017 09:48:31 +0800 Subject: Reorganize the project folders Code from Brahmaputra is no longer maintained, including: - docker - playbooks - scripts - utils They are moved to legacy folder to avoid unnecessary confusion to new developers. Change-Id: Ia50383ca5c3bd82571eb7b2184e7f83e264ff8a7 Signed-off-by: Yujun Zhang --- tests/data/hosts | 2 - tests/data/output/hosts | 3 -- tests/data/schema/test_bm_schema.yaml | 76 ----------------------------- tests/data/schema/test_vm_schema.yaml | 80 ------------------------------- tests/data/test.retry | 1 - tests/data/test.yml | 4 -- tests/data/testplan/bm_ping.yaml | 29 ----------- tests/data/testplan/bm_with_proxy.yaml | 39 --------------- tests/data/testplan/bm_without_proxy.yaml | 33 ------------- tests/data/testplan/vm.yaml | 48 ------------------- tests/data/testplan/vm_error.yaml | 42 ---------------- 11 files changed, 357 deletions(-) delete mode 100644 tests/data/hosts delete mode 100644 tests/data/output/hosts delete mode 100644 tests/data/schema/test_bm_schema.yaml delete mode 100644 tests/data/schema/test_vm_schema.yaml delete mode 100644 tests/data/test.retry delete mode 100644 tests/data/test.yml delete mode 100644 tests/data/testplan/bm_ping.yaml delete mode 100644 tests/data/testplan/bm_with_proxy.yaml delete mode 100644 tests/data/testplan/bm_without_proxy.yaml delete mode 100644 tests/data/testplan/vm.yaml delete mode 100644 tests/data/testplan/vm_error.yaml (limited to 'tests/data') diff --git a/tests/data/hosts b/tests/data/hosts deleted file mode 100644 index 0a0ac539..00000000 --- a/tests/data/hosts +++ /dev/null @@ -1,2 +0,0 @@ -[sample_group_name] -127.0.0.1 diff --git a/tests/data/output/hosts b/tests/data/output/hosts deleted file mode 100644 index 9b47df0e..00000000 --- a/tests/data/output/hosts +++ /dev/null @@ -1,3 +0,0 @@ -[host] -10.20.0.29 -10.20.0.28 diff --git a/tests/data/schema/test_bm_schema.yaml b/tests/data/schema/test_bm_schema.yaml deleted file mode 100644 index a7c27e3f..00000000 --- a/tests/data/schema/test_bm_schema.yaml +++ /dev/null @@ -1,76 +0,0 @@ -type: map -mapping: - Scenario: - type: map - mapping: - benchmark: - type: str - required: True - host: - type: str - server: - type: str - allowempty: True - client: - type: str - allowempty: True - topology: - type: str - allowempty: True - benchmark_details: - type: map - mapping: - duration: - type: int - protocol: - type: str - bandwidthGbps: - type: int - description: - type: str - 1Run: - type: str - - Context: - type: map - mapping: - Host_Machines: - type: map - required: True - mapping: - regex;(^machine): - type: map - mapping: - role: - type: str - ip: - type: str - allowempty: True - pw: - type: str - allowempty: True - Virtual_Machines: - type: map - allowempty: True - Proxy_Environment: - type: map - mapping: - http_proxy: - type: str - https_proxy: - type: str - no_proxy: - type: str - - Test_Description: - type: map - mapping: - Test_category: - type: str - allowempty: True - Benchmark: - type: str - allowempty: True - Overview: - type: str - allowempty: True diff --git a/tests/data/schema/test_vm_schema.yaml b/tests/data/schema/test_vm_schema.yaml deleted file mode 100644 index 524f8fe4..00000000 --- a/tests/data/schema/test_vm_schema.yaml +++ /dev/null @@ -1,80 +0,0 @@ -type: map -mapping: - Scenario: - type: map - mapping: - benchmark: - type: str - required: True - host: - type: str - server: - type: str - allowempty: True - 1Run: - type: str - client: - type: str - allowempty: True - topology: - type: str - allowempty: True - benchmark_details: - type: map - mapping: - duration: - type: int - protocol: - type: str - bandwidthGbps: - type: int - teststream: - type: str - description: - type: str - - Context: - type: map - mapping: - Host_Machines: - type: map - allowempty: True - Virtual_Machines: - type: map - required: True - mapping: - regex;(^virtualmachine): - type: map - mapping: - availability_zone: - type: str - OS_image: - type: str - public_network: - type: str - role: - type: str - flavor: - type: str - Proxy_Environment: - type: map - mapping: - http_proxy: - type: str - https_proxy: - type: str - no_proxy: - type: str - - Test_Description: - type: map - mapping: - Test_category: - type: str - allowempty: True - Benchmark: - type: str - allowempty: True - Overview: - type: str - allowempty: True diff --git a/tests/data/test.retry b/tests/data/test.retry deleted file mode 100644 index 7b9ad531..00000000 --- a/tests/data/test.retry +++ /dev/null @@ -1 +0,0 @@ -127.0.0.1 diff --git a/tests/data/test.yml b/tests/data/test.yml deleted file mode 100644 index 270e86fd..00000000 --- a/tests/data/test.yml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: sample_group_name - tasks: - - name: just an uname - command: uname -a diff --git a/tests/data/testplan/bm_ping.yaml b/tests/data/testplan/bm_ping.yaml deleted file mode 100644 index 41d696e2..00000000 --- a/tests/data/testplan/bm_ping.yaml +++ /dev/null @@ -1,29 +0,0 @@ - -Scenario: - benchmark: dhrystone - host: machine_1 - server: - -Context: - Host_Machines: - machine_1: - ip: 127.0.0.1 - 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/tests/data/testplan/bm_with_proxy.yaml b/tests/data/testplan/bm_with_proxy.yaml deleted file mode 100644 index 1d73300b..00000000 --- a/tests/data/testplan/bm_with_proxy.yaml +++ /dev/null @@ -1,39 +0,0 @@ - -Scenario: - benchmark: dhrystone - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.28 - pw: - role: host - machine_2: - ip: 10.20.0.29 - pw: - role: host - - Virtual_Machines: - - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - - - -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/tests/data/testplan/bm_without_proxy.yaml b/tests/data/testplan/bm_without_proxy.yaml deleted file mode 100644 index a9ae3b71..00000000 --- a/tests/data/testplan/bm_without_proxy.yaml +++ /dev/null @@ -1,33 +0,0 @@ - -Scenario: - benchmark: dhrystone - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.28 - pw: - role: host - machine_2: - ip: 10.20.0.29 - 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/tests/data/testplan/vm.yaml b/tests/data/testplan/vm.yaml deleted file mode 100644 index 4c8453ca..00000000 --- a/tests/data/testplan/vm.yaml +++ /dev/null @@ -1,48 +0,0 @@ -Scenario: - benchmark: iperf - topology: Client and Server on ONE compute - server : virtualmachine_1 - client: virtualmachine_2 - description: 'Leave the bandwidth as 0 to throttle maximum traffic' - benchmark_details: - duration: 20 - protocol: tcp - bandwidthGbps: 0 - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - role: 2-host - flavor: m1.large - - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - -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/tests/data/testplan/vm_error.yaml b/tests/data/testplan/vm_error.yaml deleted file mode 100644 index f13d3a00..00000000 --- a/tests/data/testplan/vm_error.yaml +++ /dev/null @@ -1,42 +0,0 @@ -Scenario: - topology: Client and Server on ONE compute - server : virtualmachine_1 - client: virtualmachine_2 - description: 'Leave the bandwidth as 0 to throttle maximum traffic' - benchmark_details: - duration: 20 - protocol: tcp - bandwidthGbps: 0 - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'admin-floating_net' - 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: - ''' - -- cgit