From 160774980604703a1cc90fbf1fbfe3365f4b9fd9 Mon Sep 17 00:00:00 2001 From: Fei Long Wang Date: Thu, 20 Nov 2014 15:33:41 +1300 Subject: [PATCH] Fix invalid Ceilometer task samples Now Rally is requiring the task file containing "context" and "users". Unfortunately, they're missing in Ceilometer task samples. This patch will add them. Change-Id: Id444ffe12b78c5fc399cdd97ba3c3d4790e4d265 Closes-Bug: 1394437 --- doc/samples/tasks/scenarios/ceilometer/create-alarm.json | 6 ++++++ doc/samples/tasks/scenarios/ceilometer/create-alarm.yaml | 4 ++++ .../tasks/scenarios/ceilometer/create-and-delete-alarm.json | 6 ++++++ .../tasks/scenarios/ceilometer/create-and-delete-alarm.yaml | 4 ++++ .../tasks/scenarios/ceilometer/create-and-list-alarm.json | 6 ++++++ .../tasks/scenarios/ceilometer/create-and-list-alarm.yaml | 4 ++++ .../ceilometer/create-and-query-alarm-history.json | 6 ++++++ .../ceilometer/create-and-query-alarm-history.yaml | 4 ++++ .../tasks/scenarios/ceilometer/create-and-query-alarms.json | 6 ++++++ .../tasks/scenarios/ceilometer/create-and-query-alarms.yaml | 6 +++++- .../scenarios/ceilometer/create-and-query-samples.json | 6 ++++++ .../scenarios/ceilometer/create-and-query-samples.yaml | 4 ++++ .../tasks/scenarios/ceilometer/create-and-update-alarm.json | 6 ++++++ .../tasks/scenarios/ceilometer/create-and-update-alarm.yaml | 4 ++++ .../scenarios/ceilometer/create-meter-and-get-stats.json | 6 ++++++ .../scenarios/ceilometer/create-meter-and-get-stats.yaml | 4 ++++ doc/samples/tasks/scenarios/ceilometer/list-alarms.json | 6 ++++++ doc/samples/tasks/scenarios/ceilometer/list-alarms.yaml | 4 ++++ doc/samples/tasks/scenarios/ceilometer/list-meters.json | 6 ++++++ doc/samples/tasks/scenarios/ceilometer/list-meters.yaml | 4 ++++ doc/samples/tasks/scenarios/ceilometer/list-resources.json | 6 ++++++ doc/samples/tasks/scenarios/ceilometer/list-resources.yaml | 4 ++++ 22 files changed, 111 insertions(+), 1 deletion(-) diff --git a/doc/samples/tasks/scenarios/ceilometer/create-alarm.json b/doc/samples/tasks/scenarios/ceilometer/create-alarm.json index 0fd656594e..f547991064 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-alarm.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-alarm.json @@ -14,6 +14,12 @@ "type": "constant", "times": 10, "concurrency": 1 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-alarm.yaml b/doc/samples/tasks/scenarios/ceilometer/create-alarm.yaml index 5954227751..cbd238a316 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-alarm.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-alarm.yaml @@ -13,3 +13,7 @@ type: "constant" times: 10 concurrency: 1 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.json b/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.json index 7601c86cd9..8d644a7971 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.json @@ -14,6 +14,12 @@ "type": "constant", "times": 10, "concurrency": 1 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.yaml b/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.yaml index 6577f64861..a344de3d00 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-delete-alarm.yaml @@ -13,3 +13,7 @@ type: "constant" times: 10 concurrency: 1 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.json b/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.json index 1eb09bc695..1f8b4b5bff 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.json @@ -14,6 +14,12 @@ "type": "constant", "times": 10, "concurrency": 1 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.yaml b/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.yaml index 2101cff338..7b5e34b011 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-list-alarm.yaml @@ -13,3 +13,7 @@ type: "constant" times: 10 concurrency: 1 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.json b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.json index 45e50d456d..bec806c846 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.json @@ -16,6 +16,12 @@ "type": "constant", "times": 100, "concurrency": 10 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.yaml b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.yaml index 3c5b4adfd7..02a8ff7c42 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarm-history.yaml @@ -15,3 +15,7 @@ type: "constant" times: 100 concurrency: 10 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.json b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.json index fd3c7e7f32..0562199c4f 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.json @@ -17,6 +17,12 @@ "type": "constant", "times": 100, "concurrency": 10 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.yaml b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.yaml index 9001831a55..ca2482e68c 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-query-alarms.yaml @@ -15,4 +15,8 @@ runner: type: "constant" times: 100 - concurrency: 10 \ No newline at end of file + concurrency: 10 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.json b/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.json index 1d93085a79..a5de20fffa 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.json @@ -15,6 +15,12 @@ "type": "constant", "times": 100, "concurrency": 10 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.yaml b/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.yaml index e0988d5071..86bb652666 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-query-samples.yaml @@ -14,3 +14,7 @@ type: "constant" times: 100 concurrency: 10 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.json b/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.json index 7d24802a59..21376b92be 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.json @@ -14,6 +14,12 @@ "type": "constant", "times": 10, "concurrency": 1 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.yaml b/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.yaml index 27e0c1ecce..9b26273913 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-and-update-alarm.yaml @@ -13,3 +13,7 @@ type: "constant" times: 10 concurrency: 1 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.json b/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.json index a7022fcb8a..ec1369c676 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.json +++ b/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.json @@ -12,6 +12,12 @@ "type": "constant", "times": 200, "concurrency": 5 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.yaml b/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.yaml index e39cd81ec2..f3a5d97546 100644 --- a/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/create-meter-and-get-stats.yaml @@ -11,3 +11,7 @@ type: "constant" times: 200 concurrency: 5 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/list-alarms.json b/doc/samples/tasks/scenarios/ceilometer/list-alarms.json index df7100b4fd..a5b23c78df 100644 --- a/doc/samples/tasks/scenarios/ceilometer/list-alarms.json +++ b/doc/samples/tasks/scenarios/ceilometer/list-alarms.json @@ -5,6 +5,12 @@ "type": "constant", "times": 10, "concurrency": 1 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/list-alarms.yaml b/doc/samples/tasks/scenarios/ceilometer/list-alarms.yaml index 39db2ca1a9..9236d261c8 100644 --- a/doc/samples/tasks/scenarios/ceilometer/list-alarms.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/list-alarms.yaml @@ -5,3 +5,7 @@ type: "constant" times: 10 concurrency: 1 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/list-meters.json b/doc/samples/tasks/scenarios/ceilometer/list-meters.json index c16327eb78..28ed3f67fe 100644 --- a/doc/samples/tasks/scenarios/ceilometer/list-meters.json +++ b/doc/samples/tasks/scenarios/ceilometer/list-meters.json @@ -5,6 +5,12 @@ "type": "constant", "times": 10, "concurrency": 1 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/list-meters.yaml b/doc/samples/tasks/scenarios/ceilometer/list-meters.yaml index a3208f6ea6..0445cd4d07 100644 --- a/doc/samples/tasks/scenarios/ceilometer/list-meters.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/list-meters.yaml @@ -5,3 +5,7 @@ type: "constant" times: 10 concurrency: 1 + context: + users: + tenants: 2 + users_per_tenant: 2 diff --git a/doc/samples/tasks/scenarios/ceilometer/list-resources.json b/doc/samples/tasks/scenarios/ceilometer/list-resources.json index 7838b56e99..8ee3de369a 100644 --- a/doc/samples/tasks/scenarios/ceilometer/list-resources.json +++ b/doc/samples/tasks/scenarios/ceilometer/list-resources.json @@ -5,6 +5,12 @@ "type": "constant", "times": 10, "concurrency": 1 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } } } ] diff --git a/doc/samples/tasks/scenarios/ceilometer/list-resources.yaml b/doc/samples/tasks/scenarios/ceilometer/list-resources.yaml index aad66d482a..323ba4622c 100644 --- a/doc/samples/tasks/scenarios/ceilometer/list-resources.yaml +++ b/doc/samples/tasks/scenarios/ceilometer/list-resources.yaml @@ -5,4 +5,8 @@ type: "constant" times: 10 concurrency: 1 + context: + users: + tenants: 2 + users_per_tenant: 2