From eaedad454f20474cc48b431c24d758a7ac36bf60 Mon Sep 17 00:00:00 2001 From: Alex Krzos Date: Thu, 7 Jul 2016 08:43:22 -0400 Subject: [PATCH] Remove validate_ceilometer plugin and use validate_ceilometer from rally + Remove existing plugin + Use the version of the scenario merged into upstream rally (0.5) Change-Id: I61f79a85515dcc3ae8a665a78e204b2f130b37ba --- conf/browbeat-ceilometer.yaml | 55 ------------------- conf/browbeat-keystone-complete.yaml | 6 ++ conf/browbeat-keystone-minimal.yaml | 6 ++ .../validate_ceilometer-cc.yml} | 10 ++-- .../validate-ceilometer.py | 32 ----------- 5 files changed, 17 insertions(+), 92 deletions(-) delete mode 100644 conf/browbeat-ceilometer.yaml rename rally/{rally-plugins/validate-ceilometer/validate-ceilometer.yml => authenticate/validate_ceilometer-cc.yml} (95%) delete mode 100644 rally/rally-plugins/validate-ceilometer/validate-ceilometer.py diff --git a/conf/browbeat-ceilometer.yaml b/conf/browbeat-ceilometer.yaml deleted file mode 100644 index a3b959c0b..000000000 --- a/conf/browbeat-ceilometer.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Basic set of initial stress tests to test overcloud before running complete set of benchmarks. -browbeat: - results : results/ - rerun: 1 - cloud_name: openstack -elasticsearch: - enabled: false - host: 1.1.1.1 - port: 9200 - metadata_files: - - name: hardware-metadata - file: metadata/hardware-metadata.json - - name: environment-metadata - file: metadata/environment-metadata.json - - name: software-metadata - file: metadata/software-metadata.json -ansible: - 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 - grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml -connmon: - enabled: false - sudo: true -grafana: - enabled: true - grafana_ip: 1.1.1.1 - grafana_port: 3000 - dashboards: - - openstack-general-system-performance - snapshot: - enabled: false - snapshot_compute: false -rally: - enabled: true - sleep_before: 5 - sleep_after: 5 - venv: /home/stack/rally-venv/bin/activate - plugins: - - netcreate-boot: rally/rally-plugins/netcreate-boot - - subnet-router-create: rally/rally-plugins/subnet-router-create - - validate-ceilometer: rally/rally-plugins/validate-ceilometer - benchmarks: - - name: plugins - enabled: true - concurrency: - - 2 - times: 6 - scenarios: - - name: validate-ceilometer - enabled: true - file: rally/rally-plugins/validate-ceilometer/validate-ceilometer.yml diff --git a/conf/browbeat-keystone-complete.yaml b/conf/browbeat-keystone-complete.yaml index a984ab50b..07d1e701e 100644 --- a/conf/browbeat-keystone-complete.yaml +++ b/conf/browbeat-keystone-complete.yaml @@ -54,6 +54,12 @@ rally: - 512 times: 10000 scenarios: + - name: authentic-ceilometer + enabled: true + file: rally/authenticate/validate_ceilometer-cc.yml + sla_max_avg_duration: 12 + sla_max_seconds: 30 + sla_max_failure: 0 - name: authentic-cinder enabled: true file: rally/authenticate/validate_cinder-cc.yml diff --git a/conf/browbeat-keystone-minimal.yaml b/conf/browbeat-keystone-minimal.yaml index b3f871936..1a1443c0a 100644 --- a/conf/browbeat-keystone-minimal.yaml +++ b/conf/browbeat-keystone-minimal.yaml @@ -48,6 +48,12 @@ rally: - 32 times: 100 scenarios: + - name: authentic-ceilometer + enabled: true + file: rally/authenticate/validate_ceilometer-cc.yml + sla_max_avg_duration: 12 + sla_max_seconds: 30 + sla_max_failure: 0 - name: authentic-cinder enabled: true file: rally/authenticate/validate_cinder-cc.yml diff --git a/rally/rally-plugins/validate-ceilometer/validate-ceilometer.yml b/rally/authenticate/validate_ceilometer-cc.yml similarity index 95% rename from rally/rally-plugins/validate-ceilometer/validate-ceilometer.yml rename to rally/authenticate/validate_ceilometer-cc.yml index 5782741d9..205c29f04 100644 --- a/rally/rally-plugins/validate-ceilometer/validate-ceilometer.yml +++ b/rally/authenticate/validate_ceilometer-cc.yml @@ -3,14 +3,10 @@ {% set sla_max_failure = sla_max_failure or 0 %} {% set sla_max_seconds = sla_max_seconds or 60 %} --- - KeystonePlugin.validate_ceilometer: + Authenticate.validate_ceilometer: - args: repetitions: {{repetitions}} - runner: - concurrency: {{concurrency}} - times: {{times}} - type: "constant" context: users: project_domain: "default" @@ -18,6 +14,10 @@ tenants: 1 user_domain: "default" users_per_tenant: 8 + runner: + concurrency: {{concurrency}} + times: {{times}} + type: "constant" sla: max_avg_duration: {{sla_max_avg_duration}} max_seconds_per_iteration: {{sla_max_seconds}} diff --git a/rally/rally-plugins/validate-ceilometer/validate-ceilometer.py b/rally/rally-plugins/validate-ceilometer/validate-ceilometer.py deleted file mode 100644 index 54e4b7907..000000000 --- a/rally/rally-plugins/validate-ceilometer/validate-ceilometer.py +++ /dev/null @@ -1,32 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from rally.plugins.openstack import scenario -from rally.task import atomic -from rally.task import validation - - -class KeystonePlugin(scenario.OpenStackScenario): - @validation.number("repetitions", minval=1) - @validation.required_openstack(users=True) - @scenario.configure() - def validate_ceilometer(self, repetitions): - """Check Ceilometer Client to ensure validation of token. - Creation of the client does not ensure validation of the token. - We have to do some minimal operation to make sure token gets validated. - :param repetitions: number of times to validate - """ - ceilometer_client = self.clients("ceilometer") - with atomic.ActionTimer(self, "authenticate.validate_ceilometer_%s_times" % - repetitions): - for i in range(repetitions): - ceilometer_client.meters.list()