Permalink
Browse files

Mix and Match Workloads

* Mix and Match Workloads
* rerun_type - ['iteration', 'complete'] - allows you to rerun complete
  browbeat workload or iteratively
* browbeat/config.py for loading and validating config schema
* tests/test_config.py to test config.py

Change-Id: I99ea87c01c17d5d06cf7f8d1eec3299aa8d483a5
  • Loading branch information...
akrzos committed Nov 28, 2017
1 parent db8096c commit 1c3b60a8c850a5940d72ce99641591cac4b53c28
Showing with 4,194 additions and 4,852 deletions.
  1. +6 −0 .gitignore
  2. +130 −106 ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
  3. +105 −76 ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
  4. +70 −46 ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2
  5. +183 −151 ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
  6. +353 −337 browbeat-complete.yaml
  7. +235 −222 browbeat-config.yaml
  8. +91 −74 browbeat.py
  9. +57 −0 browbeat/config.py
  10. +3 −3 browbeat/grafana.py
  11. +2 −0 browbeat/path.py
  12. +46 −59 browbeat/perfkit.py
  13. +112 −160 browbeat/rally.py
  14. +194 −0 browbeat/schema/browbeat.yml
  15. +48 −0 browbeat/schema/perfkit.yml
  16. +38 −0 browbeat/schema/rally.yml
  17. +19 −0 browbeat/schema/shaker.yml
  18. +71 −0 browbeat/schema/yoda.yml
  19. +42 −61 browbeat/shaker.py
  20. +21 −49 browbeat/tools.py
  21. +0 −331 browbeat/validate.yaml
  22. +15 −12 browbeat/workloadbase.py
  23. +25 −39 browbeat/yoda.py
  24. +0 −237 ci-scripts/config/browbeat-ci.yaml
  25. +61 −41 conf/browbeat-glance-complete.yaml
  26. +213 −191 conf/browbeat-keystone-complete.yaml
  27. +206 −184 conf/browbeat-keystone-minimal.yaml
  28. +70 −50 conf/browbeat-workloads.yml
  29. +172 −144 conf/ceilometer-minimal.yaml
  30. +73 −379 conf/ceilometer-persist-response-timing.yaml
  31. +128 −108 conf/gnocchi-minimal.yaml
  32. +126 −93 conf/perfkit-benchmarks.yaml
  33. +71 −365 conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml
  34. +71 −365 conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml
  35. +71 −101 conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml
  36. +71 −365 conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml
  37. +124 −104 conf/telemetry-nova-persist-instances-with-network-fip.yaml
  38. +134 −114 conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml
  39. +124 −104 conf/telemetry-nova-persist-instances-with-network-volume.yaml
  40. +114 −94 conf/telemetry-nova-persist-instances-with-network.yaml
  41. +105 −84 conf/telemetry-nova-persist-instances.yaml
  42. +1 −0 test-requirements.txt
  43. 0 tests/__init__.py
  44. +89 −0 tests/data/invalid_browbeat.yml
  45. +68 −0 tests/data/invalid_browbeat_workload.yml
  46. +88 −0 tests/data/valid_browbeat.yml
  47. +87 −0 tests/data/workloads.yml
  48. +54 −0 tests/test_config.py
  49. +7 −3 tox.ini
