summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dashboard/Yardstick-TC002-1456495853488319
-rw-r--r--docs/userguide/opnfv_yardstick_tc061.rst88
-rw-r--r--samples/storagecapacity.yaml24
-rw-r--r--tests/unit/benchmark/scenarios/storage/test_storagecapacity.py98
-rw-r--r--yardstick/benchmark/scenarios/storage/storagecapacity.bash69
-rw-r--r--yardstick/benchmark/scenarios/storage/storagecapacity.py133
6 files changed, 519 insertions, 212 deletions
diff --git a/dashboard/Yardstick-TC002-1456495853488 b/dashboard/Yardstick-TC002-1456495853488
index a0be68402..ca8ad2f8e 100644
--- a/dashboard/Yardstick-TC002-1456495853488
+++ b/dashboard/Yardstick-TC002-1456495853488
@@ -137,14 +137,14 @@
],
"hide": false,
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT \"rtt\" FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"pod_name\", \"task_id\", \"deploy_scenario\"",
+ "query": "SELECT \"rtt.ares\" FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"pod_name\", \"task_id\", \"deploy_scenario\"",
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
}
@@ -199,111 +199,6 @@
]
],
"tags": []
- },
- {
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "hide": true,
- "refId": "C",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": []
- },
- {
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "hide": true,
- "refId": "D",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": []
- },
- {
- "dsType": "influxdb",
- "groupBy": [
- {
- "params": [
- "$interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "hide": true,
- "refId": "E",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": []
}
],
"timeFrom": "14d",
@@ -366,9 +261,9 @@
"repeat": "POD",
"scopedVars": {
"POD": {
+ "selected": true,
"text": "ericsson-pod2",
- "value": "ericsson\\-pod2",
- "selected": true
+ "value": "ericsson\\-pod2"
}
},
"scroll": true,
@@ -425,7 +320,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
"rawQuery": false,
"refId": "A",
"resultFormat": "table",
@@ -433,7 +328,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -479,9 +374,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "huawei-pod1",
- "value": "huawei\\-pod1",
- "selected": true
+ "value": "huawei\\-pod1"
}
},
"scroll": true,
@@ -538,7 +433,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
"rawQuery": false,
"refId": "A",
"resultFormat": "table",
@@ -546,7 +441,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -576,7 +471,7 @@
"transform": "table",
"transparent": false,
"type": "table",
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 2
},
{
@@ -594,9 +489,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "huawei-pod2",
- "value": "huawei\\-pod2",
- "selected": true
+ "value": "huawei\\-pod2"
}
},
"scroll": true,
@@ -653,7 +548,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
"rawQuery": false,
"refId": "A",
"resultFormat": "table",
@@ -661,7 +556,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -691,7 +586,7 @@
"transform": "table",
"transparent": false,
"type": "table",
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 2
},
{
@@ -709,9 +604,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "intel-pod5",
- "value": "intel\\-pod5",
- "selected": true
+ "value": "intel\\-pod5"
}
},
"scroll": true,
@@ -768,7 +663,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
"rawQuery": false,
"refId": "A",
"resultFormat": "table",
@@ -776,7 +671,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -806,7 +701,7 @@
"transform": "table",
"transparent": false,
"type": "table",
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 2
},
{
@@ -824,9 +719,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "intel-pod6",
- "value": "intel\\-pod6",
- "selected": true
+ "value": "intel\\-pod6"
}
},
"scroll": true,
@@ -883,7 +778,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
"rawQuery": false,
"refId": "A",
"resultFormat": "table",
@@ -891,7 +786,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -921,7 +816,7 @@
"transform": "table",
"transparent": false,
"type": "table",
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 2
},
{
@@ -939,9 +834,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "lf-pod2",
- "value": "lf\\-pod2",
- "selected": true
+ "value": "lf\\-pod2"
}
},
"scroll": true,
@@ -998,7 +893,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
"rawQuery": false,
"refId": "A",
"resultFormat": "table",
@@ -1006,7 +901,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -1036,7 +931,7 @@
"transform": "table",
"transparent": false,
"type": "table",
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 2
},
{
@@ -1046,7 +941,7 @@
"error": false,
"fontSize": "90%",
"height": "",
- "id": 18,
+ "id": 19,
"isNew": true,
"links": [],
"minSpan": 2,
@@ -1054,9 +949,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "zte-pod1",
- "value": "zte\\-pod1",
- "selected": true
+ "value": "zte\\-pod1"
}
},
"scroll": true,
@@ -1113,7 +1008,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"",
"rawQuery": false,
"refId": "A",
"resultFormat": "table",
@@ -1121,7 +1016,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -1146,12 +1041,12 @@
]
}
],
- "timeFrom": "24h",
+ "timeFrom": "14d",
"title": "$POD",
"transform": "table",
"transparent": false,
"type": "table",
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 2
}
],
@@ -1212,9 +1107,9 @@
"repeat": "POD",
"scopedVars": {
"POD": {
+ "selected": true,
"text": "ericsson-pod2",
- "value": "ericsson\\-pod2",
- "selected": true
+ "value": "ericsson\\-pod2"
}
},
"seriesOverrides": [
@@ -1281,7 +1176,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1289,7 +1184,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -1378,9 +1273,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "huawei-pod1",
- "value": "huawei\\-pod1",
- "selected": true
+ "value": "huawei\\-pod1"
}
},
"seriesOverrides": [
@@ -1447,7 +1342,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1455,7 +1350,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -1494,7 +1389,7 @@
"ms",
"short"
],
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 3
},
{
@@ -1546,9 +1441,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "huawei-pod2",
- "value": "huawei\\-pod2",
- "selected": true
+ "value": "huawei\\-pod2"
}
},
"seriesOverrides": [
@@ -1615,7 +1510,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1623,7 +1518,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -1662,7 +1557,7 @@
"ms",
"short"
],
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 3
},
{
@@ -1714,9 +1609,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "intel-pod5",
- "value": "intel\\-pod5",
- "selected": true
+ "value": "intel\\-pod5"
}
},
"seriesOverrides": [
@@ -1783,7 +1678,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1791,7 +1686,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -1830,7 +1725,7 @@
"ms",
"short"
],
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 3
},
{
@@ -1882,9 +1777,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "intel-pod6",
- "value": "intel\\-pod6",
- "selected": true
+ "value": "intel\\-pod6"
}
},
"seriesOverrides": [
@@ -1951,7 +1846,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1959,7 +1854,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -1998,7 +1893,7 @@
"ms",
"short"
],
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 3
},
{
@@ -2050,9 +1945,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "lf-pod2",
- "value": "lf\\-pod2",
- "selected": true
+ "value": "lf\\-pod2"
}
},
"seriesOverrides": [
@@ -2119,7 +2014,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2127,7 +2022,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -2166,7 +2061,7 @@
"ms",
"short"
],
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 3
},
{
@@ -2189,7 +2084,7 @@
"threshold2Color": "rgba(234, 112, 112, 0.22)"
},
"height": "",
- "id": 19,
+ "id": 20,
"interval": "",
"isNew": true,
"leftYAxisLabel": "<RTT>",
@@ -2218,9 +2113,9 @@
"repeat": null,
"scopedVars": {
"POD": {
+ "selected": true,
"text": "zte-pod1",
- "value": "zte\\-pod1",
- "selected": true
+ "value": "zte\\-pod1"
}
},
"seriesOverrides": [
@@ -2287,7 +2182,7 @@
}
],
"measurement": "opnfv_yardstick_tc002",
- "query": "SELECT mean(\"rtt\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
+ "query": "SELECT mean(\"rtt.ares\") FROM \"opnfv_yardstick_tc002\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -2295,7 +2190,7 @@
[
{
"params": [
- "rtt"
+ "rtt.ares"
],
"type": "field"
},
@@ -2334,7 +2229,7 @@
"ms",
"short"
],
- "repeatIteration": 1467967293010,
+ "repeatIteration": 1469865492903,
"repeatPanelId": 3
}
],
@@ -2343,7 +2238,7 @@
}
],
"time": {
- "from": "now-24h",
+ "from": "now-7d",
"to": "now"
},
"timepicker": {
@@ -2398,84 +2293,84 @@
"name": "POD",
"options": [
{
+ "selected": false,
"text": "All",
- "value": "(elxg482ls42|ericsson\\-pod1|ericsson\\-pod2|huawei\\-pod1|huawei\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod5|intel\\-pod6|lf\\-pod1|lf\\-pod2|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|unknown|zte\\-pod1)",
- "selected": false
+ "value": "(elxg482ls42|ericsson\\-pod1|ericsson\\-pod2|huawei\\-pod1|huawei\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod5|intel\\-pod6|lf\\-pod1|lf\\-pod2|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|unknown|zte\\-pod1)"
},
{
+ "selected": false,
"text": "elxg482ls42",
- "value": "elxg482ls42",
- "selected": false
+ "value": "elxg482ls42"
},
{
+ "selected": false,
"text": "ericsson-pod1",
- "value": "ericsson\\-pod1",
- "selected": false
+ "value": "ericsson\\-pod1"
},
{
+ "selected": true,
"text": "ericsson-pod2",
- "value": "ericsson\\-pod2",
- "selected": true
+ "value": "ericsson\\-pod2"
},
{
+ "selected": true,
"text": "huawei-pod1",
- "value": "huawei\\-pod1",
- "selected": true
+ "value": "huawei\\-pod1"
},
{
+ "selected": true,
"text": "huawei-pod2",
- "value": "huawei\\-pod2",
- "selected": true
+ "value": "huawei\\-pod2"
},
{
+ "selected": false,
"text": "huawei-us-deploy-bare-1",
- "value": "huawei\\-us\\-deploy\\-bare\\-1",
- "selected": false
+ "value": "huawei\\-us\\-deploy\\-bare\\-1"
},
{
+ "selected": true,
"text": "intel-pod5",
- "value": "intel\\-pod5",
- "selected": true
+ "value": "intel\\-pod5"
},
{
+ "selected": true,
"text": "intel-pod6",
- "value": "intel\\-pod6",
- "selected": true
+ "value": "intel\\-pod6"
},
{
+ "selected": false,
"text": "lf-pod1",
- "value": "lf\\-pod1",
- "selected": false
+ "value": "lf\\-pod1"
},
{
+ "selected": true,
"text": "lf-pod2",
- "value": "lf\\-pod2",
- "selected": true
+ "value": "lf\\-pod2"
},
{
+ "selected": false,
"text": "opnfv-jump-1",
- "value": "opnfv\\-jump\\-1",
- "selected": false
+ "value": "opnfv\\-jump\\-1"
},
{
+ "selected": false,
"text": "opnfv-jump-2",
- "value": "opnfv\\-jump\\-2",
- "selected": false
+ "value": "opnfv\\-jump\\-2"
},
{
+ "selected": false,
"text": "orange-fr-pod2",
- "value": "orange\\-fr\\-pod2",
- "selected": false
+ "value": "orange\\-fr\\-pod2"
},
{
+ "selected": false,
"text": "unknown",
- "value": "unknown",
- "selected": false
+ "value": "unknown"
},
{
+ "selected": true,
"text": "zte-pod1",
- "value": "zte\\-pod1",
- "selected": true
+ "value": "zte\\-pod1"
}
],
"query": "SHOW TAG VALUES WITH KEY = \"pod_name\"",
@@ -2558,6 +2453,6 @@
},
"refresh": "15m",
"schemaVersion": 8,
- "version": 2,
+ "version": 5,
"links": []
}
diff --git a/docs/userguide/opnfv_yardstick_tc061.rst b/docs/userguide/opnfv_yardstick_tc061.rst
new file mode 100644
index 000000000..1d424414e
--- /dev/null
+++ b/docs/userguide/opnfv_yardstick_tc061.rst
@@ -0,0 +1,88 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International
+.. License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) OPNFV, Huawei Technologies Co.,Ltd and others.
+
+*************************************
+Yardstick Test Case Description TC061
+*************************************
+
+.. _man-pages: http://linux.die.net/man/1/sar
+
++-----------------------------------------------------------------------------+
+|Network Utilization |
+| |
++--------------+--------------------------------------------------------------+
+|test case id | OPNFV_YARDSTICK_TC061_Network Utilization |
+| | |
++--------------+--------------------------------------------------------------+
+|metric | Network utilization |
+| | |
++--------------+--------------------------------------------------------------+
+|test purpose | To evaluate the IaaS network capability with regards to |
+| | network utilization, including Total number of packets |
+| | received per second, Total number of packets transmitted per |
+| | second, Total number of kilobytes received per second, Total |
+| | number of kilobytes transmitted per second, Number of |
+| | compressed packets received per second (for cslip etc.), |
+| | Number of compressed packets transmitted per second, Number |
+| | of multicast packets received per second, Utilization |
+| | percentage of the network interface. |
+| | This test case should be run in parallel to other Yardstick |
+| | test cases and not run as a stand-alone test case. |
+| | Measure the network usage statistics from the network devices|
+| | Average, minimum and maximun values are obtained. |
+| | The purpose is also to be able to spot trends. |
+| | Test results, graphs and similar shall be stored for |
+| | comparison reasons and product evolution understanding |
+| | between different OPNFV versions and/or configurations. |
+| | |
++--------------+--------------------------------------------------------------+
+|configuration | File: netutilization.yaml (in the 'samples' directory) |
+| | |
+| | * interval: 1 - repeat, pausing every 1 seconds in-between. |
+| | * count: 1 - display statistics 1 times, then exit. |
+| | |
++--------------+--------------------------------------------------------------+
+|test tool | sar |
+| | |
+| | The sar command writes to standard output the contents of |
+| | selected cumulative activity counters in the operating |
+| | system. |
+| | sar is normally part of a Linux distribution, hence it |
+| | doesn't needs to be installed. |
+| | |
++--------------+--------------------------------------------------------------+
+|references | man-pages_ |
+| | |
+| | ETSI-NFV-TST001 |
+| | |
++--------------+--------------------------------------------------------------+
+|applicability | Test can be configured with different: |
+| | |
+| | * interval; |
+| | * count; |
+| | * runner Iteration and intervals. |
+| | |
+| | There are default values for each above-mentioned option. |
+| | Run in background with other test cases. |
+| | |
++--------------+--------------------------------------------------------------+
+|pre-test | The test case image needs to be installed into Glance |
+|conditions | with sar included in the image. |
+| | |
+| | No POD specific requirements have been identified. |
+| | |
++--------------+--------------------------------------------------------------+
+|test sequence | description and expected result. |
+| | |
++--------------+--------------------------------------------------------------+
+|step 1 | The host is installed as client. The related TC, or TCs, is |
+| | invoked and sar logs are produced and stored. |
+| | |
+| | Result: logs are stored. |
+| | |
++--------------+--------------------------------------------------------------+
+|test verdict | None. Network utilization results are fetched and stored. |
+| | |
++--------------+--------------------------------------------------------------+
diff --git a/samples/storagecapacity.yaml b/samples/storagecapacity.yaml
new file mode 100644
index 000000000..93394be12
--- /dev/null
+++ b/samples/storagecapacity.yaml
@@ -0,0 +1,24 @@
+---
+# Sample benchmark task config file
+# Measure storage capacity and scale.
+# Including number of PVs, volume of disk size,
+# and block size of each device.
+
+schema: "yardstick:task:0.1"
+
+scenarios:
+-
+ type: StorageCapacity
+ options:
+ test_type: "disk_size"
+
+ host: node5.LF
+
+ runner:
+ type: Iteration
+ iterations: 1
+
+context:
+ type: Node
+ name: LF
+ file: /root/yardstick/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml
diff --git a/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py b/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py
new file mode 100644
index 000000000..cad5ba1d1
--- /dev/null
+++ b/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# Unittest for yardstick.benchmark.scenarios.storage.storagecapacity.StorageCapacity
+
+import mock
+import unittest
+import os
+import json
+
+from yardstick.benchmark.scenarios.storage import storagecapacity
+
+DISK_SIZE_SAMPLE_OUTPUT = '{"Numberf of devides": "2", "Total disk size": "1024000000 bytes"}'
+BLOCK_SIZE_SAMPLE_OUTPUT = '{"/dev/sda": 1024, "/dev/sdb": 4096}'
+DISK_UTIL_RAW_OUTPUT = "vda 10.00\nvda 0.00"
+DISK_UTIL_SAMPLE_OUTPUT = '{"vda": {"avg_util": 5.0, "max_util": 10.0, "min_util": 0.0}}'
+
+@mock.patch('yardstick.benchmark.scenarios.storage.storagecapacity.ssh')
+class StorageCapacityTestCase(unittest.TestCase):
+
+ def setUp(self):
+ self.scn = {
+ "options": {
+ 'test_type': 'disk_size'
+ }
+ }
+ self.ctx = {
+ "host": {
+ 'ip': '172.16.0.137',
+ 'user': 'cirros',
+ 'password': "root"
+ }
+ }
+ self.result = {}
+
+ def test_capacity_successful_setup(self, mock_ssh):
+ c = storagecapacity.StorageCapacity(self.scn, self.ctx)
+
+ mock_ssh.SSH().execute.return_value = (0, '', '')
+ c.setup()
+ self.assertIsNotNone(c.client)
+ self.assertTrue(c.setup_done)
+
+ def test_capacity_disk_size_successful(self, mock_ssh):
+ c = storagecapacity.StorageCapacity(self.scn, self.ctx)
+
+ mock_ssh.SSH().execute.return_value = (0, DISK_SIZE_SAMPLE_OUTPUT, '')
+ c.run(self.result)
+ expected_result = json.loads(DISK_SIZE_SAMPLE_OUTPUT)
+ self.assertEqual(self.result, expected_result)
+
+ def test_capacity_block_size_successful(self, mock_ssh):
+ args = {
+ "options": {
+ 'test_type': 'block_size'
+ }
+ }
+ c = storagecapacity.StorageCapacity(args, self.ctx)
+
+ mock_ssh.SSH().execute.return_value = (0, BLOCK_SIZE_SAMPLE_OUTPUT, '')
+ c.run(self.result)
+ expected_result = json.loads(BLOCK_SIZE_SAMPLE_OUTPUT)
+ self.assertEqual(self.result, expected_result)
+
+ def test_capacity_disk_utilization_successful(self, mock_ssh):
+ args = {
+ "options": {
+ 'test_type': 'disk_utilization',
+ 'interval': 1,
+ 'count': 2
+ }
+ }
+ c = storagecapacity.StorageCapacity(args, self.ctx)
+
+ mock_ssh.SSH().execute.return_value = (0, DISK_UTIL_RAW_OUTPUT, '')
+ c.run(self.result)
+ expected_result = json.loads(DISK_UTIL_SAMPLE_OUTPUT)
+ self.assertEqual(self.result, expected_result)
+
+ def test_capacity_unsuccessful_script_error(self, mock_ssh):
+ c = storagecapacity.StorageCapacity(self.scn, self.ctx)
+
+ mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
+ self.assertRaises(RuntimeError, c.run, self.result)
+
+def main():
+ unittest.main()
+
+if __name__ == '__main__':
+ main()
diff --git a/yardstick/benchmark/scenarios/storage/storagecapacity.bash b/yardstick/benchmark/scenarios/storage/storagecapacity.bash
new file mode 100644
index 000000000..6ed4b2811
--- /dev/null
+++ b/yardstick/benchmark/scenarios/storage/storagecapacity.bash
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# Measure storage capacity and scale of a host
+
+set -e
+OUTPUT_FILE=/tmp/storagecapacity-out.log
+
+# run disk_size test
+run_disk_size()
+{
+ fdisk -l | grep '^Disk.*bytes$' | awk -F [:,\ ] '{print $2,$7}' > $OUTPUT_FILE
+}
+
+# write the disk size to stdout in json format
+output_disk_size()
+{
+ DEVICENUM=`awk 'END{print NR}' $OUTPUT_FILE`
+ DISKSIZE=`awk 'BEGIN{cnt=0;} {cnt=cnt+$2} END{print cnt}' $OUTPUT_FILE`
+ echo -e "{\
+ \"Number of devices\":\"$DEVICENUM\", \
+ \"Total disk size\":\"$DISKSIZE bytes\" \
+ }"
+}
+
+# run block_size test
+run_block_size()
+{
+ echo -n "" > $OUTPUT_FILE
+ blkdevices=`fdisk -l | grep '^Disk.*bytes$' | awk -F [:,\ ] '{print $2}'`
+ blkdevices=($blkdevices)
+ for bd in "${blkdevices[@]}";do
+ blk_size=`blockdev --getbsz $bd`
+ echo '"'$bd'" '$blk_size >> $OUTPUT_FILE
+ done
+}
+
+# write the block size to stdout in json format
+output_block_size()
+{
+ BLK_SIZE_STR=`awk 'BEGIN{r="{";} {r=r""$1":"$2","} END{print r}' $OUTPUT_FILE`
+ BLK_SIZE_STR=${BLK_SIZE_STR%,}"}"
+ echo $BLK_SIZE_STR
+}
+
+main()
+{
+ test_type=$1
+ case $test_type in
+ "disk_size" )
+ run_disk_size
+ output_disk_size
+ ;;
+ "block_size" )
+ run_block_size
+ output_block_size
+ ;;
+ esac
+}
+
+main $1
diff --git a/yardstick/benchmark/scenarios/storage/storagecapacity.py b/yardstick/benchmark/scenarios/storage/storagecapacity.py
new file mode 100644
index 000000000..49e3a0339
--- /dev/null
+++ b/yardstick/benchmark/scenarios/storage/storagecapacity.py
@@ -0,0 +1,133 @@
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and other.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+import pkg_resources
+import logging
+import json
+
+import yardstick.ssh as ssh
+from yardstick.benchmark.scenarios import base
+
+LOG = logging.getLogger(__name__)
+
+
+class StorageCapacity(base.Scenario):
+ """Measure storage capacity and scale.
+
+ Parameters:
+ test_type - specified whether to measure.
+ valid test type are disk_size, block_size, disk_utilization
+ type: string
+ unit: na
+ default: "disk_size"
+ interval - specified how ofter to stat disk utilization
+ type: int
+ unit: seconds
+ default: 1
+ count - specified how many times to stat disk utilization
+ type: int
+ unit: na
+ default: 15
+
+ This scenario reads hardware specification,
+ disk size, block size and disk utilization.
+ """
+ __scenario_type__ = "StorageCapacity"
+ TARGET_SCRIPT = "storagecapacity.bash"
+
+ def __init__(self, scenario_cfg, context_cfg):
+ self.scenario_cfg = scenario_cfg
+ self.context_cfg = context_cfg
+ self.setup_done = False
+
+ def setup(self):
+ """scenario setup"""
+ self.target_script = pkg_resources.resource_filename(
+ "yardstick.benchmark.scenarios.storage",
+ StorageCapacity.TARGET_SCRIPT)
+ host = self.context_cfg['host']
+ if host is None:
+ raise RuntimeError('No right node.Please check the configuration')
+ host_user = host.get('user', 'ubuntu')
+ host_ip = host.get('ip', None)
+ host_pwd = host.get('password', 'root')
+ LOG.debug("user:%s, host:%s", host_user, host_ip)
+
+ self.client = ssh.SSH(host_user, host_ip, password=host_pwd)
+ self.client.wait(timeout=600)
+
+ # copy script to host
+ self.client.run("cat > ~/storagecapacity.sh",
+ stdin=open(self.target_script, 'rb'))
+
+ self.setup_done = True
+
+ def _get_disk_utilization(self):
+ """Get disk utilization using iostat."""
+ options = self.scenario_cfg["options"]
+ interval = options.get('interval', 1)
+ count = options.get('count', 15)
+
+ cmd = "sudo iostat -dx %d %d | awk 'NF==14 && \
+ $1 !~ /Device/ {print $1,$14}'" % (interval, count)
+
+ LOG.debug("Executing command: %s", cmd)
+ status, stdout, stderr = self.client.execute(cmd)
+ if status:
+ raise RuntimeError(stderr)
+
+ device_name_arr = []
+ min_util_arr = []
+ max_util_arr = []
+ avg_util_arr = []
+ for row in stdout.split('\n'):
+ kv = row.split(' ')
+ if len(kv) != 2:
+ continue
+ name = kv[0]
+ util = float(kv[1])
+ if name not in device_name_arr:
+ device_name_arr.append(name)
+ min_util_arr.append(util)
+ max_util_arr.append(util)
+ avg_util_arr.append(util)
+ else:
+ i = device_name_arr.index(name)
+ min_util_arr[i] = min_util_arr[i] \
+ if min_util_arr[i] < util else util
+ max_util_arr[i] = max_util_arr[i] \
+ if max_util_arr[i] > util else util
+ avg_util_arr[i] += util
+ r = {}
+ for i in range(len(device_name_arr)):
+ r[device_name_arr[i]] = {"min_util": min_util_arr[i],
+ "max_util": max_util_arr[i],
+ "avg_util": avg_util_arr[i]/count}
+ return r
+
+ def run(self, result):
+ """execute the benchmark"""
+
+ if not self.setup_done:
+ self.setup()
+
+ options = self.scenario_cfg["options"]
+ test_type = options.get('test_type', 'disk_size')
+
+ if test_type == "disk_utilization":
+ r = self._get_disk_utilization()
+ result.update(r)
+ else:
+ cmd = "sudo bash storagecapacity.sh " + test_type
+
+ LOG.debug("Executing command: %s", cmd)
+ status, stdout, stderr = self.client.execute(cmd)
+ if status:
+ raise RuntimeError(stderr)
+
+ result.update(json.loads(stdout))