Merge "Fix invalid Ceilometer task samples"

2014-11-20 12:12:33 +00:00 · 2014-11-20 12:12:33 +00:00 · c5e087cd23
commit c5e087cd23
parent f70cae765f 1607749806
22 changed files with 111 additions and 1 deletions
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
+         concurrency: 10
+       context:
+         users:
+           tenants: 2
+           users_per_tenant: 2
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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
--- 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
+                }
            }
        }
    ]
--- 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