View
@@ -1,4 +1,10 @@
*.py[cod]
# Distribution / packaging
.eggs
# Testing
.cache
.tox
# Virtual Environments:
@@ -1,7 +1,11 @@
browbeat:
results: results/
rerun: 3
cloud_name: {{ browbeat_cloud_name }}
rerun: 3
rerun_type: iteration
ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/site.yml
ssh_config: ansible/ssh-config
elasticsearch:
enabled: {{ elastic_enabled }}
host: {{ elastic_host }}
@@ -16,116 +20,136 @@ elasticsearch:
file: metadata/software-metadata.json
- name: version
file: metadata/version.json
ansible:
ssh_config: ansible/ssh-config
hosts: ansible/hosts
adjust:
keystone_token: ansible/browbeat/adjustment-keystone-token.yml
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
metadata: ansible/gather/site.yml
grafana:
enabled: {{ grafana_enabled }}
grafana_ip: {{ grafana_host }}
grafana_port: 3000
host: {{ grafana_host }}
port: 3000
dashboards:
- openstack-general-system-performance
perfkit:
sleep_before: 0
sleep_after: 0
default:
image: centos7
machine_type: m1.small
os_type: rhel
openstack_image_username: centos
openstack_floating_ip_pool: browbeat_public
openstack_network: browbeat_private
timing_measurements: runtimes
ignore_package_requirements: true
rally:
enabled: true
sleep_before: 5
sleep_after: 5
venv: /home/stack/rally-venv
plugins:
- netcreate-boot: rally/rally-plugins/netcreate-boot
benchmarks:
- name: authenticate
enabled: true
concurrency:
- 16
- 24
times: 2500
scenarios:
- name: authentic-keystone
enabled: true
file: rally/authenticate/keystone-cc.yml
- name: keystonebasic
enabled: true
concurrency:
- 16
times: 1000
scenarios:
- name: create-and-list-tenants
enabled: true
file: rally/keystonebasic/create_and_list_tenants-cc.yml
- name: neutron
enabled: true
concurrency:
- 8
- 12
times: 128
scenarios:
- name: create-list-router
enabled: true
file: rally/neutron/neutron-create-list-router-cc.yml
- name: create-list-network
enabled: true
file: rally/neutron/neutron-create-list-network-cc.yml
- name: create-list-subnet
enabled: true
file: rally/neutron/neutron-create-list-subnet-cc.yml
- name: create-list-port
enabled: true
file: rally/neutron/neutron-create-list-port-cc.yml
- name: create-list-security-group
enabled: true
file: rally/neutron/neutron-create-list-security-group-cc.yml
- name: nova
enabled: true
concurrency:
- 8
- 12
times: 64
scenarios:
- name: boot-snapshot-delete
enabled: true
file: rally/nova/nova-boot-snapshot-cc.yml
image_name: cirros
flavor_name: m1.tiny
- name: boot-list
enabled: true
file: rally/nova/nova-boot-list-cc.yml
image_name: cirros
flavor_name: m1.tiny
- name: glance
enabled: true
concurrency:
- 8
- 12
times: 64
scenarios:
- name: create-and-delete-image
enabled: true
image_location: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2.xz
flavor_name: m1.tiny
file: rally/glance/create-and-delete-image-cc.yml
- name: plugins
enabled: true
concurrency:
- 8
times: 64
scenarios:
- name: netcreate-1-boot
enabled: true
enable_dhcp: true
image_name: cirros
flavor_name: m1.tiny
num_networks: 1
file: rally/rally-plugins/netcreate-boot/netcreate_nova_boot.yml
- name: netcreate-5-boot
enabled: true
enable_dhcp: true
image_name: cirros
flavor_name: m1.tiny
num_networks: 5
file: rally/rally-plugins/netcreate-boot/netcreate_nova_boot.yml
shaker:
server: 1.1.1.1
port: 5555
flavor: m1.small
join_timeout: 600
sleep_before: 0
sleep_after: 0
shaker_region: regionOne
external_host: 2.2.2.2
yoda:
instackenv: "/home/stack/instackenv.json"
stackrc: "/home/stack/stackrc"
workloads:
- name: authenticate
enabled: true
type: rally
concurrency:
- 16
- 24
times: 2500
scenarios:
- name: authentic-keystone
enabled: true
file: rally/authenticate/keystone-cc.yml
- name: keystonebasic
enabled: true
type: rally
concurrency:
- 16
times: 1000
scenarios:
- name: create-and-list-tenants
enabled: true
file: rally/keystonebasic/create_and_list_tenants-cc.yml
- name: neutron
enabled: true
type: rally
concurrency:
- 8
- 12
times: 128
scenarios:
- name: create-list-router
enabled: true
file: rally/neutron/neutron-create-list-router-cc.yml
- name: create-list-network
enabled: true
file: rally/neutron/neutron-create-list-network-cc.yml
- name: create-list-subnet
enabled: true
file: rally/neutron/neutron-create-list-subnet-cc.yml
- name: create-list-port
enabled: true
file: rally/neutron/neutron-create-list-port-cc.yml
- name: create-list-security-group
enabled: true
file: rally/neutron/neutron-create-list-security-group-cc.yml
- name: nova
enabled: true
type: rally
concurrency:
- 8
- 12
times: 64
scenarios:
- name: boot-snapshot-delete
enabled: true
file: rally/nova/nova-boot-snapshot-cc.yml
image_name: cirros
flavor_name: m1.tiny
- name: boot-list
enabled: true
file: rally/nova/nova-boot-list-cc.yml
image_name: cirros
flavor_name: m1.tiny
- name: glance
enabled: true
type: rally
concurrency:
- 8
- 12
times: 64
scenarios:
- name: create-and-delete-image
enabled: true
image_location: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2.xz
flavor_name: m1.tiny
file: rally/glance/create-and-delete-image-cc.yml
- name: plugins
enabled: true
type: rally
concurrency:
- 8
times: 64
scenarios:
- name: netcreate-1-boot
enabled: true
enable_dhcp: true
image_name: cirros
flavor_name: m1.tiny
num_networks: 1
file: rally/rally-plugins/netcreate-boot/netcreate_nova_boot.yml
- name: netcreate-5-boot
enabled: true
enable_dhcp: true
image_name: cirros
flavor_name: m1.tiny
num_networks: 5
file: rally/rally-plugins/netcreate-boot/netcreate_nova_boot.yml
Oops, something went wrong.

0 comments on commit 1c3b60a

Please sign in to comment.