diff options
19 files changed, 3324 insertions, 1231 deletions
diff --git a/dashboard/Yardstick-TC010-1456495940503 b/dashboard/Yardstick-TC010-1456495940503 index 72cb70495..562c7f0ac 100644 --- a/dashboard/Yardstick-TC010-1456495940503 +++ b/dashboard/Yardstick-TC010-1456495940503 @@ -155,7 +155,7 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "timeShift": null, "title": "Memory Latency, lmbench", "tooltip": { @@ -213,9 +213,9 @@ "repeat": "POD", "scopedVars": { "POD": { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true } }, "scroll": true, @@ -299,7 +299,7 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table" @@ -318,9 +318,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true } }, "scroll": true, @@ -404,11 +404,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 5 }, { @@ -425,9 +425,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "intel-pod6", - "value": "intel\\-pod6" + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true } }, "scroll": true, @@ -511,11 +511,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 5 }, { @@ -532,9 +532,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true } }, "scroll": true, @@ -618,11 +618,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 5 }, { @@ -639,9 +639,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true } }, "scroll": true, @@ -725,11 +725,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 5 }, { @@ -746,116 +746,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" - } - }, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "span": 2, - "styles": [ - { - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "date" - }, - { - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 2, - "pattern": "deploy_scenario", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "pattern": "/.*/", - "thresholds": [], - "type": "number", - "unit": "short" - } - ], - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "deploy_scenario" - ], - "type": "tag" - } - ], - "measurement": "opnfv_yardstick_tc010", - "query": "SELECT \"latencies0.latency\" FROM \"opnfv_yardstick_tc010\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "latencies0.latency" - ], - "type": "field" - } - ] - ], - "tags": [ - { - "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" - }, - { - "condition": "AND", - "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" - } - ] - } - ], - "timeFrom": "24h", - "title": "$POD", - "transform": "timeseries_to_rows", - "type": "table", - "repeatIteration": 1456495934825, - "repeatPanelId": 5 - }, - { - "columns": [], - "datasource": "yardstick-vtc", - "editable": true, - "error": false, - "fontSize": "100%", - "id": 20, - "isNew": true, - "links": [], - "minSpan": 2, - "pageSize": null, - "repeat": null, - "scopedVars": { - "POD": { - "selected": true, "text": "zte-pod1", - "value": "zte\\-pod1" + "value": "zte\\-pod1", + "selected": true } }, "scroll": true, @@ -939,11 +832,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 5 } ], @@ -996,9 +889,9 @@ "repeat": "POD", "scopedVars": { "POD": { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true } }, "seriesOverrides": [], @@ -1068,7 +961,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1125,9 +1018,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true } }, "seriesOverrides": [], @@ -1197,7 +1090,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1211,7 +1104,7 @@ "short", "short" ], - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 7 }, { @@ -1256,9 +1149,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "intel-pod6", - "value": "intel\\-pod6" + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true } }, "seriesOverrides": [], @@ -1328,7 +1221,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1342,7 +1235,7 @@ "short", "short" ], - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 7 }, { @@ -1387,9 +1280,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true } }, "seriesOverrides": [], @@ -1459,7 +1352,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1473,7 +1366,7 @@ "short", "short" ], - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 7 }, { @@ -1518,9 +1411,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true } }, "seriesOverrides": [], @@ -1590,7 +1483,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1604,7 +1497,7 @@ "short", "short" ], - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 7 }, { @@ -1649,140 +1542,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" - } - }, - "seriesOverrides": [], - "span": 2, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "$tag_deploy_scenario", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "24h" - ], - "type": "time" - }, - { - "params": [ - "deploy_scenario" - ], - "type": "tag" - }, - { - "params": [ - "pod_name" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "opnfv_yardstick_tc010", - "query": "SELECT mean(\"latencies0.latency\") FROM \"opnfv_yardstick_tc010\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "latencies0.latency" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" - }, - { - "condition": "AND", - "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" - } - ] - } - ], - "timeFrom": "10d", - "timeShift": null, - "title": "$POD", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" - ], - "repeatIteration": 1456495934825, - "repeatPanelId": 7 - }, - { - "aliasColors": {}, - "bars": false, - "datasource": "yardstick-vtc", - "editable": true, - "error": false, - "fill": 1, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 21, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "minSpan": 2, - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "scopedVars": { - "POD": { - "selected": true, "text": "zte-pod1", - "value": "zte\\-pod1" + "value": "zte\\-pod1", + "selected": true } }, "seriesOverrides": [], @@ -1852,7 +1614,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1866,7 +1628,7 @@ "short", "short" ], - "repeatIteration": 1456495934825, + "repeatIteration": 1468224666109, "repeatPanelId": 7 } ], @@ -1908,14 +1670,13 @@ "allFormat": "regex values", "current": { "tags": [], - "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + intel-pod6 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2 + zte-pod1", + "text": "ericsson-pod2 + huawei-pod1 + huawei-pod2 + intel-pod6 + lf-pod2 + zte-pod1", "value": [ "ericsson\\-pod2", - "huawei\\-us\\-deploy\\-bare\\-1", + "huawei\\-pod1", + "huawei\\-pod2", "intel\\-pod6", - "opnfv\\-jump\\-1", - "opnfv\\-jump\\-2", - "orange\\-fr\\-pod2", + "lf\\-pod2", "zte\\-pod1" ] }, @@ -1926,54 +1687,84 @@ "name": "POD", "options": [ { - "selected": false, "text": "All", - "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod6|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|zte\\-pod1|unknown)" + "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 }, { - "selected": false, "text": "elxg482ls42", - "value": "elxg482ls42" + "value": "elxg482ls42", + "selected": false + }, + { + "text": "ericsson-pod1", + "value": "ericsson\\-pod1", + "selected": false }, { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true + }, + { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + }, + { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true }, { - "selected": true, "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "value": "huawei\\-us\\-deploy\\-bare\\-1", + "selected": false + }, + { + "text": "intel-pod5", + "value": "intel\\-pod5", + "selected": false }, { - "selected": true, "text": "intel-pod6", - "value": "intel\\-pod6" + "value": "intel\\-pod6", + "selected": true + }, + { + "text": "lf-pod1", + "value": "lf\\-pod1", + "selected": false + }, + { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true }, { - "selected": true, "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "value": "opnfv\\-jump\\-1", + "selected": false }, { - "selected": true, "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "value": "opnfv\\-jump\\-2", + "selected": false }, { - "selected": true, "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" + "value": "orange\\-fr\\-pod2", + "selected": false }, { - "selected": true, - "text": "zte-pod1", - "value": "zte\\-pod1" + "text": "unknown", + "value": "unknown", + "selected": false }, { - "selected": false, - "text": "unknown", - "value": "unknown" + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": true } ], "query": "SHOW TAG VALUES WITH KEY = \"pod_name\"", @@ -2051,6 +1842,6 @@ "list": [] }, "schemaVersion": 8, - "version": 4, + "version": 3, "links": [] } diff --git a/dashboard/Yardstick-TC011-1456495954966 b/dashboard/Yardstick-TC011-1456495954966 index db8f48ce8..2bca4dece 100644 --- a/dashboard/Yardstick-TC011-1456495954966 +++ b/dashboard/Yardstick-TC011-1456495954966 @@ -154,7 +154,7 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "timeShift": null, "title": "jitter: packet delay variation (ms)", "tooltip": { @@ -212,9 +212,9 @@ "repeat": "POD", "scopedVars": { "POD": { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true } }, "scroll": true, @@ -298,7 +298,7 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table" @@ -317,9 +317,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true } }, "scroll": true, @@ -403,11 +403,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 5 }, { @@ -424,9 +424,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "intel-pod6", - "value": "intel\\-pod6" + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true } }, "scroll": true, @@ -510,11 +510,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 5 }, { @@ -531,9 +531,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true } }, "scroll": true, @@ -617,11 +617,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 5 }, { @@ -638,9 +638,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true } }, "scroll": true, @@ -724,11 +724,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 5 }, { @@ -745,116 +745,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" - } - }, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "span": 2, - "styles": [ - { - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "date" - }, - { - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 2, - "pattern": "deploy_scenario", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 4, - "pattern": "/.*/", - "thresholds": [], - "type": "number", - "unit": "short" - } - ], - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "deploy_scenario" - ], - "type": "tag" - } - ], - "measurement": "opnfv_yardstick_tc011", - "query": "SELECT \"end.sum.jitter_ms\" FROM \"opnfv_yardstick_tc011\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "end.sum.jitter_ms" - ], - "type": "field" - } - ] - ], - "tags": [ - { - "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" - }, - { - "condition": "AND", - "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" - } - ] - } - ], - "timeFrom": "24h", - "title": "$POD", - "transform": "timeseries_to_rows", - "type": "table", - "repeatIteration": 1456495947533, - "repeatPanelId": 5 - }, - { - "columns": [], - "datasource": "yardstick-vtc", - "editable": true, - "error": false, - "fontSize": "100%", - "id": 20, - "isNew": true, - "links": [], - "minSpan": 2, - "pageSize": null, - "repeat": null, - "scopedVars": { - "POD": { - "selected": true, "text": "zte-pod1", - "value": "zte\\-pod1" + "value": "zte\\-pod1", + "selected": true } }, "scroll": true, @@ -938,11 +831,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 5 } ], @@ -995,9 +888,9 @@ "repeat": "POD", "scopedVars": { "POD": { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true } }, "seriesOverrides": [], @@ -1066,7 +959,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1123,9 +1016,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true } }, "seriesOverrides": [], @@ -1194,7 +1087,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1208,7 +1101,7 @@ "short", "short" ], - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 7 }, { @@ -1253,9 +1146,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "intel-pod6", - "value": "intel\\-pod6" + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true } }, "seriesOverrides": [], @@ -1324,7 +1217,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1338,7 +1231,7 @@ "short", "short" ], - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 7 }, { @@ -1383,9 +1276,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true } }, "seriesOverrides": [], @@ -1454,7 +1347,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1468,7 +1361,7 @@ "short", "short" ], - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 7 }, { @@ -1513,9 +1406,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true } }, "seriesOverrides": [], @@ -1584,7 +1477,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1598,7 +1491,7 @@ "short", "short" ], - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 7 }, { @@ -1643,139 +1536,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" - } - }, - "seriesOverrides": [], - "span": 2, - "stack": false, - "steppedLine": false, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "24h" - ], - "type": "time" - }, - { - "params": [ - "deploy_scenario" - ], - "type": "tag" - }, - { - "params": [ - "pod_name" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "opnfv_yardstick_tc011", - "query": "SELECT mean(\"end.sum.jitter_ms\") FROM \"opnfv_yardstick_tc011\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"deploy_scenario\", \"pod_name\" fill(null)", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "end.sum.jitter_ms" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" - }, - { - "condition": "AND", - "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" - } - ] - } - ], - "timeFrom": "10d", - "timeShift": null, - "title": "$POD", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" - ], - "repeatIteration": 1456495947533, - "repeatPanelId": 7 - }, - { - "aliasColors": {}, - "bars": false, - "datasource": "yardstick-vtc", - "editable": true, - "error": false, - "fill": 1, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 21, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "minSpan": 2, - "nullPointMode": "connected", - "percentage": false, - "pointradius": 3, - "points": true, - "renderer": "flot", - "repeat": null, - "scopedVars": { - "POD": { - "selected": true, "text": "zte-pod1", - "value": "zte\\-pod1" + "value": "zte\\-pod1", + "selected": true } }, "seriesOverrides": [], @@ -1844,7 +1607,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1858,7 +1621,7 @@ "short", "short" ], - "repeatIteration": 1456495947533, + "repeatIteration": 1468225357451, "repeatPanelId": 7 } ], @@ -1900,14 +1663,13 @@ "allFormat": "regex values", "current": { "tags": [], - "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + intel-pod6 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2 + zte-pod1", + "text": "ericsson-pod2 + huawei-pod1 + huawei-pod2 + intel-pod6 + lf-pod2 + zte-pod1", "value": [ "ericsson\\-pod2", - "huawei\\-us\\-deploy\\-bare\\-1", + "huawei\\-pod1", + "huawei\\-pod2", "intel\\-pod6", - "opnfv\\-jump\\-1", - "opnfv\\-jump\\-2", - "orange\\-fr\\-pod2", + "lf\\-pod2", "zte\\-pod1" ] }, @@ -1918,54 +1680,84 @@ "name": "POD", "options": [ { - "selected": false, "text": "All", - "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod6|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|zte\\-pod1|unknown)" + "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 }, { - "selected": false, "text": "elxg482ls42", - "value": "elxg482ls42" + "value": "elxg482ls42", + "selected": false + }, + { + "text": "ericsson-pod1", + "value": "ericsson\\-pod1", + "selected": false }, { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true + }, + { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + }, + { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true }, { - "selected": true, "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "value": "huawei\\-us\\-deploy\\-bare\\-1", + "selected": false + }, + { + "text": "intel-pod5", + "value": "intel\\-pod5", + "selected": false }, { - "selected": true, "text": "intel-pod6", - "value": "intel\\-pod6" + "value": "intel\\-pod6", + "selected": true + }, + { + "text": "lf-pod1", + "value": "lf\\-pod1", + "selected": false + }, + { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true }, { - "selected": true, "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "value": "opnfv\\-jump\\-1", + "selected": false }, { - "selected": true, "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "value": "opnfv\\-jump\\-2", + "selected": false }, { - "selected": true, "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" + "value": "orange\\-fr\\-pod2", + "selected": false }, { - "selected": true, - "text": "zte-pod1", - "value": "zte\\-pod1" + "text": "unknown", + "value": "unknown", + "selected": false }, { - "selected": false, - "text": "unknown", - "value": "unknown" + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": true } ], "query": "SHOW TAG VALUES WITH KEY = \"pod_name\"", @@ -2044,6 +1836,6 @@ }, "refresh": "15m", "schemaVersion": 8, - "version": 11, + "version": 2, "links": [] } diff --git a/dashboard/Yardstick-TC012-1456495966540 b/dashboard/Yardstick-TC012-1456495966540 index 0cab51702..c170897f5 100644 --- a/dashboard/Yardstick-TC012-1456495966540 +++ b/dashboard/Yardstick-TC012-1456495966540 @@ -88,12 +88,6 @@ "groupBy": [ { "params": [ - "24h" - ], - "type": "time" - }, - { - "params": [ "pod_name" ], "type": "tag" @@ -106,7 +100,7 @@ } ], "measurement": "opnfv_yardstick_tc012", - "query": "SELECT mean(\"bandwidth(MBps)\") FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY time(24h), \"pod_name\", \"deploy_scenario\"", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"pod_name\", \"deploy_scenario\"", "refId": "A", "resultFormat": "time_series", "select": [ @@ -116,10 +110,6 @@ "bandwidth(MBps)" ], "type": "field" - }, - { - "params": [], - "type": "mean" } ] ], @@ -138,7 +128,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "Memory read/write bandwidth trend", "tooltip": { @@ -157,92 +147,1103 @@ "title": "New row" }, { - "collapse": false, - "editable": true, + "title": "New row", "height": "250px", + "editable": true, + "collapse": false, "panels": [ { - "aliasColors": {}, - "bars": false, + "title": "Daily Averages", + "error": false, + "span": 12, + "editable": true, + "type": "text", + "isNew": true, + "id": 4, + "mode": "markdown", + "content": "", + "style": {}, + "links": [], + "height": "0" + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "table", + "isNew": true, + "id": 5, + "styles": [ + { + "type": "date", + "pattern": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss" + }, + { + "unit": "short", + "type": "number", + "decimals": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "colorMode": null, + "pattern": "", + "thresholds": [] + } + ], + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + }, + { + "refId": "B", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + } + ], + "transform": "timeseries_to_rows", + "pageSize": null, + "showHeader": true, + "columns": [], + "scroll": true, + "fontSize": "100%", + "sort": { + "col": 0, + "desc": true + }, + "links": [], + "repeat": "POD", + "minSpan": 2, "datasource": "yardstick-vtc", + "timeFrom": "14d", + "scopedVars": { + "POD": { + "text": "ericsson-pod2", + "value": "ericsson\\-pod2", + "selected": true + } + } + }, + { + "title": "$POD", + "error": false, + "span": 2, "editable": true, + "type": "table", + "isNew": true, + "id": 6, + "styles": [ + { + "type": "date", + "pattern": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss" + }, + { + "unit": "short", + "type": "number", + "decimals": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "colorMode": null, + "pattern": "", + "thresholds": [] + } + ], + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + }, + { + "refId": "B", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + } + ], + "transform": "timeseries_to_rows", + "pageSize": null, + "showHeader": true, + "columns": [], + "scroll": true, + "fontSize": "100%", + "sort": { + "col": 0, + "desc": true + }, + "links": [], + "repeat": null, + "minSpan": 2, + "datasource": "yardstick-vtc", + "timeFrom": "14d", + "scopedVars": { + "POD": { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 5 + }, + { + "title": "$POD", "error": false, - "fill": 0, + "span": 2, + "editable": true, + "type": "table", + "isNew": true, + "id": 7, + "styles": [ + { + "type": "date", + "pattern": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss" + }, + { + "unit": "short", + "type": "number", + "decimals": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "colorMode": null, + "pattern": "", + "thresholds": [] + } + ], + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + }, + { + "refId": "B", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + } + ], + "transform": "timeseries_to_rows", + "pageSize": null, + "showHeader": true, + "columns": [], + "scroll": true, + "fontSize": "100%", + "sort": { + "col": 0, + "desc": true + }, + "links": [], + "repeat": null, + "minSpan": 2, + "datasource": "yardstick-vtc", + "timeFrom": "14d", + "scopedVars": { + "POD": { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 5 + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "table", + "isNew": true, + "id": 8, + "styles": [ + { + "type": "date", + "pattern": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss" + }, + { + "unit": "short", + "type": "number", + "decimals": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "colorMode": null, + "pattern": "", + "thresholds": [] + } + ], + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + }, + { + "refId": "B", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + } + ], + "transform": "timeseries_to_rows", + "pageSize": null, + "showHeader": true, + "columns": [], + "scroll": true, + "fontSize": "100%", + "sort": { + "col": 0, + "desc": true + }, + "links": [], + "repeat": null, + "minSpan": 2, + "datasource": "yardstick-vtc", + "timeFrom": "14d", + "scopedVars": { + "POD": { + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 5 + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "table", + "isNew": true, + "id": 15, + "styles": [ + { + "type": "date", + "pattern": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss" + }, + { + "unit": "short", + "type": "number", + "decimals": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "colorMode": null, + "pattern": "", + "thresholds": [] + } + ], + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + }, + { + "refId": "B", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + } + ], + "transform": "timeseries_to_rows", + "pageSize": null, + "showHeader": true, + "columns": [], + "scroll": true, + "fontSize": "100%", + "sort": { + "col": 0, + "desc": true + }, + "links": [], + "repeat": null, + "minSpan": 2, + "datasource": "yardstick-vtc", + "timeFrom": "14d", + "scopedVars": { + "POD": { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 5 + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "table", + "isNew": true, + "id": 22, + "styles": [ + { + "type": "date", + "pattern": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss" + }, + { + "unit": "short", + "type": "number", + "decimals": 2, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "colorMode": null, + "pattern": "", + "thresholds": [] + } + ], + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + }, + { + "refId": "B", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"" + } + ], + "transform": "timeseries_to_rows", + "pageSize": null, + "showHeader": true, + "columns": [], + "scroll": true, + "fontSize": "100%", + "sort": { + "col": 0, + "desc": true + }, + "links": [], + "repeat": null, + "minSpan": 2, + "datasource": "yardstick-vtc", + "timeFrom": "14d", + "scopedVars": { + "POD": { + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 5 + } + ] + }, + { + "title": "New row", + "height": "250px", + "editable": true, + "collapse": false, + "panels": [ + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "graph", + "isNew": true, + "id": 17, + "datasource": "yardstick-vtc", + "renderer": "flot", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "short", + "short" + ], "grid": { "leftLogBase": 1, "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, "rightMax": null, + "leftMin": null, "rightMin": null, + "rightLogBase": 1, "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", "threshold2Color": "rgba(234, 112, 112, 0.22)" }, - "id": 1, - "isNew": true, - "leftYAxisLabel": "BW (MB/s)", + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "max": true, - "min": true, "show": true, + "values": false, + "min": false, + "max": false, + "current": false, "total": false, - "values": true + "avg": false }, - "lines": true, - "linewidth": 2, - "links": [], "nullPointMode": "connected", - "percentage": false, - "pointradius": 2, - "points": true, - "renderer": "flot", - "seriesOverrides": [], - "span": 12, - "stack": false, "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true + }, + "timeFrom": "14d", + "timeShift": null, "targets": [ { - "alias": "$tag_pod_name - $tag_deploy_scenario - bw", + "refId": "A", "dsType": "influxdb", - "groupBy": [ + "resultFormat": "time_series", + "tags": [ { - "params": [ - "pod_name" - ], - "type": "tag" + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" }, { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", "params": [ "deploy_scenario" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ - "task_id" - ], - "type": "tag" + "installer" + ] } ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], "measurement": "opnfv_yardstick_tc012", - "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"pod_name\", \"deploy_scenario\", \"task_id\"", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", + "alias": "$tag_deploy_scenario - mean bw" + } + ], + "aliasColors": {}, + "seriesOverrides": [], + "links": [], + "repeat": "POD", + "minSpan": 2, + "scopedVars": { + "POD": { + "text": "ericsson-pod2", + "value": "ericsson\\-pod2", + "selected": true + } + } + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "graph", + "isNew": true, + "id": 18, + "datasource": "yardstick-vtc", + "renderer": "flot", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "short", + "short" + ], + "grid": { + "leftLogBase": 1, + "leftMax": null, + "rightMax": null, + "leftMin": null, + "rightMin": null, + "rightLogBase": 1, + "threshold1": null, + "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, + "legend": { + "show": true, + "values": false, + "min": false, + "max": false, + "current": false, + "total": false, + "avg": false + }, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true + }, + "timeFrom": "14d", + "timeShift": null, + "targets": [ + { "refId": "A", + "dsType": "influxdb", "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + }, + { + "type": "tag", + "params": [ + "installer" + ] + } + ], "select": [ [ { + "type": "field", "params": [ "bandwidth(MBps)" - ], - "type": "field" + ] } ] ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", + "alias": "$tag_deploy_scenario - mean bw" + } + ], + "aliasColors": {}, + "seriesOverrides": [], + "links": [], + "repeat": null, + "minSpan": 2, + "scopedVars": { + "POD": { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 17 + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "graph", + "isNew": true, + "id": 19, + "datasource": "yardstick-vtc", + "renderer": "flot", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "short", + "short" + ], + "grid": { + "leftLogBase": 1, + "leftMax": null, + "rightMax": null, + "leftMin": null, + "rightMin": null, + "rightLogBase": 1, + "threshold1": null, + "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, + "legend": { + "show": true, + "values": false, + "min": false, + "max": false, + "current": false, + "total": false, + "avg": false + }, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true + }, + "timeFrom": "14d", + "timeShift": null, + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", "tags": [ { "key": "pod_name", @@ -255,46 +1256,224 @@ "operator": "=~", "value": "/$SCENARIO$/" } - ] - }, - { - "alias": "$tag_pod_name - $tag_deploy_scenario - size", - "dsType": "influxdb", + ], "groupBy": [ { + "type": "tag", "params": [ - "pod_name" - ], - "type": "tag" + "deploy_scenario" + ] }, { + "type": "tag", + "params": [ + "installer" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", + "alias": "$tag_deploy_scenario - mean bw" + } + ], + "aliasColors": {}, + "seriesOverrides": [], + "links": [], + "repeat": null, + "minSpan": 2, + "scopedVars": { + "POD": { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 17 + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "graph", + "isNew": true, + "id": 20, + "datasource": "yardstick-vtc", + "renderer": "flot", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "short", + "short" + ], + "grid": { + "leftLogBase": 1, + "leftMax": null, + "rightMax": null, + "leftMin": null, + "rightMin": null, + "rightLogBase": 1, + "threshold1": null, + "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, + "legend": { + "show": true, + "values": false, + "min": false, + "max": false, + "current": false, + "total": false, + "avg": false + }, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true + }, + "timeFrom": "14d", + "timeShift": null, + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", "params": [ "deploy_scenario" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ - "task_id" - ], - "type": "tag" + "installer" + ] } ], - "hide": true, - "measurement": "opnfv_yardstick_tc012", - "query": "SELECT \"size(MB)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"pod_name\", \"deploy_scenario\", \"task_id\"", - "refId": "B", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ - "size(MB)" - ], - "type": "field" + "bandwidth(MBps)" + ] } ] ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", + "alias": "$tag_deploy_scenario - mean bw" + } + ], + "aliasColors": {}, + "seriesOverrides": [], + "links": [], + "repeat": null, + "minSpan": 2, + "scopedVars": { + "POD": { + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 17 + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, + "type": "graph", + "isNew": true, + "id": 21, + "datasource": "yardstick-vtc", + "renderer": "flot", + "x-axis": true, + "y-axis": true, + "y_formats": [ + "short", + "short" + ], + "grid": { + "leftLogBase": 1, + "leftMax": null, + "rightMax": null, + "leftMin": null, + "rightMin": null, + "rightLogBase": 1, + "threshold1": null, + "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, + "legend": { + "show": true, + "values": false, + "min": false, + "max": false, + "current": false, + "total": false, + "avg": false + }, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true + }, + "timeFrom": "14d", + "timeShift": null, + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", "tags": [ { "key": "pod_name", @@ -307,31 +1486,172 @@ "operator": "=~", "value": "/$SCENARIO$/" } - ] + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + }, + { + "type": "tag", + "params": [ + "installer" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", + "alias": "$tag_deploy_scenario - mean bw" } ], - "timeFrom": null, - "timeShift": null, - "title": "Memory read/write bandwidth", - "tooltip": { - "shared": true, - "value_type": "cumulative" + "aliasColors": {}, + "seriesOverrides": [], + "links": [], + "repeat": null, + "minSpan": 2, + "scopedVars": { + "POD": { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true + } }, + "repeatIteration": 1468305923981, + "repeatPanelId": 17 + }, + { + "title": "$POD", + "error": false, + "span": 2, + "editable": true, "type": "graph", + "isNew": true, + "id": 32, + "datasource": "yardstick-vtc", + "renderer": "flot", "x-axis": true, "y-axis": true, "y_formats": [ "short", "short" - ] + ], + "grid": { + "leftLogBase": 1, + "leftMax": null, + "rightMax": null, + "leftMin": null, + "rightMin": null, + "rightLogBase": 1, + "threshold1": null, + "threshold2": null, + "threshold1Color": "rgba(216, 200, 27, 0.27)", + "threshold2Color": "rgba(234, 112, 112, 0.22)" + }, + "lines": true, + "fill": 1, + "linewidth": 2, + "points": false, + "pointradius": 5, + "bars": false, + "stack": false, + "percentage": false, + "legend": { + "show": true, + "values": false, + "min": false, + "max": false, + "current": false, + "total": false, + "avg": false + }, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "shared": true + }, + "timeFrom": "14d", + "timeShift": null, + "targets": [ + { + "refId": "A", + "dsType": "influxdb", + "resultFormat": "time_series", + "tags": [ + { + "key": "pod_name", + "operator": "=~", + "value": "/$POD$/" + }, + { + "condition": "AND", + "key": "deploy_scenario", + "operator": "=~", + "value": "/$SCENARIO$/" + } + ], + "groupBy": [ + { + "type": "tag", + "params": [ + "deploy_scenario" + ] + }, + { + "type": "tag", + "params": [ + "installer" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "bandwidth(MBps)" + ] + } + ] + ], + "measurement": "opnfv_yardstick_tc012", + "query": "SELECT \"bandwidth(MBps)\" FROM \"opnfv_yardstick_tc012\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", + "alias": "$tag_deploy_scenario - mean bw" + } + ], + "aliasColors": {}, + "seriesOverrides": [], + "links": [], + "repeat": null, + "minSpan": 2, + "scopedVars": { + "POD": { + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": true + } + }, + "repeatIteration": 1468305923981, + "repeatPanelId": 17 } - ], - "title": "Row" + ] } ], "time": { - "from": "2016-02-04T18:05:28.864Z", - "to": "2016-02-23T22:06:14.432Z" + "from": "now-7d", + "to": "now" }, "timepicker": { "now": true, @@ -365,14 +1685,13 @@ "allFormat": "regex values", "current": { "tags": [], - "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + intel-pod6 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2 + zte-pod1", + "text": "ericsson-pod2 + huawei-pod1 + huawei-pod2 + intel-pod6 + lf-pod2 + zte-pod1", "value": [ "ericsson\\-pod2", - "huawei\\-us\\-deploy\\-bare\\-1", + "huawei\\-pod1", + "huawei\\-pod2", "intel\\-pod6", - "opnfv\\-jump\\-1", - "opnfv\\-jump\\-2", - "orange\\-fr\\-pod2", + "lf\\-pod2", "zte\\-pod1" ] }, @@ -383,54 +1702,84 @@ "name": "POD", "options": [ { - "selected": false, "text": "All", - "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod6|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|zte\\-pod1|unknown)" + "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 }, { - "selected": false, "text": "elxg482ls42", - "value": "elxg482ls42" + "value": "elxg482ls42", + "selected": false + }, + { + "text": "ericsson-pod1", + "value": "ericsson\\-pod1", + "selected": false }, { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true + }, + { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + }, + { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true }, { - "selected": true, "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "value": "huawei\\-us\\-deploy\\-bare\\-1", + "selected": false + }, + { + "text": "intel-pod5", + "value": "intel\\-pod5", + "selected": false }, { - "selected": true, "text": "intel-pod6", - "value": "intel\\-pod6" + "value": "intel\\-pod6", + "selected": true + }, + { + "text": "lf-pod1", + "value": "lf\\-pod1", + "selected": false + }, + { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true }, { - "selected": true, "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "value": "opnfv\\-jump\\-1", + "selected": false }, { - "selected": true, "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "value": "opnfv\\-jump\\-2", + "selected": false }, { - "selected": true, "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" + "value": "orange\\-fr\\-pod2", + "selected": false }, { - "selected": true, - "text": "zte-pod1", - "value": "zte\\-pod1" + "text": "unknown", + "value": "unknown", + "selected": false }, { - "selected": false, - "text": "unknown", - "value": "unknown" + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": true } ], "query": "SHOW TAG VALUES WITH KEY = \"pod_name\" ", @@ -440,9 +1789,9 @@ { "allFormat": "regex values", "current": { - "tags": [], "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "tags": [] }, "datasource": "yardstick-vtc", "includeAll": true, @@ -451,49 +1800,84 @@ "name": "SCENARIO", "options": [ { - "selected": true, "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "selected": true + }, + { + "text": "os-no_sdn-ovs-ha", + "value": "os\\-no_sdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-nosdn-kvm-ha", + "value": "os\\-nosdn\\-kvm\\-ha", + "selected": false }, { - "selected": false, "text": "os-nosdn-nofeature-ha", - "value": "os\\-nosdn\\-nofeature\\-ha" + "value": "os\\-nosdn\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-nosdn-nofeature-noha", + "value": "os\\-nosdn\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-nosdn-ovs-ha", - "value": "os\\-nosdn\\-ovs\\-ha" + "value": "os\\-nosdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-ocl-nofeature-ha", + "value": "os\\-ocl\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-bgpvpn-ha", - "value": "os\\-odl_l2\\-bgpvpn\\-ha" + "value": "os\\-odl_l2\\-bgpvpn\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-ha", - "value": "os\\-odl_l2\\-nofeature\\-ha" + "value": "os\\-odl_l2\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-noha", - "value": "os\\-odl_l2\\-nofeature\\-noha" + "value": "os\\-odl_l2\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-sfc-ha", - "value": "os\\-odl_l2\\-sfc\\-ha" + "value": "os\\-odl_l2\\-sfc\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l3-nofeature-ha", - "value": "os\\-odl_l3\\-nofeature\\-ha" + "value": "os\\-odl_l3\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-onos-nofeature-ha", - "value": "os\\-onos\\-nofeature\\-ha" + "value": "os\\-onos\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-onos-sfc-ha", + "value": "os\\-onos\\-sfc\\-ha", + "selected": false + }, + { + "text": "os-ovs-nofeature-ha", + "value": "os\\-ovs\\-nofeature\\-ha", + "selected": false + }, + { + "text": "unknown", + "value": "unknown", + "selected": false } ], "query": "SHOW TAG VALUES WITH KEY = \"deploy_scenario\" ", @@ -505,8 +1889,8 @@ "annotations": { "list": [] }, - "refresh": false, + "refresh": "30m", "schemaVersion": 8, - "version": 29, + "version": 3, "links": [] } diff --git a/dashboard/Yardstick-TC014-1456496016450 b/dashboard/Yardstick-TC014-1456496016450 index a06ddb603..fb6badedc 100644 --- a/dashboard/Yardstick-TC014-1456496016450 +++ b/dashboard/Yardstick-TC014-1456496016450 @@ -158,7 +158,7 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "timeShift": null, "title": "Processor Speed - Unixbench single score", "tooltip": { @@ -216,9 +216,9 @@ "repeat": "POD", "scopedVars": { "POD": { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true } }, "scroll": true, @@ -302,7 +302,7 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table" @@ -321,9 +321,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true } }, "scroll": true, @@ -407,11 +407,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 6 }, { @@ -428,9 +428,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "intel-pod6", - "value": "intel\\-pod6" + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true } }, "scroll": true, @@ -514,11 +514,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 6 }, { @@ -535,9 +535,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true } }, "scroll": true, @@ -621,11 +621,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 6 }, { @@ -642,9 +642,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true } }, "scroll": true, @@ -728,11 +728,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 6 }, { @@ -749,116 +749,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" - } - }, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "span": 2, - "styles": [ - { - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "date" - }, - { - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 2, - "pattern": "deploy_scenario", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "pattern": "/.*/", - "thresholds": [], - "type": "number", - "unit": "short" - } - ], - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "deploy_scenario" - ], - "type": "tag" - } - ], - "measurement": "opnfv_yardstick_tc014", - "query": "SELECT \"parallel_score\" FROM \"opnfv_yardstick_tc014\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\"", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "parallel_score" - ], - "type": "field" - } - ] - ], - "tags": [ - { - "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" - }, - { - "condition": "AND", - "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" - } - ] - } - ], - "timeFrom": "24h", - "title": "$POD", - "transform": "timeseries_to_rows", - "type": "table", - "repeatIteration": 1456496008517, - "repeatPanelId": 6 - }, - { - "columns": [], - "datasource": "yardstick-vtc", - "editable": true, - "error": false, - "fontSize": "90%", - "id": 24, - "isNew": true, - "links": [], - "minSpan": 2, - "pageSize": null, - "repeat": null, - "scopedVars": { - "POD": { - "selected": true, "text": "zte-pod1", - "value": "zte\\-pod1" + "value": "zte\\-pod1", + "selected": true } }, "scroll": true, @@ -942,11 +835,11 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "title": "$POD", "transform": "timeseries_to_rows", "type": "table", - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 6 } ], @@ -1000,9 +893,9 @@ "repeat": "POD", "scopedVars": { "POD": { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true } }, "seriesOverrides": [ @@ -1061,7 +954,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1119,9 +1012,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true } }, "seriesOverrides": [ @@ -1180,7 +1073,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1194,7 +1087,7 @@ "short", "short" ], - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 5 }, { @@ -1240,9 +1133,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "intel-pod6", - "value": "intel\\-pod6" + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true } }, "seriesOverrides": [ @@ -1301,7 +1194,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1315,7 +1208,7 @@ "short", "short" ], - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 5 }, { @@ -1361,9 +1254,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": true } }, "seriesOverrides": [ @@ -1422,7 +1315,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1436,7 +1329,7 @@ "short", "short" ], - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 5 }, { @@ -1482,9 +1375,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true } }, "seriesOverrides": [ @@ -1543,7 +1436,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1557,7 +1450,7 @@ "short", "short" ], - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 5 }, { @@ -1603,130 +1496,9 @@ "repeat": null, "scopedVars": { "POD": { - "selected": true, - "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" - } - }, - "seriesOverrides": [ - { - "alias": "os-odl_l2-bgpvpn-ha", - "color": "#7EB26D" - } - ], - "span": 2, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "$tag_deploy_scenario", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "deploy_scenario" - ], - "type": "tag" - }, - { - "params": [ - "pod_name" - ], - "type": "tag" - } - ], - "measurement": "opnfv_yardstick_tc014", - "query": "SELECT \"single_score\" FROM \"opnfv_yardstick_tc014\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"deploy_scenario\", \"pod_name\"", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "single_score" - ], - "type": "field" - } - ] - ], - "tags": [ - { - "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" - }, - { - "condition": "AND", - "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" - } - ] - } - ], - "timeFrom": "10d", - "timeShift": null, - "title": "$POD", - "tooltip": { - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "y-axis": true, - "y_formats": [ - "short", - "short" - ], - "repeatIteration": 1456496008517, - "repeatPanelId": 5 - }, - { - "aliasColors": {}, - "bars": false, - "datasource": "yardstick-vtc", - "editable": true, - "error": false, - "fill": 1, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": 0, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null, - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 25, - "isNew": true, - "leftYAxisLabel": "score", - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "minSpan": 2, - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": true, - "renderer": "flot", - "repeat": null, - "scopedVars": { - "POD": { - "selected": true, "text": "zte-pod1", - "value": "zte\\-pod1" + "value": "zte\\-pod1", + "selected": true } }, "seriesOverrides": [ @@ -1785,7 +1557,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "$POD", "tooltip": { @@ -1799,7 +1571,7 @@ "short", "short" ], - "repeatIteration": 1456496008517, + "repeatIteration": 1468309859583, "repeatPanelId": 5 } ], @@ -1907,7 +1679,7 @@ ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "timeShift": null, "title": "Processor Speed - Unixbench parallel score", "tooltip": { @@ -1962,14 +1734,13 @@ "allFormat": "regex values", "current": { "tags": [], - "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + intel-pod6 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2 + zte-pod1", + "text": "ericsson-pod2 + huawei-pod1 + huawei-pod2 + intel-pod6 + lf-pod2 + zte-pod1", "value": [ "ericsson\\-pod2", - "huawei\\-us\\-deploy\\-bare\\-1", + "huawei\\-pod1", + "huawei\\-pod2", "intel\\-pod6", - "opnfv\\-jump\\-1", - "opnfv\\-jump\\-2", - "orange\\-fr\\-pod2", + "lf\\-pod2", "zte\\-pod1" ] }, @@ -1980,54 +1751,84 @@ "name": "POD", "options": [ { - "selected": false, "text": "All", - "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod6|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|unknown)" + "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 }, { - "selected": false, "text": "elxg482ls42", - "value": "elxg482ls42" + "value": "elxg482ls42", + "selected": false + }, + { + "text": "ericsson-pod1", + "value": "ericsson\\-pod1", + "selected": false }, { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true + }, + { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + }, + { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true }, { - "selected": true, "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "value": "huawei\\-us\\-deploy\\-bare\\-1", + "selected": false + }, + { + "text": "intel-pod5", + "value": "intel\\-pod5", + "selected": false }, { - "selected": true, "text": "intel-pod6", - "value": "intel\\-pod6" + "value": "intel\\-pod6", + "selected": true + }, + { + "text": "lf-pod1", + "value": "lf\\-pod1", + "selected": false + }, + { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true }, { - "selected": true, "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "value": "opnfv\\-jump\\-1", + "selected": false }, { - "selected": true, "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "value": "opnfv\\-jump\\-2", + "selected": false }, { - "selected": true, "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" + "value": "orange\\-fr\\-pod2", + "selected": false }, { - "selected": true, - "text": "zte-pod1", - "value": "zte\\-pod1" + "text": "unknown", + "value": "unknown", + "selected": false }, { - "selected": false, - "text": "unknown", - "value": "unknown" + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": true } ], "query": "SHOW TAG VALUES WITH KEY = \"pod_name\"", @@ -2038,9 +1839,9 @@ { "allFormat": "regex values", "current": { - "tags": [], "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "tags": [] }, "datasource": "yardstick-vtc", "includeAll": true, @@ -2049,49 +1850,84 @@ "name": "SCENARIO", "options": [ { - "selected": true, "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "selected": true + }, + { + "text": "os-no_sdn-ovs-ha", + "value": "os\\-no_sdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-nosdn-kvm-ha", + "value": "os\\-nosdn\\-kvm\\-ha", + "selected": false }, { - "selected": false, "text": "os-nosdn-nofeature-ha", - "value": "os\\-nosdn\\-nofeature\\-ha" + "value": "os\\-nosdn\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-nosdn-nofeature-noha", + "value": "os\\-nosdn\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-nosdn-ovs-ha", - "value": "os\\-nosdn\\-ovs\\-ha" + "value": "os\\-nosdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-ocl-nofeature-ha", + "value": "os\\-ocl\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-bgpvpn-ha", - "value": "os\\-odl_l2\\-bgpvpn\\-ha" + "value": "os\\-odl_l2\\-bgpvpn\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-ha", - "value": "os\\-odl_l2\\-nofeature\\-ha" + "value": "os\\-odl_l2\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-noha", - "value": "os\\-odl_l2\\-nofeature\\-noha" + "value": "os\\-odl_l2\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-sfc-ha", - "value": "os\\-odl_l2\\-sfc\\-ha" + "value": "os\\-odl_l2\\-sfc\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l3-nofeature-ha", - "value": "os\\-odl_l3\\-nofeature\\-ha" + "value": "os\\-odl_l3\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-onos-nofeature-ha", - "value": "os\\-onos\\-nofeature\\-ha" + "value": "os\\-onos\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-onos-sfc-ha", + "value": "os\\-onos\\-sfc\\-ha", + "selected": false + }, + { + "text": "os-ovs-nofeature-ha", + "value": "os\\-ovs\\-nofeature\\-ha", + "selected": false + }, + { + "text": "unknown", + "value": "unknown", + "selected": false } ], "query": "SHOW TAG VALUES WITH KEY = \"deploy_scenario\"", @@ -2106,6 +1942,6 @@ }, "refresh": "5m", "schemaVersion": 8, - "version": 13, + "version": 2, "links": [] } diff --git a/dashboard/Yardstick-TC027-1456496061153 b/dashboard/Yardstick-TC027-1456496061153 index e52d08ab7..4531c1552 100644 --- a/dashboard/Yardstick-TC027-1456496061153 +++ b/dashboard/Yardstick-TC027-1456496061153 @@ -103,30 +103,24 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod_name - $tag_deploy_scenario", + "alias": "", "dsType": "influxdb", "groupBy": [ { + "type": "tag", "params": [ - "pod_name" - ], - "type": "tag" - }, - { - "params": [ - "task_id" - ], - "type": "tag" + "deploy_scenario" + ] }, { + "type": "tag", "params": [ - "deploy_scenario" - ], - "type": "tag" + "installer" + ] } ], "measurement": "opnfv_yardstick_tc027", - "query": "SELECT \"rtt\" FROM \"opnfv_yardstick_tc027\" WHERE \"pod_name\" =~ /$POD$/ AND \"deploy_scenario\" =~ /$SCENARIO$/ AND $timeFilter GROUP BY \"pod_name\", \"task_id\", \"deploy_scenario\"", + "query": "SELECT \"rtt\" FROM \"opnfv_yardstick_tc027\" WHERE \"pod_name\" = 'huawei-pod1' AND \"deploy_scenario\" = 'os-nosdn-nofeature-ha' AND $timeFilter GROUP BY \"deploy_scenario\", \"installer\"", "refId": "A", "resultFormat": "time_series", "select": [ @@ -142,19 +136,19 @@ "tags": [ { "key": "pod_name", - "operator": "=~", - "value": "/$POD$/" + "operator": "=", + "value": "huawei-pod1" }, { "condition": "AND", "key": "deploy_scenario", - "operator": "=~", - "value": "/$SCENARIO$/" + "operator": "=", + "value": "os-nosdn-nofeature-ha" } ] } ], - "timeFrom": "24h", + "timeFrom": "14d", "timeShift": null, "title": "RTT", "tooltip": { @@ -282,8 +276,8 @@ ] } ], - "timeFrom": "24h", - "title": "Panel Title", + "timeFrom": "14d", + "title": "$POD", "transform": "timeseries_to_rows", "type": "table" } @@ -384,9 +378,9 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, - "title": "Panel Title", + "title": "$POD", "tooltip": { "shared": true, "value_type": "cumulative" @@ -397,7 +391,8 @@ "y_formats": [ "short", "short" - ] + ], + "links": [] } ], "title": "New row" @@ -439,14 +434,8 @@ "allFormat": "regex values", "current": { "tags": [], - "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2", - "value": [ - "ericsson\\-pod2", - "huawei\\-us\\-deploy\\-bare\\-1", - "opnfv\\-jump\\-1", - "opnfv\\-jump\\-2", - "orange\\-fr\\-pod2" - ] + "text": "huawei-pod1", + "value": "huawei\\-pod1" }, "datasource": "yardstick-vtc", "includeAll": true, @@ -455,44 +444,84 @@ "name": "POD", "options": [ { - "selected": false, "text": "All", - "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|unknown)" + "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 }, { - "selected": false, "text": "elxg482ls42", - "value": "elxg482ls42" + "value": "elxg482ls42", + "selected": false + }, + { + "text": "ericsson-pod1", + "value": "ericsson\\-pod1", + "selected": false }, { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": false + }, + { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + }, + { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": false }, { - "selected": true, "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "value": "huawei\\-us\\-deploy\\-bare\\-1", + "selected": false + }, + { + "text": "intel-pod5", + "value": "intel\\-pod5", + "selected": false + }, + { + "text": "intel-pod6", + "value": "intel\\-pod6", + "selected": false + }, + { + "text": "lf-pod1", + "value": "lf\\-pod1", + "selected": false + }, + { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": false }, { - "selected": true, "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "value": "opnfv\\-jump\\-1", + "selected": false }, { - "selected": true, "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "value": "opnfv\\-jump\\-2", + "selected": false }, { - "selected": true, "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" + "value": "orange\\-fr\\-pod2", + "selected": false }, { - "selected": false, "text": "unknown", - "value": "unknown" + "value": "unknown", + "selected": false + }, + { + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": false } ], "query": "SHOW TAG VALUES WITH KEY = \"pod_name\"", @@ -502,9 +531,12 @@ { "allFormat": "regex values", "current": { - "tags": [], - "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "text": "os-nosdn-nofeature-ha + os-nosdn-nofeature-noha", + "value": [ + "os\\-nosdn\\-nofeature\\-ha", + "os\\-nosdn\\-nofeature\\-noha" + ], + "tags": [] }, "datasource": "yardstick-vtc", "includeAll": true, @@ -513,49 +545,84 @@ "name": "SCENARIO", "options": [ { - "selected": true, "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "selected": false + }, + { + "text": "os-no_sdn-ovs-ha", + "value": "os\\-no_sdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-nosdn-kvm-ha", + "value": "os\\-nosdn\\-kvm\\-ha", + "selected": false }, { - "selected": false, "text": "os-nosdn-nofeature-ha", - "value": "os\\-nosdn\\-nofeature\\-ha" + "value": "os\\-nosdn\\-nofeature\\-ha", + "selected": true + }, + { + "text": "os-nosdn-nofeature-noha", + "value": "os\\-nosdn\\-nofeature\\-noha", + "selected": true }, { - "selected": false, "text": "os-nosdn-ovs-ha", - "value": "os\\-nosdn\\-ovs\\-ha" + "value": "os\\-nosdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-ocl-nofeature-ha", + "value": "os\\-ocl\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-bgpvpn-ha", - "value": "os\\-odl_l2\\-bgpvpn\\-ha" + "value": "os\\-odl_l2\\-bgpvpn\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-ha", - "value": "os\\-odl_l2\\-nofeature\\-ha" + "value": "os\\-odl_l2\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-noha", - "value": "os\\-odl_l2\\-nofeature\\-noha" + "value": "os\\-odl_l2\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-sfc-ha", - "value": "os\\-odl_l2\\-sfc\\-ha" + "value": "os\\-odl_l2\\-sfc\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l3-nofeature-ha", - "value": "os\\-odl_l3\\-nofeature\\-ha" + "value": "os\\-odl_l3\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-onos-nofeature-ha", - "value": "os\\-onos\\-nofeature\\-ha" + "value": "os\\-onos\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-onos-sfc-ha", + "value": "os\\-onos\\-sfc\\-ha", + "selected": false + }, + { + "text": "os-ovs-nofeature-ha", + "value": "os\\-ovs\\-nofeature\\-ha", + "selected": false + }, + { + "text": "unknown", + "value": "unknown", + "selected": false } ], "query": "SHOW TAG VALUES WITH KEY = \"deploy_scenario\"", @@ -568,6 +635,6 @@ "list": [] }, "schemaVersion": 8, - "version": 7, + "version": 8, "links": [] -}
\ No newline at end of file +} diff --git a/dashboard/Yardstick-TC037-1456496078470 b/dashboard/Yardstick-TC037-1456496078470 index 6072c327b..271b76e29 100644 --- a/dashboard/Yardstick-TC037-1456496078470 +++ b/dashboard/Yardstick-TC037-1456496078470 @@ -139,7 +139,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "Throughput mean trend", "tooltip": { @@ -255,7 +255,7 @@ ] } ], - "timeFrom": "10d", + "timeFrom": "14d", "timeShift": null, "title": "RTT mean trend", "tooltip": { @@ -674,7 +674,7 @@ ] } ], - "timeFrom": null, + "timeFrom": "14d", "timeShift": null, "title": "Round-trip time - ping", "tooltip": { @@ -947,7 +947,8 @@ ], "title": "RTT mean - ping", "transform": "table", - "type": "table" + "type": "table", + "timeFrom": "14d" } ], "showTitle": false, @@ -1113,14 +1114,13 @@ "allFormat": "regex values", "current": { "tags": [], - "text": "ericsson-pod2 + huawei-us-deploy-bare-1 + intel-pod6 + opnfv-jump-1 + opnfv-jump-2 + orange-fr-pod2 + zte-pod1", + "text": "ericsson-pod2 + huawei-pod1 + huawei-pod2 + intel-pod6 + lf-pod2 + zte-pod1", "value": [ "ericsson\\-pod2", - "huawei\\-us\\-deploy\\-bare\\-1", + "huawei\\-pod1", + "huawei\\-pod2", "intel\\-pod6", - "opnfv\\-jump\\-1", - "opnfv\\-jump\\-2", - "orange\\-fr\\-pod2", + "lf\\-pod2", "zte\\-pod1" ] }, @@ -1132,54 +1132,84 @@ "name": "POD", "options": [ { - "selected": false, "text": "All", - "value": "(elxg482ls42|ericsson\\-pod2|huawei\\-us\\-deploy\\-bare\\-1|intel\\-pod6|opnfv\\-jump\\-1|opnfv\\-jump\\-2|orange\\-fr\\-pod2|zte\\-pod1|unknown)" + "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 }, { - "selected": false, "text": "elxg482ls42", - "value": "elxg482ls42" + "value": "elxg482ls42", + "selected": false + }, + { + "text": "ericsson-pod1", + "value": "ericsson\\-pod1", + "selected": false }, { - "selected": true, "text": "ericsson-pod2", - "value": "ericsson\\-pod2" + "value": "ericsson\\-pod2", + "selected": true + }, + { + "text": "huawei-pod1", + "value": "huawei\\-pod1", + "selected": true + }, + { + "text": "huawei-pod2", + "value": "huawei\\-pod2", + "selected": true }, { - "selected": true, "text": "huawei-us-deploy-bare-1", - "value": "huawei\\-us\\-deploy\\-bare\\-1" + "value": "huawei\\-us\\-deploy\\-bare\\-1", + "selected": false + }, + { + "text": "intel-pod5", + "value": "intel\\-pod5", + "selected": false }, { - "selected": true, "text": "intel-pod6", - "value": "intel\\-pod6" + "value": "intel\\-pod6", + "selected": true + }, + { + "text": "lf-pod1", + "value": "lf\\-pod1", + "selected": false + }, + { + "text": "lf-pod2", + "value": "lf\\-pod2", + "selected": true }, { - "selected": true, "text": "opnfv-jump-1", - "value": "opnfv\\-jump\\-1" + "value": "opnfv\\-jump\\-1", + "selected": false }, { - "selected": true, "text": "opnfv-jump-2", - "value": "opnfv\\-jump\\-2" + "value": "opnfv\\-jump\\-2", + "selected": false }, { - "selected": true, "text": "orange-fr-pod2", - "value": "orange\\-fr\\-pod2" + "value": "orange\\-fr\\-pod2", + "selected": false }, { - "selected": true, - "text": "zte-pod1", - "value": "zte\\-pod1" + "text": "unknown", + "value": "unknown", + "selected": false }, { - "selected": false, - "text": "unknown", - "value": "unknown" + "text": "zte-pod1", + "value": "zte\\-pod1", + "selected": true } ], "query": "SHOW TAG VALUES WITH KEY = \"pod_name\" ", @@ -1189,9 +1219,9 @@ { "allFormat": "regex values", "current": { - "tags": [], "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "tags": [] }, "datasource": "yardstick-vtc", "includeAll": true, @@ -1200,49 +1230,84 @@ "name": "SCENARIO", "options": [ { - "selected": true, "text": "All", - "value": "(os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-ovs\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha)" + "value": "(os\\-no_sdn\\-ovs\\-ha|os\\-nosdn\\-kvm\\-ha|os\\-nosdn\\-nofeature\\-ha|os\\-nosdn\\-nofeature\\-noha|os\\-nosdn\\-ovs\\-ha|os\\-ocl\\-nofeature\\-ha|os\\-odl_l2\\-bgpvpn\\-ha|os\\-odl_l2\\-nofeature\\-ha|os\\-odl_l2\\-nofeature\\-noha|os\\-odl_l2\\-sfc\\-ha|os\\-odl_l3\\-nofeature\\-ha|os\\-onos\\-nofeature\\-ha|os\\-onos\\-sfc\\-ha|os\\-ovs\\-nofeature\\-ha|unknown)", + "selected": true + }, + { + "text": "os-no_sdn-ovs-ha", + "value": "os\\-no_sdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-nosdn-kvm-ha", + "value": "os\\-nosdn\\-kvm\\-ha", + "selected": false }, { - "selected": false, "text": "os-nosdn-nofeature-ha", - "value": "os\\-nosdn\\-nofeature\\-ha" + "value": "os\\-nosdn\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-nosdn-nofeature-noha", + "value": "os\\-nosdn\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-nosdn-ovs-ha", - "value": "os\\-nosdn\\-ovs\\-ha" + "value": "os\\-nosdn\\-ovs\\-ha", + "selected": false + }, + { + "text": "os-ocl-nofeature-ha", + "value": "os\\-ocl\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-bgpvpn-ha", - "value": "os\\-odl_l2\\-bgpvpn\\-ha" + "value": "os\\-odl_l2\\-bgpvpn\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-ha", - "value": "os\\-odl_l2\\-nofeature\\-ha" + "value": "os\\-odl_l2\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-nofeature-noha", - "value": "os\\-odl_l2\\-nofeature\\-noha" + "value": "os\\-odl_l2\\-nofeature\\-noha", + "selected": false }, { - "selected": false, "text": "os-odl_l2-sfc-ha", - "value": "os\\-odl_l2\\-sfc\\-ha" + "value": "os\\-odl_l2\\-sfc\\-ha", + "selected": false }, { - "selected": false, "text": "os-odl_l3-nofeature-ha", - "value": "os\\-odl_l3\\-nofeature\\-ha" + "value": "os\\-odl_l3\\-nofeature\\-ha", + "selected": false }, { - "selected": false, "text": "os-onos-nofeature-ha", - "value": "os\\-onos\\-nofeature\\-ha" + "value": "os\\-onos\\-nofeature\\-ha", + "selected": false + }, + { + "text": "os-onos-sfc-ha", + "value": "os\\-onos\\-sfc\\-ha", + "selected": false + }, + { + "text": "os-ovs-nofeature-ha", + "value": "os\\-ovs\\-nofeature\\-ha", + "selected": false + }, + { + "text": "unknown", + "value": "unknown", + "selected": false } ], "query": "SHOW TAG VALUES WITH KEY = \"deploy_scenario\" ", @@ -1256,6 +1321,6 @@ }, "refresh": false, "schemaVersion": 8, - "version": 85, + "version": 3, "links": [] } diff --git a/docs/userguide/opnfv_yardstick_tc046.rst b/docs/userguide/opnfv_yardstick_tc046.rst new file mode 100644 index 000000000..612676434 --- /dev/null +++ b/docs/userguide/opnfv_yardstick_tc046.rst @@ -0,0 +1,138 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International +.. License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) OPNFV, Yin Kanglin and others. +.. 14_ykl@tongji.edu.cn + +************************************* +Yardstick Test Case Description TC046 +************************************* + ++-----------------------------------------------------------------------------+ +|Control Node Openstack Service High Availability - Keystone | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC046: Control node Openstack service down - | +| | keystone | ++--------------+--------------------------------------------------------------+ +|test purpose | This test case will verify the high availability of the | +| | user service provided by OpenStack (keystone) on control | +| | node. | +| | | ++--------------+--------------------------------------------------------------+ +|test method | This test case kills the processes of keystone service on a | +| | selected control node, then checks whether the request of | +| | the related Openstack command is OK and the killed processes | +| | are recovered. | +| | | ++--------------+--------------------------------------------------------------+ +|attackers | In this test case, an attacker called "kill-process" is | +| | needed. This attacker includes three parameters: | +| | 1) fault_type: which is used for finding the attacker's | +| | scripts. It should be always set to "kill-process" in this | +| | test case. | +| | 2) process_name: which is the process name of the specified | +| | OpenStack service. If there are multiple processes use the | +| | same name on the host, all of them are killed by this | +| | attacker. | +| | In this case. This parameter should always set to "keystone" | +| | 3) host: which is the name of a control node being attacked. | +| | | +| | e.g. | +| | -fault_type: "kill-process" | +| | -process_name: "keystone" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|monitors | In this test case, two kinds of monitor are needed: | +| | 1. the "openstack-cmd" monitor constantly request a specific | +| | Openstack command, which needs two parameters: | +| | 1) monitor_type: which is used for finding the monitor class | +| | and related scritps. It should be always set to | +| | "openstack-cmd" for this monitor. | +| | 2) command_name: which is the command name used for request. | +| | In this case, the command name should be keystone related | +| | commands. | +| | | +| | 2. the "process" monitor check whether a process is running | +| | on a specific node, which needs three parameters: | +| | 1) monitor_type: which used for finding the monitor class and| +| | related scritps. It should be always set to "process" | +| | for this monitor. | +| | 2) process_name: which is the process name for monitor | +| | 3) host: which is the name of the node runing the process | +| | | +| | e.g. | +| | monitor1: | +| | -monitor_type: "openstack-cmd" | +| | -command_name: "keystone user-list" | +| | monitor2: | +| | -monitor_type: "process" | +| | -process_name: "keystone" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|metrics | In this test case, there are two metrics: | +| | 1)service_outage_time: which indicates the maximum outage | +| | time (seconds) of the specified Openstack command request. | +| | 2)process_recover_time: which indicates the maximun time | +| | (seconds) from the process being killed to recovered | +| | | ++--------------+--------------------------------------------------------------+ +|test tool | Developed by the project. Please see folder: | +| | "yardstick/benchmark/scenarios/availability/ha_tools" | +| | | ++--------------+--------------------------------------------------------------+ +|references | ETSI NFV REL001 | +| | | ++--------------+--------------------------------------------------------------+ +|configuration | This test case needs two configuration files: | +| | 1) test case file: opnfv_yardstick_tc046.yaml | +| | -Attackers: see above "attackers" discription | +| | -waiting_time: which is the time (seconds) from the process | +| | being killed to stoping monitors the monitors | +| | -Monitors: see above "monitors" discription | +| | -SLA: see above "metrics" discription | +| | | +| | 2)POD file: pod.yaml | +| | The POD configuration should record on pod.yaml first. | +| | the "host" item in this test case will use the node name in | +| | the pod.yaml. | +| | | ++--------------+--------------------------------------------------------------+ +|test sequence | description and expected result | +| | | ++--------------+--------------------------------------------------------------+ +|step 1 | start monitors: | +| | each monitor will run with independently process | +| | | +| | Result: The monitor info will be collected. | +| | | ++--------------+--------------------------------------------------------------+ +|step 2 | do attacker: connect the host through SSH, and then execute | +| | the kill process script with param value specified by | +| | "process_name" | +| | | +| | Result: Process will be killed. | +| | | ++--------------+--------------------------------------------------------------+ +|step 3 | stop monitors after a period of time specified by | +| | "waiting_time" | +| | | +| | Result: The monitor info will be aggregated. | +| | | ++--------------+--------------------------------------------------------------+ +|step 4 | verify the SLA | +| | | +| | Result: The test case is passed or not. | +| | | ++--------------+--------------------------------------------------------------+ +|post-action | It is the action when the test cases exist. It will check the| +| | status of the specified process on the host, and restart the | +| | process if it is not running for next test cases | +| | | ++--------------+--------------------------------------------------------------+ +|test verdict | Fails only if SLA is not passed, or if there is a test case | +| | execution problem. | +| | | ++--------------+--------------------------------------------------------------+ diff --git a/docs/userguide/opnfv_yardstick_tc047.rst b/docs/userguide/opnfv_yardstick_tc047.rst new file mode 100644 index 000000000..95158cfd6 --- /dev/null +++ b/docs/userguide/opnfv_yardstick_tc047.rst @@ -0,0 +1,139 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International +.. License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) OPNFV, Yin Kanglin and others. +.. 14_ykl@tongji.edu.cn + +************************************* +Yardstick Test Case Description TC047 +************************************* + ++-----------------------------------------------------------------------------+ +|Control Node Openstack Service High Availability - Glance Api | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC047: Control node Openstack service down - | +| | glance api | ++--------------+--------------------------------------------------------------+ +|test purpose | This test case will verify the high availability of the | +| | image service provided by OpenStack (glance-api) on control | +| | node. | +| | | ++--------------+--------------------------------------------------------------+ +|test method | This test case kills the processes of glance-api service on | +| | a selected control node, then checks whether the request of | +| | the related Openstack command is OK and the killed processes | +| | are recovered. | +| | | ++--------------+--------------------------------------------------------------+ +|attackers | In this test case, an attacker called "kill-process" is | +| | needed. This attacker includes three parameters: | +| | 1) fault_type: which is used for finding the attacker's | +| | scripts. It should be always set to "kill-process" in this | +| | test case. | +| | 2) process_name: which is the process name of the specified | +| | OpenStack service. If there are multiple processes use the | +| | same name on the host, all of them are killed by this | +| | attacker. | +| | In this case. This parameter should always set to "glance- | +| | api". | +| | 3) host: which is the name of a control node being attacked. | +| | | +| | e.g. | +| | -fault_type: "kill-process" | +| | -process_name: "glance-api" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|monitors | In this test case, two kinds of monitor are needed: | +| | 1. the "openstack-cmd" monitor constantly request a specific | +| | Openstack command, which needs two parameters: | +| | 1) monitor_type: which is used for finding the monitor class | +| | and related scritps. It should be always set to | +| | "openstack-cmd" for this monitor. | +| | 2) command_name: which is the command name used for request. | +| | In this case, the command name should be glance related | +| | commands. | +| | | +| | 2. the "process" monitor check whether a process is running | +| | on a specific node, which needs three parameters: | +| | 1) monitor_type: which used for finding the monitor class and| +| | related scritps. It should be always set to "process" | +| | for this monitor. | +| | 2) process_name: which is the process name for monitor | +| | 3) host: which is the name of the node runing the process | +| | | +| | e.g. | +| | monitor1: | +| | -monitor_type: "openstack-cmd" | +| | -command_name: "glance image-list" | +| | monitor2: | +| | -monitor_type: "process" | +| | -process_name: "glance-api" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|metrics | In this test case, there are two metrics: | +| | 1)service_outage_time: which indicates the maximum outage | +| | time (seconds) of the specified Openstack command request. | +| | 2)process_recover_time: which indicates the maximun time | +| | (seconds) from the process being killed to recovered | +| | | ++--------------+--------------------------------------------------------------+ +|test tool | Developed by the project. Please see folder: | +| | "yardstick/benchmark/scenarios/availability/ha_tools" | +| | | ++--------------+--------------------------------------------------------------+ +|references | ETSI NFV REL001 | +| | | ++--------------+--------------------------------------------------------------+ +|configuration | This test case needs two configuration files: | +| | 1) test case file: opnfv_yardstick_tc047.yaml | +| | -Attackers: see above "attackers" discription | +| | -waiting_time: which is the time (seconds) from the process | +| | being killed to stoping monitors the monitors | +| | -Monitors: see above "monitors" discription | +| | -SLA: see above "metrics" discription | +| | | +| | 2)POD file: pod.yaml | +| | The POD configuration should record on pod.yaml first. | +| | the "host" item in this test case will use the node name in | +| | the pod.yaml. | +| | | ++--------------+--------------------------------------------------------------+ +|test sequence | description and expected result | +| | | ++--------------+--------------------------------------------------------------+ +|step 1 | start monitors: | +| | each monitor will run with independently process | +| | | +| | Result: The monitor info will be collected. | +| | | ++--------------+--------------------------------------------------------------+ +|step 2 | do attacker: connect the host through SSH, and then execute | +| | the kill process script with param value specified by | +| | "process_name" | +| | | +| | Result: Process will be killed. | +| | | ++--------------+--------------------------------------------------------------+ +|step 3 | stop monitors after a period of time specified by | +| | "waiting_time" | +| | | +| | Result: The monitor info will be aggregated. | +| | | ++--------------+--------------------------------------------------------------+ +|step 4 | verify the SLA | +| | | +| | Result: The test case is passed or not. | +| | | ++--------------+--------------------------------------------------------------+ +|post-action | It is the action when the test cases exist. It will check the| +| | status of the specified process on the host, and restart the | +| | process if it is not running for next test cases | +| | | ++--------------+--------------------------------------------------------------+ +|test verdict | Fails only if SLA is not passed, or if there is a test case | +| | execution problem. | +| | | ++--------------+--------------------------------------------------------------+ diff --git a/docs/userguide/opnfv_yardstick_tc048.rst b/docs/userguide/opnfv_yardstick_tc048.rst new file mode 100644 index 000000000..21c00d1fe --- /dev/null +++ b/docs/userguide/opnfv_yardstick_tc048.rst @@ -0,0 +1,139 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International +.. License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) OPNFV, Yin Kanglin and others. +.. 14_ykl@tongji.edu.cn + +************************************* +Yardstick Test Case Description TC048 +************************************* + ++-----------------------------------------------------------------------------+ +|Control Node Openstack Service High Availability - Cinder Api | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC048: Control node Openstack service down - | +| | cinder api | ++--------------+--------------------------------------------------------------+ +|test purpose | This test case will verify the high availability of the | +| | volume service provided by OpenStack (cinder-api) on control | +| | node. | +| | | ++--------------+--------------------------------------------------------------+ +|test method | This test case kills the processes of cinder-api service on | +| | a selected control node, then checks whether the request of | +| | the related Openstack command is OK and the killed processes | +| | are recovered. | +| | | ++--------------+--------------------------------------------------------------+ +|attackers | In this test case, an attacker called "kill-process" is | +| | needed. This attacker includes three parameters: | +| | 1) fault_type: which is used for finding the attacker's | +| | scripts. It should be always set to "kill-process" in this | +| | test case. | +| | 2) process_name: which is the process name of the specified | +| | OpenStack service. If there are multiple processes use the | +| | same name on the host, all of them are killed by this | +| | attacker. | +| | In this case. This parameter should always set to "cinder- | +| | api". | +| | 3) host: which is the name of a control node being attacked. | +| | | +| | e.g. | +| | -fault_type: "kill-process" | +| | -process_name: "cinder-api" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|monitors | In this test case, two kinds of monitor are needed: | +| | 1. the "openstack-cmd" monitor constantly request a specific | +| | Openstack command, which needs two parameters: | +| | 1) monitor_type: which is used for finding the monitor class | +| | and related scritps. It should be always set to | +| | "openstack-cmd" for this monitor. | +| | 2) command_name: which is the command name used for request. | +| | In this case, the command name should be cinder related | +| | commands. | +| | | +| | 2. the "process" monitor check whether a process is running | +| | on a specific node, which needs three parameters: | +| | 1) monitor_type: which used for finding the monitor class and| +| | related scritps. It should be always set to "process" | +| | for this monitor. | +| | 2) process_name: which is the process name for monitor | +| | 3) host: which is the name of the node runing the process | +| | | +| | e.g. | +| | monitor1: | +| | -monitor_type: "openstack-cmd" | +| | -command_name: "cinder list" | +| | monitor2: | +| | -monitor_type: "process" | +| | -process_name: "cinder-api" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|metrics | In this test case, there are two metrics: | +| | 1)service_outage_time: which indicates the maximum outage | +| | time (seconds) of the specified Openstack command request. | +| | 2)process_recover_time: which indicates the maximun time | +| | (seconds) from the process being killed to recovered | +| | | ++--------------+--------------------------------------------------------------+ +|test tool | Developed by the project. Please see folder: | +| | "yardstick/benchmark/scenarios/availability/ha_tools" | +| | | ++--------------+--------------------------------------------------------------+ +|references | ETSI NFV REL001 | +| | | ++--------------+--------------------------------------------------------------+ +|configuration | This test case needs two configuration files: | +| | 1) test case file: opnfv_yardstick_tc048.yaml | +| | -Attackers: see above "attackers" discription | +| | -waiting_time: which is the time (seconds) from the process | +| | being killed to stoping monitors the monitors | +| | -Monitors: see above "monitors" discription | +| | -SLA: see above "metrics" discription | +| | | +| | 2)POD file: pod.yaml | +| | The POD configuration should record on pod.yaml first. | +| | the "host" item in this test case will use the node name in | +| | the pod.yaml. | +| | | ++--------------+--------------------------------------------------------------+ +|test sequence | description and expected result | +| | | ++--------------+--------------------------------------------------------------+ +|step 1 | start monitors: | +| | each monitor will run with independently process | +| | | +| | Result: The monitor info will be collected. | +| | | ++--------------+--------------------------------------------------------------+ +|step 2 | do attacker: connect the host through SSH, and then execute | +| | the kill process script with param value specified by | +| | "process_name" | +| | | +| | Result: Process will be killed. | +| | | ++--------------+--------------------------------------------------------------+ +|step 3 | stop monitors after a period of time specified by | +| | "waiting_time" | +| | | +| | Result: The monitor info will be aggregated. | +| | | ++--------------+--------------------------------------------------------------+ +|step 4 | verify the SLA | +| | | +| | Result: The test case is passed or not. | +| | | ++--------------+--------------------------------------------------------------+ +|post-action | It is the action when the test cases exist. It will check the| +| | status of the specified process on the host, and restart the | +| | process if it is not running for next test cases | +| | | ++--------------+--------------------------------------------------------------+ +|test verdict | Fails only if SLA is not passed, or if there is a test case | +| | execution problem. | +| | | ++--------------+--------------------------------------------------------------+ diff --git a/docs/userguide/opnfv_yardstick_tc049.rst b/docs/userguide/opnfv_yardstick_tc049.rst new file mode 100644 index 000000000..f58bb9989 --- /dev/null +++ b/docs/userguide/opnfv_yardstick_tc049.rst @@ -0,0 +1,139 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International +.. License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) OPNFV, Yin Kanglin and others. +.. 14_ykl@tongji.edu.cn + +************************************* +Yardstick Test Case Description TC049 +************************************* + ++-----------------------------------------------------------------------------+ +|Control Node Openstack Service High Availability - Swift Proxy | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC049: Control node Openstack service down - | +| | swift proxy | ++--------------+--------------------------------------------------------------+ +|test purpose | This test case will verify the high availability of the | +| | storage service provided by OpenStack (swift-proxy) on | +| | control node. | +| | | ++--------------+--------------------------------------------------------------+ +|test method | This test case kills the processes of swift-proxy service on | +| | a selected control node, then checks whether the request of | +| | the related Openstack command is OK and the killed processes | +| | are recovered. | +| | | ++--------------+--------------------------------------------------------------+ +|attackers | In this test case, an attacker called "kill-process" is | +| | needed. This attacker includes three parameters: | +| | 1) fault_type: which is used for finding the attacker's | +| | scripts. It should be always set to "kill-process" in this | +| | test case. | +| | 2) process_name: which is the process name of the specified | +| | OpenStack service. If there are multiple processes use the | +| | same name on the host, all of them are killed by this | +| | attacker. | +| | In this case. This parameter should always set to "swift- | +| | proxy". | +| | 3) host: which is the name of a control node being attacked. | +| | | +| | e.g. | +| | -fault_type: "kill-process" | +| | -process_name: "swift-proxy" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|monitors | In this test case, two kinds of monitor are needed: | +| | 1. the "openstack-cmd" monitor constantly request a specific | +| | Openstack command, which needs two parameters: | +| | 1) monitor_type: which is used for finding the monitor class | +| | and related scritps. It should be always set to | +| | "openstack-cmd" for this monitor. | +| | 2) command_name: which is the command name used for request. | +| | In this case, the command name should be swift related | +| | commands. | +| | | +| | 2. the "process" monitor check whether a process is running | +| | on a specific node, which needs three parameters: | +| | 1) monitor_type: which used for finding the monitor class and| +| | related scritps. It should be always set to "process" | +| | for this monitor. | +| | 2) process_name: which is the process name for monitor | +| | 3) host: which is the name of the node runing the process | +| | | +| | e.g. | +| | monitor1: | +| | -monitor_type: "openstack-cmd" | +| | -command_name: "swift stat" | +| | monitor2: | +| | -monitor_type: "process" | +| | -process_name: "swift-proxy" | +| | -host: node1 | +| | | ++--------------+--------------------------------------------------------------+ +|metrics | In this test case, there are two metrics: | +| | 1)service_outage_time: which indicates the maximum outage | +| | time (seconds) of the specified Openstack command request. | +| | 2)process_recover_time: which indicates the maximun time | +| | (seconds) from the process being killed to recovered | +| | | ++--------------+--------------------------------------------------------------+ +|test tool | Developed by the project. Please see folder: | +| | "yardstick/benchmark/scenarios/availability/ha_tools" | +| | | ++--------------+--------------------------------------------------------------+ +|references | ETSI NFV REL001 | +| | | ++--------------+--------------------------------------------------------------+ +|configuration | This test case needs two configuration files: | +| | 1) test case file: opnfv_yardstick_tc049.yaml | +| | -Attackers: see above "attackers" discription | +| | -waiting_time: which is the time (seconds) from the process | +| | being killed to stoping monitors the monitors | +| | -Monitors: see above "monitors" discription | +| | -SLA: see above "metrics" discription | +| | | +| | 2)POD file: pod.yaml | +| | The POD configuration should record on pod.yaml first. | +| | the "host" item in this test case will use the node name in | +| | the pod.yaml. | +| | | ++--------------+--------------------------------------------------------------+ +|test sequence | description and expected result | +| | | ++--------------+--------------------------------------------------------------+ +|step 1 | start monitors: | +| | each monitor will run with independently process | +| | | +| | Result: The monitor info will be collected. | +| | | ++--------------+--------------------------------------------------------------+ +|step 2 | do attacker: connect the host through SSH, and then execute | +| | the kill process script with param value specified by | +| | "process_name" | +| | | +| | Result: Process will be killed. | +| | | ++--------------+--------------------------------------------------------------+ +|step 3 | stop monitors after a period of time specified by | +| | "waiting_time" | +| | | +| | Result: The monitor info will be aggregated. | +| | | ++--------------+--------------------------------------------------------------+ +|step 4 | verify the SLA | +| | | +| | Result: The test case is passed or not. | +| | | ++--------------+--------------------------------------------------------------+ +|post-action | It is the action when the test cases exist. It will check the| +| | status of the specified process on the host, and restart the | +| | process if it is not running for next test cases | +| | | ++--------------+--------------------------------------------------------------+ +|test verdict | Fails only if SLA is not passed, or if there is a test case | +| | execution problem. | +| | | ++--------------+--------------------------------------------------------------+ diff --git a/samples/netperf_node.yaml b/samples/netperf_node.yaml new file mode 100755 index 000000000..d59bbf235 --- /dev/null +++ b/samples/netperf_node.yaml @@ -0,0 +1,51 @@ +--- +# Sample benchmark task config file +# measure network latency and throughput using netperf +# There are two sample scenarios: bulk test and request/response test +# In bulk test, UDP_STREAM and TCP_STREAM can be used +# send_msg_size and recv_msg_size are options of bulk test +# In req/rsp test, TCP_RR TCP_CRR UDP_RR can be used +# req_rsp_size is option of req/rsp test + +schema: "yardstick:task:0.1" + +scenarios: +- + type: NetperfNode + options: + testname: 'UDP_STREAM' + send_msg_size: 1024 + duration: 20 + + host: node1.LF + target: node2.LF + + runner: + type: Iteration + iterations: 1 + interval: 1 + sla: + mean_latency: 100 + action: monitor +#- +# type: NetperfNode +# options: +# testname: 'TCP_RR' +# req_rsp_size: '32,1024' +# +# host: node1.LF +# target: node2.LF +# +# runner: +# type: Duration +# duration: 20 +# interval: 1 +# sla: +# mean_latency: 300 +# action: monitor + +context: + type: Node + name: LF + file: etc/yardstick/nodes/compass_sclab_physical/pod.yaml + diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml new file mode 100644 index 000000000..867553d21 --- /dev/null +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml @@ -0,0 +1,42 @@ +--- +# Test case for TC046 :Control node Openstack service down - keystone + +schema: "yardstick:task:0.1" + +scenarios: +- + type: ServiceHA + options: + attackers: + - fault_type: "kill-process" + process_name: "keystone" + host: node1 + + monitors: + - monitor_type: "openstack-cmd" + command_name: "keystone user-list" + monitor_time: 10 + sla: + max_outage_time: 5 + - monitor_type: "process" + process_name: "keystone" + host: node1 + monitor_time: 10 + sla: + max_recover_time: 5 + + nodes: + node1: node1.LF + + runner: + type: Duration + duration: 1 + sla: + outage_time: 5 + action: monitor + + +context: + type: Node + name: LF + file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml new file mode 100644 index 000000000..0707dc9e9 --- /dev/null +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml @@ -0,0 +1,42 @@ +--- +# Test case for TC047 :Control node Openstack service down - glance api + +schema: "yardstick:task:0.1" + +scenarios: +- + type: ServiceHA + options: + attackers: + - fault_type: "kill-process" + process_name: "glance-api" + host: node1 + + monitors: + - monitor_type: "openstack-cmd" + command_name: "glance image-list" + monitor_time: 10 + sla: + max_outage_time: 5 + - monitor_type: "process" + process_name: "glance-api" + host: node1 + monitor_time: 10 + sla: + max_recover_time: 5 + + nodes: + node1: node1.LF + + runner: + type: Duration + duration: 1 + sla: + outage_time: 5 + action: monitor + + +context: + type: Node + name: LF + file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml new file mode 100644 index 000000000..525c206c3 --- /dev/null +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml @@ -0,0 +1,43 @@ +--- +# Test case for TC048 :Control node Openstack service down - cinder api + +schema: "yardstick:task:0.1" + +scenarios: +- + type: ServiceHA + options: + attackers: + - fault_type: "kill-process" + process_name: "cinder-api" + host: node1 + + monitors: + - monitor_type: "openstack-cmd" + command_name: "cinder list" + monitor_time: 10 + sla: + max_outage_time: 5 + - monitor_type: "process" + process_name: "cinder-api" + host: node1 + monitor_time: 10 + sla: + max_recover_time: 5 + + nodes: + node1: node1.LF + + runner: + type: Duration + duration: 1 + sla: + outage_time: 5 + action: monitor + + +context: + type: Node + name: LF + file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml + diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml new file mode 100644 index 000000000..da93a467f --- /dev/null +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml @@ -0,0 +1,42 @@ +--- +# Test case for TC049 :Control node Openstack service down - swift proxy + +schema: "yardstick:task:0.1" + +scenarios: +- + type: ServiceHA + options: + attackers: + - fault_type: "kill-process" + process_name: "swift-proxy" + host: node1 + + monitors: + - monitor_type: "openstack-cmd" + command_name: "swift stat" + monitor_time: 10 + sla: + max_outage_time: 5 + - monitor_type: "process" + process_name: "swift-proxy" + host: node1 + monitor_time: 10 + sla: + max_recover_time: 5 + + nodes: + node1: node1.LF + + runner: + type: Duration + duration: 1 + sla: + outage_time: 5 + action: monitor + + +context: + type: Node + name: LF + file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml diff --git a/tests/unit/benchmark/scenarios/networking/test_netperf_node.py b/tests/unit/benchmark/scenarios/networking/test_netperf_node.py new file mode 100755 index 000000000..1c39b292b --- /dev/null +++ b/tests/unit/benchmark/scenarios/networking/test_netperf_node.py @@ -0,0 +1,127 @@ +#!/usr/bin/env python + +############################################################################## +# Copyright (c) 2015 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.networking.netperf_node.NetperfNode + +import mock +import unittest +import os +import json + +from yardstick.benchmark.scenarios.networking import netperf_node + + +@mock.patch('yardstick.benchmark.scenarios.networking.netperf_node.ssh') +class NetperfNodeTestCase(unittest.TestCase): + + def setUp(self): + self.ctx = { + 'host': { + 'ip': '192.168.10.10', + 'user': 'root', + 'password': 'root' + }, + 'target': { + 'ip': '192.168.10.11', + 'user': 'root', + 'password': 'root' + } + } + + def test_netperf_node_successful_setup(self, mock_ssh): + + p = netperf_node.NetperfNode({}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + + p.setup() + self.assertIsNotNone(p.server) + self.assertIsNotNone(p.client) + self.assertEqual(p.setup_done, True) + + def test_netperf_node_successful_no_sla(self, mock_ssh): + + options = {} + args = {'options': options} + result = {} + + p = netperf_node.NetperfNode(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + + sample_output = self._read_sample_output() + mock_ssh.SSH().execute.return_value = (0, sample_output, '') + expected_result = json.loads(sample_output) + p.run(result) + self.assertEqual(result, expected_result) + + def test_netperf_node_successful_sla(self, mock_ssh): + + options = {} + args = { + 'options': options, + 'sla': {'mean_latency': 100} + } + result = {} + + p = netperf_node.NetperfNode(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + + sample_output = self._read_sample_output() + mock_ssh.SSH().execute.return_value = (0, sample_output, '') + expected_result = json.loads(sample_output) + p.run(result) + self.assertEqual(result, expected_result) + + def test_netperf_node_unsuccessful_sla(self, mock_ssh): + + options = {} + args = { + 'options': options, + 'sla': {'mean_latency': 5} + } + result = {} + + p = netperf_node.NetperfNode(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + + sample_output = self._read_sample_output() + mock_ssh.SSH().execute.return_value = (0, sample_output, '') + self.assertRaises(AssertionError, p.run, result) + + def test_netperf_node_unsuccessful_script_error(self, mock_ssh): + + options = {} + args = {'options': options} + result = {} + + p = netperf_node.NetperfNode(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + + mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR') + self.assertRaises(RuntimeError, p.run, result) + + def _read_sample_output(self): + curr_path = os.path.dirname(os.path.abspath(__file__)) + output = os.path.join(curr_path, 'netperf_sample_output.json') + with open(output) as f: + sample_output = f.read() + return sample_output + + +def main(): + unittest.main() + +if __name__ == '__main__': + main() diff --git a/yardstick/benchmark/scenarios/networking/netperf_install.bash b/yardstick/benchmark/scenarios/networking/netperf_install.bash new file mode 100755 index 000000000..eaa9f530a --- /dev/null +++ b/yardstick/benchmark/scenarios/networking/netperf_install.bash @@ -0,0 +1,32 @@ +#!/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 +############################################################################## + +set -e + +echo "===Install netperf before test begin!!!===" +cp /etc/apt/sources.list /etc/apt/sources.list_bkp +cp /etc/resolv.conf /etc/resolv.conf_bkp +echo "nameserver 8.8.4.4" >> /etc/resolv.conf + +cat <<EOF >/etc/apt/sources.list +deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ trusty-proposed main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse +EOF + +sudo apt-get update +sudo apt-get install -y netperf + +service netperf start + +echo "===Install netperf before test end!!!===" diff --git a/yardstick/benchmark/scenarios/networking/netperf_node.py b/yardstick/benchmark/scenarios/networking/netperf_node.py new file mode 100755 index 000000000..87aa8d78d --- /dev/null +++ b/yardstick/benchmark/scenarios/networking/netperf_node.py @@ -0,0 +1,203 @@ +############################################################################## +# 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 +############################################################################## +# bulk data test and req/rsp test are supported +import pkg_resources +import logging +import json + +import yardstick.ssh as ssh +from yardstick.benchmark.scenarios import base + +LOG = logging.getLogger(__name__) + + +class NetperfNode(base.Scenario): + """Execute netperf between two nodes + + Parameters + testname - to specify the test you wish to perform. + the valid testnames are TCP_STREAM, TCP_RR, UDP_STREAM, UDP_RR + type: string + unit: na + default: TCP_STREAM + send_msg_size - value set the local send size to value bytes. + type: int + unit: bytes + default: na + recv_msg_size - setting the receive size for the remote system. + type: int + unit: bytes + default: na + req_rsp_size - set the request and/or response sizes based on sizespec. + type: string + unit: na + default: na + duration - duration of the test + type: int + unit: seconds + default: 20 + + read link below for more netperf args description: + http://www.netperf.org/netperf/training/Netperf.html + """ + __scenario_type__ = "NetperfNode" + TARGET_SCRIPT = 'netperf_benchmark.bash' + INSTALL_SCRIPT = 'netperf_install.bash' + REMOVE_SCRIPT = 'netperf_remove.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.networking', + NetperfNode.TARGET_SCRIPT) + host = self.context_cfg['host'] + host_user = host.get('user', 'ubuntu') + host_ip = host.get('ip', None) + target = self.context_cfg['target'] + target_user = target.get('user', 'ubuntu') + target_ip = target.get('ip', None) + self.target_ip = target.get('ip', None) + host_password = host.get('password', None) + target_password = target.get('password', None) + + LOG.info("host_pw:%s, target_pw:%s", host_password, target_password) + # netserver start automatically during the vm boot + LOG.info("user:%s, target:%s", target_user, target_ip) + self.server = ssh.SSH(target_user, target_ip, + password=target_password) + self.server.wait(timeout=600) + + LOG.info("user:%s, host:%s", host_user, host_ip) + self.client = ssh.SSH(host_user, host_ip, + password=host_password) + self.client.wait(timeout=600) + + # copy script to host + self.client.run("cat > ~/netperf.sh", + stdin=open(self.target_script, "rb")) + + # copy script to host and client + self.install_script = pkg_resources.resource_filename( + 'yardstick.benchmark.scenarios.networking', + NetperfNode.INSTALL_SCRIPT) + self.remove_script = pkg_resources.resource_filename( + 'yardstick.benchmark.scenarios.networking', + NetperfNode.REMOVE_SCRIPT) + + self.server.run("cat > ~/netperf_install.sh", + stdin=open(self.install_script, "rb")) + self.client.run("cat > ~/netperf_install.sh", + stdin=open(self.install_script, "rb")) + self.server.run("cat > ~/netperf_remove.sh", + stdin=open(self.remove_script, "rb")) + self.client.run("cat > ~/netperf_remove.sh", + stdin=open(self.remove_script, "rb")) + self.server.execute("sudo bash netperf_install.sh") + self.client.execute("sudo bash netperf_install.sh") + + self.setup_done = True + + def run(self, result): + """execute the benchmark""" + + if not self.setup_done: + self.setup() + + # get global options + ipaddr = self.context_cfg['target'].get("ipaddr", '127.0.0.1') + ipaddr = self.target_ip + options = self.scenario_cfg['options'] + testname = options.get("testname", 'TCP_STREAM') + duration_time = self.scenario_cfg["runner"].get("duration", None) \ + if "runner" in self.scenario_cfg else None + arithmetic_time = options.get("duration", None) + if duration_time: + testlen = duration_time + elif arithmetic_time: + testlen = arithmetic_time + else: + testlen = 20 + + cmd_args = "-H %s -l %s -t %s" % (ipaddr, testlen, testname) + + # get test specific options + default_args = "-O 'THROUGHPUT,THROUGHPUT_UNITS,MEAN_LATENCY'" + cmd_args += " -- %s" % default_args + option_pair_list = [("send_msg_size", "-m"), + ("recv_msg_size", "-M"), + ("req_rsp_size", "-r")] + for option_pair in option_pair_list: + if option_pair[0] in options: + cmd_args += " %s %s" % (option_pair[1], + options[option_pair[0]]) + + cmd = "sudo bash netperf.sh %s" % (cmd_args) + LOG.debug("Executing command: %s", cmd) + status, stdout, stderr = self.client.execute(cmd) + + if status: + raise RuntimeError(stderr) + + result.update(json.loads(stdout)) + + if result['mean_latency'] == '': + raise RuntimeError(stdout) + + # sla check + mean_latency = float(result['mean_latency']) + if "sla" in self.scenario_cfg: + sla_max_mean_latency = int( + self.scenario_cfg["sla"]["mean_latency"]) + + assert mean_latency <= sla_max_mean_latency, \ + "mean_latency %f > sla_max_mean_latency(%f); " % \ + (mean_latency, sla_max_mean_latency) + + def teardown(self): + '''remove netperf from nodes after test''' + self.server.execute("sudo bash netperf_remove.sh") + self.client.execute("sudo bash netperf_remove.sh") + + +def _test(): # pragma: no cover + '''internal test function''' + ctx = { + "host": { + "ip": "192.168.10.10", + "user": "root", + "password": "root" + }, + "target": { + "ip": "192.168.10.11", + "user": "root", + "password": "root" + } + } + + logger = logging.getLogger("yardstick") + logger.setLevel(logging.DEBUG) + + options = { + "testname": 'TCP_STREAM' + } + + args = {"options": options} + result = {} + + netperf = NetperfNode(args, ctx) + netperf.run(result) + print result + +if __name__ == '__main__': + _test() diff --git a/yardstick/benchmark/scenarios/networking/netperf_remove.bash b/yardstick/benchmark/scenarios/networking/netperf_remove.bash new file mode 100755 index 000000000..bb2299a2b --- /dev/null +++ b/yardstick/benchmark/scenarios/networking/netperf_remove.bash @@ -0,0 +1,21 @@ +#!/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 +############################################################################## + +set -e +echo "===Remove netperf after install begin!===" +cp /etc/apt/sources.list_bkp /etc/apt/sources.list +cp /etc/resolv.conf_bkp /etc/resolv.conf + +service netperf stop + +sudo apt-get purge -y netperf + +echo "===Remove netperf after install end!!!===" |