From c8b3100a8ce87fd21662154d807167301f0a0a63 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Tue, 20 Nov 2018 11:04:43 -0500 Subject: [PATCH 01/12] adding new start and stop events for cloud realm --- ...loudStateReconstructorTransformIngestor.php | 18 +++++++++++++----- .../etl_data.d/cloud_common/event_type.json | 9 ++++++++- .../cloud_openstack/openstack_event_map.json | 13 ++++++++++--- .../cloud_common/cloud_transient.json | 6 ++++-- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/classes/ETL/Ingestor/CloudStateReconstructorTransformIngestor.php b/classes/ETL/Ingestor/CloudStateReconstructorTransformIngestor.php index 53b05af122..d20045dd43 100644 --- a/classes/ETL/Ingestor/CloudStateReconstructorTransformIngestor.php +++ b/classes/ETL/Ingestor/CloudStateReconstructorTransformIngestor.php @@ -25,14 +25,22 @@ class CloudStateReconstructorTransformIngestor extends pdoIngestor implements iAction { // Discrete Event Types + // Start events const START = 2; - const STOP = 4; - const TERMINATE = 6; const RESUME = 8; const STATE_REPORT = 16; + const UNSHELVE = 20; + const UNPAUSE = 57; + const UNSUSPEND = 61; + const POWER_ON = 59; + + //End events + const STOP = 4; + const TERMINATE = 6; const SUSPEND = 17; const SHELVE = 19; - const UNSHELVE = 20; + const POWER_OFF = 45; + const PAUSE = 55; private $_stop_event_ids; private $_start_event_ids; @@ -46,8 +54,8 @@ public function __construct(aOptions $options, EtlConfiguration $etlConfig, Log { parent::__construct($options, $etlConfig, $logger); - $this->_stop_event_ids = array(self::STOP, self::TERMINATE, self::SUSPEND, self::SHELVE); - $this->_start_event_ids = array(self::START, self::RESUME, self::STATE_REPORT, self::UNSHELVE); + $this->_stop_event_ids = array(self::STOP, self::TERMINATE, self::SUSPEND, self::SHELVE, self::POWER_OFF, self::PAUSE); + $this->_start_event_ids = array(self::START, self::RESUME, self::STATE_REPORT, self::UNSHELVE, self::UNPAUSE, self::UNSUSPEND, self::POWER_ON); $this->_all_event_ids = array_merge($this->_start_event_ids, $this->_stop_event_ids); $this->_end_time = $etlConfig->getVariableStore()->endDate ? date('Y-m-d H:i:s', strtotime($etlConfig->getVariableStore()->endDate)) : null; diff --git a/configuration/etl/etl_data.d/cloud_common/event_type.json b/configuration/etl/etl_data.d/cloud_common/event_type.json index e8b68cfe4c..6acbb7596c 100644 --- a/configuration/etl/etl_data.d/cloud_common/event_type.json +++ b/configuration/etl/etl_data.d/cloud_common/event_type.json @@ -54,5 +54,12 @@ [51, "RESIZE_END", "Resize Instance End", "End resizing of instance"], [52, "RESIZE_PREP_START", "Instance Resize Prep Start", "Start prep for resizing instance"], [53, "RESIZE_PREP_END", "Instance Resize Prep End", "End prep for resizing instance"], - [54, "START_SHELVE", "Start Shelve", "Start shelving of instance"] + [54, "PAUSE_START", "Start Pause Instance", "Start pausing an instance"], + [55, "PAUSE_END", "End Pause Instance", "End pausing an instance"], + [56, "UNPAUSE_START", "Start Unpause Instance", "Start Unpausing an instance"], + [57, "UNPAUSE_END", "End Unpause Instance", "End Unpausing an instance"], + [58, "POWER_ON_START", "Power On Instance Start", "Start powering on an instance"], + [59, "POWER_ON_END", "Power On Instance End", "End powering on an instance"], + [60, "UNSUSPEND_START", "Unsuspend Instance Start", "Start unsuspending an instance"], + [61, "UNSUSPEND_END", "Unsuspend Instance End", "End unsuspending an instance"] ] diff --git a/configuration/etl/etl_data.d/cloud_openstack/openstack_event_map.json b/configuration/etl/etl_data.d/cloud_openstack/openstack_event_map.json index 8535606df4..7495d0474f 100644 --- a/configuration/etl/etl_data.d/cloud_openstack/openstack_event_map.json +++ b/configuration/etl/etl_data.d/cloud_openstack/openstack_event_map.json @@ -36,7 +36,7 @@ [34, 42, "compute.instance.finish_resize.start"], [35, 43, "compute.instance.finish_resize.end"], [36, 44, "compute.instance.power_off.start"], - [37, 17, "compute.instance.power_off.end"], + [37, 45, "compute.instance.power_off.end"], [38, 46, "compute.instance.rebuild.start"], [39, 47, "compute.instance.rebuild.end"], [40, 48, "compute.instance.resize.confirm.start"], @@ -46,6 +46,13 @@ [44, 52, "compute.instance.resize.prep.start"], [45, 53, "compute.instance.resize.prep.end"], [46, 54, "compute.instance.shelve_offload.start"], - [47, 7, "compute.instance.power_on.start"], - [48, 8, "compute.instance.power_off.end"] + [47, 7, "compute.instance.resume.start"], + [48, 8, "compute.instance.resume.end"], + [49, 58, "compute.instance.power_on.start"], + [50, 59, "compute.instance.power_on.end"], + [51, 20, "compute.instance.unshelve.end"], + [52, 57, "compute.instance.unpause.end"], + [53, 61, "compute.instance.unsuspend.end"], + [54, 17, "compute.instance.suspend.end"], + [55, 55, "compute.instance.pause.end"] ] diff --git a/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json b/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json index 780038af41..431433f096 100644 --- a/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json +++ b/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json @@ -105,7 +105,8 @@ "name": "PRIMARY", "columns": [ "resource_id", - "instance" + "instance", + "start_event_id" ], "is_unique": true }, @@ -113,7 +114,8 @@ "name": "increment_key", "columns": [ "instance_id", - "resource_id" + "resource_id", + "start_event_id" ], "is_unique": true } From 565a9abddf82669a2bac3d9c524e5aef73724490 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Tue, 20 Nov 2018 15:20:39 -0500 Subject: [PATCH 02/12] adding updated tests and fixed bug in cloud_events_transient table definitions --- .../cloud_common/cloud_transient.json | 6 ++++-- etl/js/.eslintrc.json | 11 ---------- html/unit_tests/.eslintrc.json | 9 --------- html/unit_tests/spec/.eslintrc.json | 12 ----------- libraries/phantomjs/.eslintrc.json | 12 ----------- .../xdmod/automated_tests/.eslintrc.json | 20 ------------------- .../xdmod/regression_tests/.eslintrc.json | 5 ----- .../aggregate-Day-reference.csv | 4 ++-- .../aggregate-Month-reference.csv | 4 ++-- .../aggregate-Quarter-reference.csv | 4 ++-- .../aggregate-Year-reference.csv | 4 ++-- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 4 ++-- .../aggregate-Month-reference.csv | 4 ++-- .../aggregate-Quarter-reference.csv | 4 ++-- .../aggregate-Year-reference.csv | 4 ++-- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../aggregate-Day-reference.csv | 2 +- .../aggregate-Month-reference.csv | 2 +- .../aggregate-Quarter-reference.csv | 2 +- .../aggregate-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- .../timeseries-Month-reference.csv | 2 +- .../timeseries-Quarter-reference.csv | 2 +- .../timeseries-Year-reference.csv | 2 +- .../timeseries-Day-reference.csv | 2 +- 245 files changed, 250 insertions(+), 317 deletions(-) delete mode 100644 etl/js/.eslintrc.json delete mode 100644 html/unit_tests/.eslintrc.json delete mode 100644 html/unit_tests/spec/.eslintrc.json delete mode 100644 libraries/phantomjs/.eslintrc.json delete mode 100644 open_xdmod/modules/xdmod/automated_tests/.eslintrc.json delete mode 100644 open_xdmod/modules/xdmod/regression_tests/.eslintrc.json diff --git a/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json b/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json index 431433f096..160c327967 100644 --- a/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json +++ b/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json @@ -106,7 +106,8 @@ "columns": [ "resource_id", "instance", - "start_event_id" + "start_time", + "end_time" ], "is_unique": true }, @@ -115,7 +116,8 @@ "columns": [ "instance_id", "resource_id", - "start_event_id" + "start_time", + "end_time" ], "is_unique": true } diff --git a/etl/js/.eslintrc.json b/etl/js/.eslintrc.json deleted file mode 100644 index f4c0af5cee..0000000000 --- a/etl/js/.eslintrc.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "env": { - "node": true - }, - "parserOptions": { - "ecmaVersion": 6 - }, - "rules": { - "no-template-curly-in-string": 0 - } -} diff --git a/html/unit_tests/.eslintrc.json b/html/unit_tests/.eslintrc.json deleted file mode 100644 index 2316c5085c..0000000000 --- a/html/unit_tests/.eslintrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "env": { - "browser": true, - "node": true, - "phantomjs": true, - "mocha": true - } -} - diff --git a/html/unit_tests/spec/.eslintrc.json b/html/unit_tests/spec/.eslintrc.json deleted file mode 100644 index 4ed08dc660..0000000000 --- a/html/unit_tests/spec/.eslintrc.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "env": { - "mocha": true - }, - "globals": { - "expect": false - }, - "rules": { - "no-unused-expressions": "off" - } -} - diff --git a/libraries/phantomjs/.eslintrc.json b/libraries/phantomjs/.eslintrc.json deleted file mode 100644 index 549cd28632..0000000000 --- a/libraries/phantomjs/.eslintrc.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "env": { - "phantomjs": true - }, - "rules": { - "no-console": 0 - }, - "globals": { - "chart": false, - "inputChartOptions": false - } -} diff --git a/open_xdmod/modules/xdmod/automated_tests/.eslintrc.json b/open_xdmod/modules/xdmod/automated_tests/.eslintrc.json deleted file mode 100644 index 2a1c815dfc..0000000000 --- a/open_xdmod/modules/xdmod/automated_tests/.eslintrc.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "env": { - "mocha": true, - "node": true, - "es6": true - }, - "globals": { - "require": false, - "expect": false, - "browser": false, - "testHelpers": false, - "$": false, - "$$": false - }, - "rules": { - "class-methods-use-this": [0], - "no-underscore-dangle": [0], - "no-unused-expressions": [0] - } -} diff --git a/open_xdmod/modules/xdmod/regression_tests/.eslintrc.json b/open_xdmod/modules/xdmod/regression_tests/.eslintrc.json deleted file mode 100644 index 10d2238837..0000000000 --- a/open_xdmod/modules/xdmod/regression_tests/.eslintrc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "env": { - "node": true - } -} diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Day-reference.csv index 8b129e6e93..10353cb947 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Day-reference.csv @@ -8,7 +8,7 @@ start,end "Instance Type","Average Wall Hours per Session" c2.m4,52.40465278 c4.m16,35.26490741 -c1.m4,24.49683934 -c1.m1,1.10615741 +c1.m4,23.19631766 +c1.m1,1.10337963 c2.m8,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Month-reference.csv index 8b129e6e93..10353cb947 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Month-reference.csv @@ -8,7 +8,7 @@ start,end "Instance Type","Average Wall Hours per Session" c2.m4,52.40465278 c4.m16,35.26490741 -c1.m4,24.49683934 -c1.m1,1.10615741 +c1.m4,23.19631766 +c1.m1,1.10337963 c2.m8,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv index 8b129e6e93..10353cb947 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -8,7 +8,7 @@ start,end "Instance Type","Average Wall Hours per Session" c2.m4,52.40465278 c4.m16,35.26490741 -c1.m4,24.49683934 -c1.m1,1.10615741 +c1.m4,23.19631766 +c1.m1,1.10337963 c2.m8,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Year-reference.csv index 8b129e6e93..10353cb947 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/aggregate-Year-reference.csv @@ -8,7 +8,7 @@ start,end "Instance Type","Average Wall Hours per Session" c2.m4,52.40465278 c4.m16,35.26490741 -c1.m4,24.49683934 -c1.m1,1.10615741 +c1.m4,23.19631766 +c1.m1,1.10337963 c2.m8,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Day-reference.csv index fc2d72a9ab..d6636af8bd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[c2.m4] Average Wall Hours per Session","[c4.m16] Average Wall Hours per Session","[c1.m4] Average Wall Hours per Session","[c1.m1] Average Wall Hours per Session","[c2.m8] Average Wall Hours per Session" 2018-04-18,0.70833333,2.21361111,1.91267974,0.01555556,0.23583333 -2018-04-19,7.89694444,0,6.31328431,0.23756944,0 +2018-04-19,7.89694444,0,5.55785088,0.23340278,0 2018-04-20,24.00000000,0,4.90686111,0,0 2018-04-21,24.00000000,0,24.00000000,0,0 2018-04-22,24.00000000,0,24.00000000,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Month-reference.csv index 8b480d03c6..4d674e9b26 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[c2.m4] Average Wall Hours per Session","[c4.m16] Average Wall Hours per Session","[c1.m4] Average Wall Hours per Session","[c1.m1] Average Wall Hours per Session","[c2.m8] Average Wall Hours per Session" -2018-04,52.40465278,35.26490741,24.49683934,1.10615741,0.23583333 +2018-04,52.40465278,35.26490741,23.19631766,1.10337963,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv index 74a23e0913..ac27b2720f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[c2.m4] Average Wall Hours per Session","[c4.m16] Average Wall Hours per Session","[c1.m4] Average Wall Hours per Session","[c1.m1] Average Wall Hours per Session","[c2.m8] Average Wall Hours per Session" -"2018 Q2",52.40465278,35.26490741,24.49683934,1.10615741,0.23583333 +"2018 Q2",52.40465278,35.26490741,23.19631766,1.10337963,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Year-reference.csv index 1456cb9a63..bddf52e252 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_avg_wallduration_hours/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[c2.m4] Average Wall Hours per Session","[c4.m16] Average Wall Hours per Session","[c1.m4] Average Wall Hours per Session","[c1.m1] Average Wall Hours per Session","[c2.m8] Average Wall Hours per Session" -2018,52.40465278,35.26490741,24.49683934,1.10615741,0.23583333 +2018,52.40465278,35.26490741,23.19631766,1.10337963,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_time/timeseries-Day-reference.csv index 8c083e47cb..57f06e8c19 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[c1.m4] Core Hours: Total","[c4.m16] Core Hours: Total","[c2.m4] Core Hours: Total","[c1.m1] Core Hours: Total","[c2.m8] Core Hours: Total" 2018-04-18,32.5156,17.7089,1.4167,0.0156,0.4717 -2018-04-19,107.3258,0,31.5878,0.9503,0 +2018-04-19,105.5992,0,31.5878,0.9336,0 2018-04-20,49.0686,0,48.0000,0,0 2018-04-21,72.0000,0,48.0000,0,0 2018-04-22,72.0000,0,48.0000,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Day-reference.csv index 879c987c15..30641ff17b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Ended" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Month-reference.csv index 879c987c15..30641ff17b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Ended" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Quarter-reference.csv index 879c987c15..30641ff17b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Ended" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Year-reference.csv index 879c987c15..30641ff17b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Ended" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Day-reference.csv index 8b10f4e200..16067bb713 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[c1.m4] Number of Sessions Ended","[c1.m1] Number of Sessions Ended","[c2.m4] Number of Sessions Ended","[c4.m16] Number of Sessions Ended","[c2.m8] Number of Sessions Ended" 2018-04-18,10,1,1,2,1 -2018-04-19,16,4,1,0,0 +2018-04-19,18,4,1,0,0 2018-04-20,7,0,0,0,0 2018-04-21,0,0,0,0,0 2018-04-22,0,0,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Month-reference.csv index 207945deae..a40cd897b6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[c1.m4] Number of Sessions Ended","[c1.m1] Number of Sessions Ended","[c2.m4] Number of Sessions Ended","[c4.m16] Number of Sessions Ended","[c2.m8] Number of Sessions Ended" -2018-04,37,6,4,3,1 +2018-04,39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Quarter-reference.csv index 5e9b43f05f..bc4e0e24a2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[c1.m4] Number of Sessions Ended","[c1.m1] Number of Sessions Ended","[c2.m4] Number of Sessions Ended","[c4.m16] Number of Sessions Ended","[c2.m8] Number of Sessions Ended" -"2018 Q2",37,6,4,3,1 +"2018 Q2",39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Year-reference.csv index e45fdac1e6..08d6ed84f6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_ended/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[c1.m4] Number of Sessions Ended","[c1.m1] Number of Sessions Ended","[c2.m4] Number of Sessions Ended","[c4.m16] Number of Sessions Ended","[c2.m8] Number of Sessions Ended" -2018,37,6,4,3,1 +2018,39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Day-reference.csv index de83d65289..ceb48b48be 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Active Sessions (Number of Sessions)" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Month-reference.csv index de83d65289..ceb48b48be 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Active Sessions (Number of Sessions)" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Quarter-reference.csv index de83d65289..ceb48b48be 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Active Sessions (Number of Sessions)" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Year-reference.csv index de83d65289..ceb48b48be 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Active Sessions (Number of Sessions)" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Day-reference.csv index ab140845f1..3d4397dc27 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[c1.m4] Number of Active Sessions (Number of Sessions)","[c1.m1] Number of Active Sessions (Number of Sessions)","[c2.m4] Number of Active Sessions (Number of Sessions)","[c4.m16] Number of Active Sessions (Number of Sessions)","[c2.m8] Number of Active Sessions (Number of Sessions)" 2018-04-18,17,1,1,2,1 -2018-04-19,17,4,2,0,0 +2018-04-19,19,4,2,0,0 2018-04-20,10,0,1,0,0 2018-04-21,3,0,1,0,0 2018-04-22,3,0,1,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Month-reference.csv index 32660f1fa2..92098db668 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[c1.m4] Number of Active Sessions (Number of Sessions)","[c1.m1] Number of Active Sessions (Number of Sessions)","[c2.m4] Number of Active Sessions (Number of Sessions)","[c4.m16] Number of Active Sessions (Number of Sessions)","[c2.m8] Number of Active Sessions (Number of Sessions)" -2018-04,37,6,4,3,1 +2018-04,39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Quarter-reference.csv index 5f227e8af5..f8cb94fcc1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[c1.m4] Number of Active Sessions (Number of Sessions)","[c1.m1] Number of Active Sessions (Number of Sessions)","[c2.m4] Number of Active Sessions (Number of Sessions)","[c4.m16] Number of Active Sessions (Number of Sessions)","[c2.m8] Number of Active Sessions (Number of Sessions)" -"2018 Q2",37,6,4,3,1 +"2018 Q2",39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Year-reference.csv index 92c5016289..b27245656c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_running/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[c1.m4] Number of Active Sessions (Number of Sessions)","[c1.m1] Number of Active Sessions (Number of Sessions)","[c2.m4] Number of Active Sessions (Number of Sessions)","[c4.m16] Number of Active Sessions (Number of Sessions)","[c2.m8] Number of Active Sessions (Number of Sessions)" -2018,37,6,4,3,1 +2018,39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Day-reference.csv index 0d64b8ae95..776eb43900 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Started" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Month-reference.csv index 0d64b8ae95..776eb43900 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Started" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Quarter-reference.csv index 0d64b8ae95..776eb43900 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Started" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Year-reference.csv index 0d64b8ae95..776eb43900 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Number of Sessions Started" -c1.m4,37 +c1.m4,39 c1.m1,6 c2.m4,4 c4.m16,3 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Day-reference.csv index 59718da1b3..2a1ce1aa1e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[c1.m4] Number of Sessions Started","[c1.m1] Number of Sessions Started","[c2.m4] Number of Sessions Started","[c4.m16] Number of Sessions Started","[c2.m8] Number of Sessions Started" 2018-04-18,17,1,1,2,1 -2018-04-19,10,4,2,0,0 +2018-04-19,12,4,2,0,0 2018-04-20,9,0,0,0,0 2018-04-21,0,0,0,0,0 2018-04-22,0,0,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Month-reference.csv index 2a3303ab20..325bfc637c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[c1.m4] Number of Sessions Started","[c1.m1] Number of Sessions Started","[c2.m4] Number of Sessions Started","[c4.m16] Number of Sessions Started","[c2.m8] Number of Sessions Started" -2018-04,37,6,4,3,1 +2018-04,39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Quarter-reference.csv index 5352eeada5..90017d6f7b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[c1.m4] Number of Sessions Started","[c1.m1] Number of Sessions Started","[c2.m4] Number of Sessions Started","[c4.m16] Number of Sessions Started","[c2.m8] Number of Sessions Started" -"2018 Q2",37,6,4,3,1 +"2018 Q2",39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Year-reference.csv index 2298394d17..6b75eef5e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_num_sessions_started/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[c1.m4] Number of Sessions Started","[c1.m1] Number of Sessions Started","[c2.m4] Number of Sessions Started","[c4.m16] Number of Sessions Started","[c2.m8] Number of Sessions Started" -2018,37,6,4,3,1 +2018,39,6,4,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_wall_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_wall_time/timeseries-Day-reference.csv index 4dd3399a0d..0921bf1999 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_wall_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_wall_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[c1.m4] Wall Hours: Total","[c2.m4] Wall Hours: Total","[c4.m16] Wall Hours: Total","[c1.m1] Wall Hours: Total","[c2.m8] Wall Hours: Total" 2018-04-18,32.5156,0.7083,4.4272,0.0156,0.2358 -2018-04-19,107.3258,15.7939,0,0.9503,0 +2018-04-19,105.5992,15.7939,0,0.9336,0 2018-04-20,49.0686,24.0000,0,0,0 2018-04-21,72.0000,24.0000,0,0,0 2018-04-22,72.0000,24.0000,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Day-reference.csv index 2547b0d134..7d11cd3a82 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Average Wall Hours per Session" -Screwdriver,24.09155229 +Screwdriver,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Month-reference.csv index 2547b0d134..7d11cd3a82 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Average Wall Hours per Session" -Screwdriver,24.09155229 +Screwdriver,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv index 2547b0d134..7d11cd3a82 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Average Wall Hours per Session" -Screwdriver,24.09155229 +Screwdriver,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Year-reference.csv index 2547b0d134..7d11cd3a82 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Average Wall Hours per Session" -Screwdriver,24.09155229 +Screwdriver,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Day-reference.csv index c6bc4a2593..698df4cee8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[Screwdriver] Average Wall Hours per Session" 2018-04-18,1.72284091 -2018-04-19,5.39434783 +2018-04-19,4.89306667 2018-04-20,6.64260101 2018-04-21,24.00000000 2018-04-22,24.00000000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Month-reference.csv index 3d365d23ba..2e73f43f63 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Screwdriver] Average Wall Hours per Session" -2018-04,24.09155229 +2018-04,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv index d4ebd3d399..40e482fa8d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Screwdriver] Average Wall Hours per Session" -"2018 Q2",24.09155229 +"2018 Q2",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Year-reference.csv index 7436ac1b25..0172857d18 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_avg_wallduration_hours/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Screwdriver] Average Wall Hours per Session" -2018,24.09155229 +2018,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_time/timeseries-Day-reference.csv index 06b1b55058..578397445c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[Screwdriver] Core Hours: Total" 2018-04-18,52.1283 -2018-04-19,139.8639 +2018-04-19,138.1206 2018-04-20,97.0686 2018-04-21,120.0000 2018-04-22,120.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Day-reference.csv index d3e8c80fbd..505cbfe473 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Ended" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Month-reference.csv index d3e8c80fbd..505cbfe473 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Ended" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Quarter-reference.csv index d3e8c80fbd..505cbfe473 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Ended" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Year-reference.csv index d3e8c80fbd..505cbfe473 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Ended" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Day-reference.csv index c5362efd7d..1bbc8947f4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[Screwdriver] Number of Sessions Ended" 2018-04-18,15 -2018-04-19,21 +2018-04-19,23 2018-04-20,7 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Month-reference.csv index 62e839b275..04e819cf7c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Screwdriver] Number of Sessions Ended" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Quarter-reference.csv index fb6e2b2b0d..3f10522b80 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Screwdriver] Number of Sessions Ended" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Year-reference.csv index 41b6fc8995..78078bee64 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_ended/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Screwdriver] Number of Sessions Ended" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Day-reference.csv index 4d74223c92..4aad10be1b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Active Sessions (Number of Sessions)" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Month-reference.csv index 4d74223c92..4aad10be1b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Active Sessions (Number of Sessions)" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Quarter-reference.csv index 4d74223c92..4aad10be1b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Active Sessions (Number of Sessions)" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Year-reference.csv index 4d74223c92..4aad10be1b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Active Sessions (Number of Sessions)" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Day-reference.csv index c24000e996..c0209bb6f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[Screwdriver] Number of Active Sessions (Number of Sessions)" 2018-04-18,22 -2018-04-19,23 +2018-04-19,25 2018-04-20,11 2018-04-21,4 2018-04-22,4 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Month-reference.csv index 78375a9b85..fe869866bd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Screwdriver] Number of Active Sessions (Number of Sessions)" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Quarter-reference.csv index 462e96af86..e729db7811 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Screwdriver] Number of Active Sessions (Number of Sessions)" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Year-reference.csv index 211cc5eabc..e1d7946edc 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_running/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Screwdriver] Number of Active Sessions (Number of Sessions)" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Day-reference.csv index d24acd2ea8..4629de7b6b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Started" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Month-reference.csv index d24acd2ea8..4629de7b6b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Started" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Quarter-reference.csv index d24acd2ea8..4629de7b6b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Started" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Year-reference.csv index d24acd2ea8..4629de7b6b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Number of Sessions Started" -Screwdriver,51 +Screwdriver,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Day-reference.csv index a1a3429ffa..673d902b14 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[Screwdriver] Number of Sessions Started" 2018-04-18,22 -2018-04-19,16 +2018-04-19,18 2018-04-20,9 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Month-reference.csv index 3a15870ee6..4e67bd5f1e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Screwdriver] Number of Sessions Started" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Quarter-reference.csv index 0113cfc690..5ff870b2a6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Screwdriver] Number of Sessions Started" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Year-reference.csv index ec540b5393..c1417d8bf3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_num_sessions_started/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Screwdriver] Number of Sessions Started" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_wall_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_wall_time/timeseries-Day-reference.csv index d5dc00818e..0ad540a8c3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_wall_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_wall_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[Screwdriver] Wall Hours: Total" 2018-04-18,37.9025 -2018-04-19,124.0700 +2018-04-19,122.3267 2018-04-20,73.0686 2018-04-21,96.0000 2018-04-22,96.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Day-reference.csv index e1145f274f..4f4eeca57e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Average Wall Hours per Session" -zealous,24.09155229 +zealous,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Month-reference.csv index e1145f274f..4f4eeca57e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Average Wall Hours per Session" -zealous,24.09155229 +zealous,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv index e1145f274f..4f4eeca57e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Average Wall Hours per Session" -zealous,24.09155229 +zealous,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Year-reference.csv index e1145f274f..4f4eeca57e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Average Wall Hours per Session" -zealous,24.09155229 +zealous,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Day-reference.csv index 16cb9a174a..cfd78630ab 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[zealous] Average Wall Hours per Session" 2018-04-18,1.72284091 -2018-04-19,5.39434783 +2018-04-19,4.89306667 2018-04-20,6.64260101 2018-04-21,24.00000000 2018-04-22,24.00000000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Month-reference.csv index 0d74bec787..ef0077c78b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[zealous] Average Wall Hours per Session" -2018-04,24.09155229 +2018-04,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv index 445d5050f0..fca088eb69 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[zealous] Average Wall Hours per Session" -"2018 Q2",24.09155229 +"2018 Q2",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Year-reference.csv index 304755adb0..89c05b7bdb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_avg_wallduration_hours/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[zealous] Average Wall Hours per Session" -2018,24.09155229 +2018,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_time/timeseries-Day-reference.csv index 7ef3e83987..f45bff23ad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[zealous] Core Hours: Total" 2018-04-18,52.1283 -2018-04-19,139.8639 +2018-04-19,138.1206 2018-04-20,97.0686 2018-04-21,120.0000 2018-04-22,120.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Day-reference.csv index 1fb2f7ad5f..9bed979a7e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Ended" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Month-reference.csv index 1fb2f7ad5f..9bed979a7e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Ended" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Quarter-reference.csv index 1fb2f7ad5f..9bed979a7e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Ended" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Year-reference.csv index 1fb2f7ad5f..9bed979a7e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Ended" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Day-reference.csv index ebb0f96dad..ec0cc80afa 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[zealous] Number of Sessions Ended" 2018-04-18,15 -2018-04-19,21 +2018-04-19,23 2018-04-20,7 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Month-reference.csv index 5c3b1de393..ce01842432 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[zealous] Number of Sessions Ended" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Quarter-reference.csv index 049ef92bcb..564b67d05b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[zealous] Number of Sessions Ended" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Year-reference.csv index d042105b20..5644e8eb6e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_ended/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[zealous] Number of Sessions Ended" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Day-reference.csv index c03d3991e8..d29c46ecd8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Active Sessions (Number of Sessions)" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Month-reference.csv index c03d3991e8..d29c46ecd8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Active Sessions (Number of Sessions)" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Quarter-reference.csv index c03d3991e8..d29c46ecd8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Active Sessions (Number of Sessions)" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Year-reference.csv index c03d3991e8..d29c46ecd8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Active Sessions (Number of Sessions)" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Day-reference.csv index 91b9c4f4a0..f088e18353 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[zealous] Number of Active Sessions (Number of Sessions)" 2018-04-18,22 -2018-04-19,23 +2018-04-19,25 2018-04-20,11 2018-04-21,4 2018-04-22,4 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Month-reference.csv index 5243f9c37f..1dabce48a3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[zealous] Number of Active Sessions (Number of Sessions)" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Quarter-reference.csv index 5b00a98c2c..cc7b47b6db 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[zealous] Number of Active Sessions (Number of Sessions)" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Year-reference.csv index 625b6931a1..3f4db256b4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_running/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[zealous] Number of Active Sessions (Number of Sessions)" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Day-reference.csv index 172eaca820..848431fa3b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Started" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Month-reference.csv index 172eaca820..848431fa3b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Started" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Quarter-reference.csv index 172eaca820..848431fa3b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Started" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Year-reference.csv index 172eaca820..848431fa3b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Number of Sessions Started" -zealous,51 +zealous,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Day-reference.csv index 00df57e5b5..9ce92f3e71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[zealous] Number of Sessions Started" 2018-04-18,22 -2018-04-19,16 +2018-04-19,18 2018-04-20,9 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Month-reference.csv index e3d4eb81ce..01027968cb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[zealous] Number of Sessions Started" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Quarter-reference.csv index 401ea669cb..ffe6cb2fd6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[zealous] Number of Sessions Started" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Year-reference.csv index dbb6d69a9a..5137186e4b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_num_sessions_started/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[zealous] Number of Sessions Started" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_wall_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_wall_time/timeseries-Day-reference.csv index 496be96b97..0e9f167616 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_wall_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_wall_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[zealous] Wall Hours: Total" 2018-04-18,37.9025 -2018-04-19,124.0700 +2018-04-19,122.3267 2018-04-20,73.0686 2018-04-21,96.0000 2018-04-22,96.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Day-reference.csv index f3b4445fea..64da80d55d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Average Wall Hours per Session" -openstack,24.09155229 +openstack,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Month-reference.csv index f3b4445fea..64da80d55d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Average Wall Hours per Session" -openstack,24.09155229 +openstack,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv index f3b4445fea..64da80d55d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Average Wall Hours per Session" -openstack,24.09155229 +openstack,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Year-reference.csv index f3b4445fea..64da80d55d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Average Wall Hours per Session" -openstack,24.09155229 +openstack,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Day-reference.csv index 644cf44bf6..4d8815db37 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[openstack] Average Wall Hours per Session" 2018-04-18,1.72284091 -2018-04-19,5.39434783 +2018-04-19,4.89306667 2018-04-20,6.64260101 2018-04-21,24.00000000 2018-04-22,24.00000000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Month-reference.csv index 0ac3c9a661..cb5aaabd5e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[openstack] Average Wall Hours per Session" -2018-04,24.09155229 +2018-04,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv index f461c4a36a..eb55f56e09 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[openstack] Average Wall Hours per Session" -"2018 Q2",24.09155229 +"2018 Q2",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Year-reference.csv index d7eee33edd..00f71ba286 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_avg_wallduration_hours/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[openstack] Average Wall Hours per Session" -2018,24.09155229 +2018,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_time/timeseries-Day-reference.csv index 8d9bc1e4af..840dfd396f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[openstack] Core Hours: Total" 2018-04-18,52.1283 -2018-04-19,139.8639 +2018-04-19,138.1206 2018-04-20,97.0686 2018-04-21,120.0000 2018-04-22,120.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Day-reference.csv index 7069c69847..c28f04bd0e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Ended" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Month-reference.csv index 7069c69847..c28f04bd0e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Ended" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Quarter-reference.csv index 7069c69847..c28f04bd0e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Ended" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Year-reference.csv index 7069c69847..c28f04bd0e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Ended" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Day-reference.csv index 326a2b22c1..ddeeb8d272 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[openstack] Number of Sessions Ended" 2018-04-18,15 -2018-04-19,21 +2018-04-19,23 2018-04-20,7 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Month-reference.csv index e4368664c1..a15e4cacb1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[openstack] Number of Sessions Ended" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Quarter-reference.csv index 272ccbc68b..677631fe1a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[openstack] Number of Sessions Ended" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Year-reference.csv index 24ada2ad07..6070fba798 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_ended/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[openstack] Number of Sessions Ended" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Day-reference.csv index ff14aec619..31b9f474e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Active Sessions (Number of Sessions)" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Month-reference.csv index ff14aec619..31b9f474e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Active Sessions (Number of Sessions)" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Quarter-reference.csv index ff14aec619..31b9f474e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Active Sessions (Number of Sessions)" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Year-reference.csv index ff14aec619..31b9f474e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Active Sessions (Number of Sessions)" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Day-reference.csv index c41970758e..6fce489f38 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[openstack] Number of Active Sessions (Number of Sessions)" 2018-04-18,22 -2018-04-19,23 +2018-04-19,25 2018-04-20,11 2018-04-21,4 2018-04-22,4 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Month-reference.csv index 13ac28c98f..3e26180725 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[openstack] Number of Active Sessions (Number of Sessions)" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Quarter-reference.csv index 33fee3af8a..5e39606ff5 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[openstack] Number of Active Sessions (Number of Sessions)" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Year-reference.csv index 2aaf72ecd4..f2ccce0d84 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_running/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[openstack] Number of Active Sessions (Number of Sessions)" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Day-reference.csv index f30069c24f..86660be25b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Started" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Month-reference.csv index f30069c24f..86660be25b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Started" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Quarter-reference.csv index f30069c24f..86660be25b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Started" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Year-reference.csv index f30069c24f..86660be25b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Number of Sessions Started" -openstack,51 +openstack,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Day-reference.csv index 6ccd8edb4d..0dc78031ba 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[openstack] Number of Sessions Started" 2018-04-18,22 -2018-04-19,16 +2018-04-19,18 2018-04-20,9 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Month-reference.csv index e8bddf0b6b..4fecd74b94 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[openstack] Number of Sessions Started" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Quarter-reference.csv index ab8072e5a5..ac1603b741 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[openstack] Number of Sessions Started" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Year-reference.csv index 8ca2a10c44..cb8f8df4ba 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_num_sessions_started/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[openstack] Number of Sessions Started" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_wall_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_wall_time/timeseries-Day-reference.csv index 9ae8311fb1..de8ccfbb71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_wall_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_wall_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[openstack] Wall Hours: Total" 2018-04-18,37.9025 -2018-04-19,124.0700 +2018-04-19,122.3267 2018-04-20,73.0686 2018-04-21,96.0000 2018-04-22,96.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Day-reference.csv index b10de1e8cc..37d3b6fb8b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Average Wall Hours per Session" -"OpenStack API",24.09155229 +"OpenStack API",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Month-reference.csv index b10de1e8cc..37d3b6fb8b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Average Wall Hours per Session" -"OpenStack API",24.09155229 +"OpenStack API",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv index b10de1e8cc..37d3b6fb8b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Average Wall Hours per Session" -"OpenStack API",24.09155229 +"OpenStack API",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Year-reference.csv index b10de1e8cc..37d3b6fb8b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Average Wall Hours per Session" -"OpenStack API",24.09155229 +"OpenStack API",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Day-reference.csv index 91f80fca40..4a58cc60d7 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[OpenStack API] Average Wall Hours per Session" 2018-04-18,1.72284091 -2018-04-19,5.39434783 +2018-04-19,4.89306667 2018-04-20,6.64260101 2018-04-21,24.00000000 2018-04-22,24.00000000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Month-reference.csv index 67feaca05f..164fba77f6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[OpenStack API] Average Wall Hours per Session" -2018-04,24.09155229 +2018-04,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv index 2b5fe1ff7f..7e4e4f8e5b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[OpenStack API] Average Wall Hours per Session" -"2018 Q2",24.09155229 +"2018 Q2",23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Year-reference.csv index 4372ef3dfe..3bf29da8a4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_avg_wallduration_hours/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[OpenStack API] Average Wall Hours per Session" -2018,24.09155229 +2018,23.14954403 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_time/timeseries-Day-reference.csv index 880ab54903..3bdadfb7ec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[OpenStack API] Core Hours: Total" 2018-04-18,52.1283 -2018-04-19,139.8639 +2018-04-19,138.1206 2018-04-20,97.0686 2018-04-21,120.0000 2018-04-22,120.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Day-reference.csv index 13a385a4ff..1944ee23c8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Ended" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Month-reference.csv index 13a385a4ff..1944ee23c8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Ended" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Quarter-reference.csv index 13a385a4ff..1944ee23c8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Ended" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Year-reference.csv index 13a385a4ff..1944ee23c8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Ended" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Day-reference.csv index 3553ef1b79..32c85fae14 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[OpenStack API] Number of Sessions Ended" 2018-04-18,15 -2018-04-19,21 +2018-04-19,23 2018-04-20,7 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Month-reference.csv index 3d6903edcb..172ab89b52 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[OpenStack API] Number of Sessions Ended" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Quarter-reference.csv index dc32493c7f..ebaadb5bc1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[OpenStack API] Number of Sessions Ended" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Year-reference.csv index fe2b467021..0294f3a0d0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_ended/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[OpenStack API] Number of Sessions Ended" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Day-reference.csv index a31149a2c2..75827ddc35 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Active Sessions (Number of Sessions)" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Month-reference.csv index a31149a2c2..75827ddc35 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Active Sessions (Number of Sessions)" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Quarter-reference.csv index a31149a2c2..75827ddc35 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Active Sessions (Number of Sessions)" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Year-reference.csv index a31149a2c2..75827ddc35 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Active Sessions (Number of Sessions)" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Day-reference.csv index fe131bb53a..09f14ea3f3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[OpenStack API] Number of Active Sessions (Number of Sessions)" 2018-04-18,22 -2018-04-19,23 +2018-04-19,25 2018-04-20,11 2018-04-21,4 2018-04-22,4 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Month-reference.csv index fc2942f17e..32b094466b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[OpenStack API] Number of Active Sessions (Number of Sessions)" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Quarter-reference.csv index b77e8a5db6..14a46b50f0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[OpenStack API] Number of Active Sessions (Number of Sessions)" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Year-reference.csv index 373c748f2a..c936263f27 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_running/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[OpenStack API] Number of Active Sessions (Number of Sessions)" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Day-reference.csv index 1416e151ee..6d1a356c71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Started" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Month-reference.csv index 1416e151ee..6d1a356c71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Started" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Quarter-reference.csv index 1416e151ee..6d1a356c71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Started" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Year-reference.csv index 1416e151ee..6d1a356c71 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Number of Sessions Started" -"OpenStack API",51 +"OpenStack API",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Day-reference.csv index 2f53f52c76..f59bf67e5b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[OpenStack API] Number of Sessions Started" 2018-04-18,22 -2018-04-19,16 +2018-04-19,18 2018-04-20,9 2018-04-21,0 2018-04-22,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Month-reference.csv index 884fd7ef35..6ad802d3e6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[OpenStack API] Number of Sessions Started" -2018-04,51 +2018-04,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Quarter-reference.csv index 7a779a7016..547d0ca149 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[OpenStack API] Number of Sessions Started" -"2018 Q2",51 +"2018 Q2",53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Year-reference.csv index 6853aed2b2..1ac5fc59f4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_num_sessions_started/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[OpenStack API] Number of Sessions Started" -2018,51 +2018,53 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_wall_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_wall_time/timeseries-Day-reference.csv index 9d73678ec1..aa7eb2f1aa 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_wall_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_wall_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[OpenStack API] Wall Hours: Total" 2018-04-18,37.9025 -2018-04-19,124.0700 +2018-04-19,122.3267 2018-04-20,73.0686 2018-04-21,96.0000 2018-04-22,96.0000 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Day-reference.csv index 3836723d63..03d0c8a5af 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Average Wall Hours per Session" -1,21.23302326 +1,20.25059259 "2 - 3",41.97088889 "4 - 7",35.26490741 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Month-reference.csv index 3836723d63..03d0c8a5af 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Average Wall Hours per Session" -1,21.23302326 +1,20.25059259 "2 - 3",41.97088889 "4 - 7",35.26490741 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv index 3836723d63..03d0c8a5af 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Average Wall Hours per Session" -1,21.23302326 +1,20.25059259 "2 - 3",41.97088889 "4 - 7",35.26490741 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Year-reference.csv index 3836723d63..03d0c8a5af 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Average Wall Hours per Session" -1,21.23302326 +1,20.25059259 "2 - 3",41.97088889 "4 - 7",35.26490741 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Day-reference.csv index 18c3b222d2..3be6f1f934 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[1] Average Wall Hours per Session","[2 - 3] Average Wall Hours per Session","[4 - 7] Average Wall Hours per Session" 2018-04-18,1.80728395,0.47208333,2.21361111 -2018-04-19,5.15600529,7.89694444,0 +2018-04-19,4.63185990,7.89694444,0 2018-04-20,4.90686111,24.00000000,0 2018-04-21,24.00000000,24.00000000,0 2018-04-22,24.00000000,24.00000000,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Month-reference.csv index 0691279f00..71ce589913 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[1] Average Wall Hours per Session","[2 - 3] Average Wall Hours per Session","[4 - 7] Average Wall Hours per Session" -2018-04,21.23302326,41.97088889,35.26490741 +2018-04,20.25059259,41.97088889,35.26490741 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv index 17c8870175..58c014bdec 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[1] Average Wall Hours per Session","[2 - 3] Average Wall Hours per Session","[4 - 7] Average Wall Hours per Session" -"2018 Q2",21.23302326,41.97088889,35.26490741 +"2018 Q2",20.25059259,41.97088889,35.26490741 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Year-reference.csv index 4975be4382..bd32511ceb 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_avg_wallduration_hours/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[1] Average Wall Hours per Session","[2 - 3] Average Wall Hours per Session","[4 - 7] Average Wall Hours per Session" -2018,21.23302326,41.97088889,35.26490741 +2018,20.25059259,41.97088889,35.26490741 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_time/timeseries-Day-reference.csv index 0d27c020dc..fdc2e3e34c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[1] Core Hours: Total","[2 - 3] Core Hours: Total","[4 - 7] Core Hours: Total" 2018-04-18,32.5311,1.8883,17.7089 -2018-04-19,108.2761,31.5878,0 +2018-04-19,106.5328,31.5878,0 2018-04-20,49.0686,48.0000,0 2018-04-21,72.0000,48.0000,0 2018-04-22,72.0000,48.0000,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Day-reference.csv index a47286c3bd..5aaa59aa12 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Ended" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Month-reference.csv index a47286c3bd..5aaa59aa12 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Ended" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Quarter-reference.csv index a47286c3bd..5aaa59aa12 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Ended" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Year-reference.csv index a47286c3bd..5aaa59aa12 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Ended" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Day-reference.csv index 7edd232866..7b647ed0e0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[1] Number of Sessions Ended","[2 - 3] Number of Sessions Ended","[4 - 7] Number of Sessions Ended" 2018-04-18,11,2,2 -2018-04-19,20,1,0 +2018-04-19,22,1,0 2018-04-20,7,0,0 2018-04-21,0,0,0 2018-04-22,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Month-reference.csv index 52ffe1771d..1e51e74f67 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[1] Number of Sessions Ended","[2 - 3] Number of Sessions Ended","[4 - 7] Number of Sessions Ended" -2018-04,43,5,3 +2018-04,45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Quarter-reference.csv index 3855142678..1c1a09715f 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[1] Number of Sessions Ended","[2 - 3] Number of Sessions Ended","[4 - 7] Number of Sessions Ended" -"2018 Q2",43,5,3 +"2018 Q2",45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Year-reference.csv index 6fb18279d8..7d1c40c402 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_ended/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[1] Number of Sessions Ended","[2 - 3] Number of Sessions Ended","[4 - 7] Number of Sessions Ended" -2018,43,5,3 +2018,45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Day-reference.csv index d6955c0c80..336b141f07 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Active Sessions (Number of Sessions)" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Month-reference.csv index d6955c0c80..336b141f07 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Active Sessions (Number of Sessions)" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Quarter-reference.csv index d6955c0c80..336b141f07 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Active Sessions (Number of Sessions)" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Year-reference.csv index d6955c0c80..336b141f07 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Active Sessions (Number of Sessions)" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Day-reference.csv index e52f123b5c..8d6578013a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[1] Number of Active Sessions (Number of Sessions)","[2 - 3] Number of Active Sessions (Number of Sessions)","[4 - 7] Number of Active Sessions (Number of Sessions)" 2018-04-18,18,2,2 -2018-04-19,21,2,0 +2018-04-19,23,2,0 2018-04-20,10,1,0 2018-04-21,3,1,0 2018-04-22,3,1,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Month-reference.csv index 3e162c3d2f..3a52991527 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[1] Number of Active Sessions (Number of Sessions)","[2 - 3] Number of Active Sessions (Number of Sessions)","[4 - 7] Number of Active Sessions (Number of Sessions)" -2018-04,43,5,3 +2018-04,45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Quarter-reference.csv index deaf10d286..bba78b3116 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[1] Number of Active Sessions (Number of Sessions)","[2 - 3] Number of Active Sessions (Number of Sessions)","[4 - 7] Number of Active Sessions (Number of Sessions)" -"2018 Q2",43,5,3 +"2018 Q2",45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Year-reference.csv index 1da63672ec..bc7456358c 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_running/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[1] Number of Active Sessions (Number of Sessions)","[2 - 3] Number of Active Sessions (Number of Sessions)","[4 - 7] Number of Active Sessions (Number of Sessions)" -2018,43,5,3 +2018,45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Day-reference.csv index 181ab6d57f..be912a9ba6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Started" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Month-reference.csv index 181ab6d57f..be912a9ba6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Started" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Quarter-reference.csv index 181ab6d57f..be912a9ba6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Started" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Year-reference.csv index 181ab6d57f..be912a9ba6 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Number of Sessions Started" -1,43 +1,45 "2 - 3",5 "4 - 7",3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Day-reference.csv index 03e648e597..c33eb90fd4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[1] Number of Sessions Started","[2 - 3] Number of Sessions Started","[4 - 7] Number of Sessions Started" 2018-04-18,18,2,2 -2018-04-19,14,2,0 +2018-04-19,16,2,0 2018-04-20,9,0,0 2018-04-21,0,0,0 2018-04-22,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Month-reference.csv index aceb274389..087bb6e46b 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[1] Number of Sessions Started","[2 - 3] Number of Sessions Started","[4 - 7] Number of Sessions Started" -2018-04,43,5,3 +2018-04,45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Quarter-reference.csv index 5cda90579d..23464cb5c2 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[1] Number of Sessions Started","[2 - 3] Number of Sessions Started","[4 - 7] Number of Sessions Started" -"2018 Q2",43,5,3 +"2018 Q2",45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Year-reference.csv index 9217e62832..51a8204c3e 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_num_sessions_started/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[1] Number of Sessions Started","[2 - 3] Number of Sessions Started","[4 - 7] Number of Sessions Started" -2018,43,5,3 +2018,45,5,3 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_wall_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_wall_time/timeseries-Day-reference.csv index a20bcbd1c8..7ad3fe1bc8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_wall_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_wall_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[1] Wall Hours: Total","[2 - 3] Wall Hours: Total","[4 - 7] Wall Hours: Total" 2018-04-18,32.5311,0.9442,4.4272 -2018-04-19,108.2761,15.7939,0 +2018-04-19,106.5328,15.7939,0 2018-04-20,49.0686,24.0000,0 2018-04-21,72.0000,24.0000,0 2018-04-22,72.0000,24.0000,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Day-reference.csv index 527f2bb0f2..c1d3ad414a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- "VM Size: Memory","Average Wall Hours per Session" "8 - 16 GB",35.26490741 -"2 - 4 GB",27.21955285 -"< 2 GB",1.10615741 +"2 - 4 GB",25.91337209 +"< 2 GB",1.10337963 "4 - 8 GB",0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Month-reference.csv index 527f2bb0f2..c1d3ad414a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Month-reference.csv @@ -7,7 +7,7 @@ start,end --------- "VM Size: Memory","Average Wall Hours per Session" "8 - 16 GB",35.26490741 -"2 - 4 GB",27.21955285 -"< 2 GB",1.10615741 +"2 - 4 GB",25.91337209 +"< 2 GB",1.10337963 "4 - 8 GB",0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv index 527f2bb0f2..c1d3ad414a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Quarter-reference.csv @@ -7,7 +7,7 @@ start,end --------- "VM Size: Memory","Average Wall Hours per Session" "8 - 16 GB",35.26490741 -"2 - 4 GB",27.21955285 -"< 2 GB",1.10615741 +"2 - 4 GB",25.91337209 +"< 2 GB",1.10337963 "4 - 8 GB",0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Year-reference.csv index 527f2bb0f2..c1d3ad414a 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/aggregate-Year-reference.csv @@ -7,7 +7,7 @@ start,end --------- "VM Size: Memory","Average Wall Hours per Session" "8 - 16 GB",35.26490741 -"2 - 4 GB",27.21955285 -"< 2 GB",1.10615741 +"2 - 4 GB",25.91337209 +"< 2 GB",1.10337963 "4 - 8 GB",0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Day-reference.csv index 9ed67a0b94..bf9c3f0edd 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[8 - 16 GB] Average Wall Hours per Session","[2 - 4 GB] Average Wall Hours per Session","[< 2 GB] Average Wall Hours per Session","[4 - 8 GB] Average Wall Hours per Session" 2018-04-18,2.21361111,1.84577160,0.01555556,0.23583333 -2018-04-19,0,6.47998538,0.23756944,0 +2018-04-19,0,5.78062169,0.23340278,0 2018-04-20,0,6.64260101,0,0 2018-04-21,0,24.00000000,0,0 2018-04-22,0,24.00000000,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Month-reference.csv index b434b03f0e..6ea7901793 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[8 - 16 GB] Average Wall Hours per Session","[2 - 4 GB] Average Wall Hours per Session","[< 2 GB] Average Wall Hours per Session","[4 - 8 GB] Average Wall Hours per Session" -2018-04,35.26490741,27.21955285,1.10615741,0.23583333 +2018-04,35.26490741,25.91337209,1.10337963,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv index 57c08e7afe..7e08bffe77 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[8 - 16 GB] Average Wall Hours per Session","[2 - 4 GB] Average Wall Hours per Session","[< 2 GB] Average Wall Hours per Session","[4 - 8 GB] Average Wall Hours per Session" -"2018 Q2",35.26490741,27.21955285,1.10615741,0.23583333 +"2018 Q2",35.26490741,25.91337209,1.10337963,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Year-reference.csv index 3e8652487d..befd83b2c3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_avg_wallduration_hours/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[8 - 16 GB] Average Wall Hours per Session","[2 - 4 GB] Average Wall Hours per Session","[< 2 GB] Average Wall Hours per Session","[4 - 8 GB] Average Wall Hours per Session" -2018,35.26490741,27.21955285,1.10615741,0.23583333 +2018,35.26490741,25.91337209,1.10337963,0.23583333 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_time/timeseries-Day-reference.csv index 2bf2238603..422063794d 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[2 - 4 GB] Core Hours: Total","[8 - 16 GB] Core Hours: Total","[< 2 GB] Core Hours: Total","[4 - 8 GB] Core Hours: Total" 2018-04-18,33.9322,17.7089,0.0156,0.4717 -2018-04-19,138.9136,0,0.9503,0 +2018-04-19,137.1869,0,0.9336,0 2018-04-20,97.0686,0,0,0 2018-04-21,120.0000,0,0,0 2018-04-22,120.0000,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Day-reference.csv index e5cde76ced..0c805f5ba4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Ended" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Month-reference.csv index e5cde76ced..0c805f5ba4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Ended" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Quarter-reference.csv index e5cde76ced..0c805f5ba4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Ended" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Year-reference.csv index e5cde76ced..0c805f5ba4 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Ended" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Day-reference.csv index c279b98290..2f309906c0 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[2 - 4 GB] Number of Sessions Ended","[< 2 GB] Number of Sessions Ended","[8 - 16 GB] Number of Sessions Ended","[4 - 8 GB] Number of Sessions Ended" 2018-04-18,11,1,2,1 -2018-04-19,17,4,0,0 +2018-04-19,19,4,0,0 2018-04-20,7,0,0,0 2018-04-21,0,0,0,0 2018-04-22,0,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Month-reference.csv index c938af5e81..c565bab324 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[2 - 4 GB] Number of Sessions Ended","[< 2 GB] Number of Sessions Ended","[8 - 16 GB] Number of Sessions Ended","[4 - 8 GB] Number of Sessions Ended" -2018-04,41,6,3,1 +2018-04,43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Quarter-reference.csv index 8d0b5c9be8..4bc65442d9 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[2 - 4 GB] Number of Sessions Ended","[< 2 GB] Number of Sessions Ended","[8 - 16 GB] Number of Sessions Ended","[4 - 8 GB] Number of Sessions Ended" -"2018 Q2",41,6,3,1 +"2018 Q2",43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Year-reference.csv index 60588d0a5c..15bbe5c5b3 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_ended/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[2 - 4 GB] Number of Sessions Ended","[< 2 GB] Number of Sessions Ended","[8 - 16 GB] Number of Sessions Ended","[4 - 8 GB] Number of Sessions Ended" -2018,41,6,3,1 +2018,43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Day-reference.csv index af5f5e76f5..dec3ff90ad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Active Sessions (Number of Sessions)" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Month-reference.csv index af5f5e76f5..dec3ff90ad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Active Sessions (Number of Sessions)" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Quarter-reference.csv index af5f5e76f5..dec3ff90ad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Active Sessions (Number of Sessions)" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Year-reference.csv index af5f5e76f5..dec3ff90ad 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Active Sessions (Number of Sessions)" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Day-reference.csv index 0c142cf31e..96726eeb41 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[2 - 4 GB] Number of Active Sessions (Number of Sessions)","[< 2 GB] Number of Active Sessions (Number of Sessions)","[8 - 16 GB] Number of Active Sessions (Number of Sessions)","[4 - 8 GB] Number of Active Sessions (Number of Sessions)" 2018-04-18,18,1,2,1 -2018-04-19,19,4,0,0 +2018-04-19,21,4,0,0 2018-04-20,11,0,0,0 2018-04-21,4,0,0,0 2018-04-22,4,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Month-reference.csv index d36df9da68..7894d58e57 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[2 - 4 GB] Number of Active Sessions (Number of Sessions)","[< 2 GB] Number of Active Sessions (Number of Sessions)","[8 - 16 GB] Number of Active Sessions (Number of Sessions)","[4 - 8 GB] Number of Active Sessions (Number of Sessions)" -2018-04,41,6,3,1 +2018-04,43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Quarter-reference.csv index 58aa72642a..4898693a81 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[2 - 4 GB] Number of Active Sessions (Number of Sessions)","[< 2 GB] Number of Active Sessions (Number of Sessions)","[8 - 16 GB] Number of Active Sessions (Number of Sessions)","[4 - 8 GB] Number of Active Sessions (Number of Sessions)" -"2018 Q2",41,6,3,1 +"2018 Q2",43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Year-reference.csv index 09add973a0..4cf562d1a8 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_running/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[2 - 4 GB] Number of Active Sessions (Number of Sessions)","[< 2 GB] Number of Active Sessions (Number of Sessions)","[8 - 16 GB] Number of Active Sessions (Number of Sessions)","[4 - 8 GB] Number of Active Sessions (Number of Sessions)" -2018,41,6,3,1 +2018,43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Day-reference.csv index f4e011bbef..0f3f632cfe 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Started" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Month-reference.csv index f4e011bbef..0f3f632cfe 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Started" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Quarter-reference.csv index f4e011bbef..0f3f632cfe 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Started" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Year-reference.csv index f4e011bbef..0f3f632cfe 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Number of Sessions Started" -"2 - 4 GB",41 +"2 - 4 GB",43 "< 2 GB",6 "8 - 16 GB",3 "4 - 8 GB",1 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Day-reference.csv index 2e99682937..3d2dad9016 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[2 - 4 GB] Number of Sessions Started","[< 2 GB] Number of Sessions Started","[8 - 16 GB] Number of Sessions Started","[4 - 8 GB] Number of Sessions Started" 2018-04-18,18,1,2,1 -2018-04-19,12,4,0,0 +2018-04-19,14,4,0,0 2018-04-20,9,0,0,0 2018-04-21,0,0,0,0 2018-04-22,0,0,0,0 diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Month-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Month-reference.csv index 8b3f53f770..89a8cc52da 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[2 - 4 GB] Number of Sessions Started","[< 2 GB] Number of Sessions Started","[8 - 16 GB] Number of Sessions Started","[4 - 8 GB] Number of Sessions Started" -2018-04,41,6,3,1 +2018-04,43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Quarter-reference.csv index cb2566f8f9..06c12e5911 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[2 - 4 GB] Number of Sessions Started","[< 2 GB] Number of Sessions Started","[8 - 16 GB] Number of Sessions Started","[4 - 8 GB] Number of Sessions Started" -"2018 Q2",41,6,3,1 +"2018 Q2",43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Year-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Year-reference.csv index 4b43aad15c..c82a461dc1 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_num_sessions_started/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[2 - 4 GB] Number of Sessions Started","[< 2 GB] Number of Sessions Started","[8 - 16 GB] Number of Sessions Started","[4 - 8 GB] Number of Sessions Started" -2018,41,6,3,1 +2018,43,6,3,1 --------- diff --git a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_wall_time/timeseries-Day-reference.csv b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_wall_time/timeseries-Day-reference.csv index 1188f148c0..43b737a4ab 100644 --- a/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_wall_time/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod-test-artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_wall_time/timeseries-Day-reference.csv @@ -7,7 +7,7 @@ start,end --------- Day,"[2 - 4 GB] Wall Hours: Total","[8 - 16 GB] Wall Hours: Total","[< 2 GB] Wall Hours: Total","[4 - 8 GB] Wall Hours: Total" 2018-04-18,33.2239,4.4272,0.0156,0.2358 -2018-04-19,123.1197,0,0.9503,0 +2018-04-19,121.3931,0,0.9336,0 2018-04-20,73.0686,0,0,0 2018-04-21,96.0000,0,0,0 2018-04-22,96.0000,0,0,0 From aeada1f26cf2835b29de95724bf379cd1d40d8cd Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Wed, 21 Nov 2018 08:02:29 -0500 Subject: [PATCH 03/12] adding eslintrc files that were mistakenly removed --- etl/js/.eslintrc.json | 11 ++++++++++ html/unit_tests/spec/.eslintrc.json | 11 ++++++++++ libraries/phantomjs/.eslintrc.json | 12 +++++++++++ .../xdmod/automated_tests/.eslintrc.json | 20 +++++++++++++++++++ .../xdmod/regression_tests/.eslintrc.json | 5 +++++ 5 files changed, 59 insertions(+) create mode 100644 etl/js/.eslintrc.json create mode 100644 html/unit_tests/spec/.eslintrc.json create mode 100644 libraries/phantomjs/.eslintrc.json create mode 100644 open_xdmod/modules/xdmod/automated_tests/.eslintrc.json create mode 100644 open_xdmod/modules/xdmod/regression_tests/.eslintrc.json diff --git a/etl/js/.eslintrc.json b/etl/js/.eslintrc.json new file mode 100644 index 0000000000..f4c0af5cee --- /dev/null +++ b/etl/js/.eslintrc.json @@ -0,0 +1,11 @@ +{ + "env": { + "node": true + }, + "parserOptions": { + "ecmaVersion": 6 + }, + "rules": { + "no-template-curly-in-string": 0 + } +} diff --git a/html/unit_tests/spec/.eslintrc.json b/html/unit_tests/spec/.eslintrc.json new file mode 100644 index 0000000000..ceed141222 --- /dev/null +++ b/html/unit_tests/spec/.eslintrc.json @@ -0,0 +1,11 @@ +{ + "env": { + "mocha": true + }, + "globals": { + "expect": false + }, + "rules": { + "no-unused-expressions": "off" + } +} diff --git a/libraries/phantomjs/.eslintrc.json b/libraries/phantomjs/.eslintrc.json new file mode 100644 index 0000000000..549cd28632 --- /dev/null +++ b/libraries/phantomjs/.eslintrc.json @@ -0,0 +1,12 @@ +{ + "env": { + "phantomjs": true + }, + "rules": { + "no-console": 0 + }, + "globals": { + "chart": false, + "inputChartOptions": false + } +} diff --git a/open_xdmod/modules/xdmod/automated_tests/.eslintrc.json b/open_xdmod/modules/xdmod/automated_tests/.eslintrc.json new file mode 100644 index 0000000000..2a1c815dfc --- /dev/null +++ b/open_xdmod/modules/xdmod/automated_tests/.eslintrc.json @@ -0,0 +1,20 @@ +{ + "env": { + "mocha": true, + "node": true, + "es6": true + }, + "globals": { + "require": false, + "expect": false, + "browser": false, + "testHelpers": false, + "$": false, + "$$": false + }, + "rules": { + "class-methods-use-this": [0], + "no-underscore-dangle": [0], + "no-unused-expressions": [0] + } +} diff --git a/open_xdmod/modules/xdmod/regression_tests/.eslintrc.json b/open_xdmod/modules/xdmod/regression_tests/.eslintrc.json new file mode 100644 index 0000000000..10d2238837 --- /dev/null +++ b/open_xdmod/modules/xdmod/regression_tests/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "env": { + "node": true + } +} From fcd56175e4cfd6edbe18d7f596b1e318bdeae58c Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Wed, 21 Nov 2018 08:06:04 -0500 Subject: [PATCH 04/12] adding eslintrc file that was mistakenly removed --- html/unit_tests/.eslintrc.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/unit_tests/.eslintrc.json diff --git a/html/unit_tests/.eslintrc.json b/html/unit_tests/.eslintrc.json new file mode 100644 index 0000000000..cfcb8e5418 --- /dev/null +++ b/html/unit_tests/.eslintrc.json @@ -0,0 +1,8 @@ +{ + "env": { + "browser": true, + "node": true, + "phantomjs": true, + "mocha": true + } +} From e0141230c95d47a29db0178441729f986ed3e3f5 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Wed, 21 Nov 2018 08:09:26 -0500 Subject: [PATCH 05/12] adding eslintrc file that was mistakenly removed --- html/unit_tests/spec/.eslintrc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/html/unit_tests/spec/.eslintrc.json b/html/unit_tests/spec/.eslintrc.json index ceed141222..4ed08dc660 100644 --- a/html/unit_tests/spec/.eslintrc.json +++ b/html/unit_tests/spec/.eslintrc.json @@ -9,3 +9,4 @@ "no-unused-expressions": "off" } } + From f8602c9a19e2db645862ab28e47f4fae9bf951a5 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Wed, 21 Nov 2018 08:10:38 -0500 Subject: [PATCH 06/12] adding eslintrc file that was mistakenly removed --- html/unit_tests/.eslintrc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/html/unit_tests/.eslintrc.json b/html/unit_tests/.eslintrc.json index cfcb8e5418..2316c5085c 100644 --- a/html/unit_tests/.eslintrc.json +++ b/html/unit_tests/.eslintrc.json @@ -6,3 +6,4 @@ "mocha": true } } + From a4ed51501b64941961a9a996a1ffbc1ee7eb6b6d Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Mon, 26 Nov 2018 08:25:21 -0500 Subject: [PATCH 07/12] removing end_time from primary and increment key on cloud_events_transient table --- .../etl/etl_tables.d/cloud_common/cloud_transient.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json b/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json index 160c327967..c9a964ce0f 100644 --- a/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json +++ b/configuration/etl/etl_tables.d/cloud_common/cloud_transient.json @@ -106,8 +106,7 @@ "columns": [ "resource_id", "instance", - "start_time", - "end_time" + "start_time" ], "is_unique": true }, @@ -116,8 +115,7 @@ "columns": [ "instance_id", "resource_id", - "start_time", - "end_time" + "start_time" ], "is_unique": true } From 028215489c9794f7d2994af7dc3a7c38a1a378f3 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Mon, 17 Dec 2018 15:13:15 -0500 Subject: [PATCH 08/12] updating cloud data integration test --- .../integration_tests/lib/Controllers/UsageExplorerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UsageExplorerTest.php b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UsageExplorerTest.php index 32f1b82283..ee3071a272 100644 --- a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UsageExplorerTest.php +++ b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/UsageExplorerTest.php @@ -620,7 +620,7 @@ public function provideFilterIdLookup() ) ), 'expected' => array( - 'value' => array('zealous', '1755.9078'), + 'value' => array('zealous', '1754.1644'), 'xpath' => '//rows//row//cell/value' ), 'additional_data' => array( @@ -667,7 +667,7 @@ public function provideFilterIdLookup() ) ), 'expected' => array( - 'value' => array('zealous', '1755.9078'), + 'value' => array('zealous', '1754.1644'), 'xpath' => '//rows//row//cell/value' ), 'additional_data' => array( From 79c60ca7f8b16e9e54fb93b1a884023b6752c957 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Wed, 19 Dec 2018 13:38:22 -0500 Subject: [PATCH 09/12] adding functionality for upgrading the cloud realm from 8.0 to 8.1 and taking account new mappings for cloud events --- .../Migration/DatabasesMigration.php | 1 + .../Version800To810/DatabasesMigration.php | 139 ++++++++++++++++++ db/migrations/8.0.0-8.1.0/modw_cloud.sql | 14 ++ .../scripts/xdmod-upgrade.tcl | 32 ++++ 4 files changed, 186 insertions(+) create mode 100644 db/migrations/8.0.0-8.1.0/modw_cloud.sql diff --git a/classes/OpenXdmod/Migration/DatabasesMigration.php b/classes/OpenXdmod/Migration/DatabasesMigration.php index 991f20699b..8b96552225 100644 --- a/classes/OpenXdmod/Migration/DatabasesMigration.php +++ b/classes/OpenXdmod/Migration/DatabasesMigration.php @@ -81,6 +81,7 @@ public function execute() 'mod_hpcdb' => 'hpcdb', 'modw_etl' => 'logger', 'modw_supremm' => 'datawarehouse', + 'modw_cloud' => 'datawarehouse' ); $dir = BASE_DIR . '/db/migrations/' diff --git a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php index 9bd5cb2c3f..d89a06661b 100644 --- a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php +++ b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php @@ -2,9 +2,148 @@ namespace OpenXdmod\Migration\Version800To810; +use FilterListBuilder; +use OpenXdmod\Setup\Console; + /** * Migrate databases from version 8.0.0 to 8.1.0. */ class DatabasesMigration extends \OpenXdmod\Migration\DatabasesMigration { + /** + * @see \OpenXdmod\Migration\Migration::execute + **/ + public function execute() + { + parent::execute(); + + $console = Console::factory(); + $console->displayMessage(<<<"EOT" +There have been updates to cloud aggregation statistics to make the data more accurate. +IF you have the Cloud realm enabled it is recommended that you re-ingest and aggregate your cloud data. +If you have a large amount of cloud data this may take multiple hours. +EOT + ); + $runaggregation = $console->promptBool( + 'Do you want to run cloud aggregation now?', + false + ); + + if (true === $runaggregation) { + + // Events that are now being used were previously discarded during ingestion + // and need to be re-ingested from the log files in order have accurate cloud + // statistics. + $cloudLogDirectory = ''; + $cloudLogFormat = ''; + + $ingestPipeline = array(); + $extractPipeline = array(); + + $cloudLogFormatEntryAttempts = 0; + $cloudLogDirectoryEntryAttempts = 0; + + while(!is_dir($cloudLogDirectory)){ + $cloudLogDirectoryPromptMessage = ($cloudLogDirectoryEntryAttempts === 0) ? + 'Please enter the directory of your cloud logs to use for re-ingestion and aggregation of the Cloud realm.' : + 'The directory you specified does not seem to exist. Please enter the directory of your cloud logs to use for re-ingestion and aggregation of the Cloud realm.'; + + $cloudLogDirectory = $console->prompt( + $cloudLogDirectoryPromptMessage, + false + ); + $cloudLogDirectoryEntryAttempts++; + } + + $cloudResourceName = $console->prompt( + 'Please enter the name of your cloud resource as shown in XDMOD.', + false + ); + + while(!in_array($cloudLogFormat, ['openstack', 'generic'])){ + $cloudLogFormatPromptMessage = ($cloudLogFormatEntryAttempts === 0) ? + 'Please specify the format of your cloud logs. If your cloud logs come from OpenStack, enter openstack; otherwise enter generic.' : + 'You specified an invalid cloud log format. If your cloud logs come from OpenStack, enter openstack; otherwise enter generic.'; + + $cloudLogFormat = $console->prompt( + $cloudLogFormatPromptMessage, + false + ); + $cloudLogFormatEntryAttempts++; + } + + if($cloudLogFormat == 'openstack'){ + $ingestPipeline = array('jobs-cloud-ingest-openstack'); + $extractPipeline = array('jobs-cloud-extract-openstack'); + } + else if($cloudLogFormat == 'generic'){ + $ingestPipeline = array('jobs-cloud-ingest-openstack'); + $extractPipeline = array('jobs-cloud-extract-openstack'); + } + + $this->runEtl(array('process-sections' => array('jobs-common','jobs-cloud-common','ingest-resources'))); + + $this->runEtl( + array( + 'process-sections' => $ingestPipeline, + 'include-only-resource-codes' => $cloudResourceName, + 'variable-overrides' => ['CLOUD_EVENT_LOG_DIRECTORY' => $cloudLogDirectory] + ) + ); + + $this->runEtl(array('process-sections' => $extractPipeline)); + $this->runEtl(array('process-sections' => array('cloud-state-pipeline'))); + + $this->logger->notice('Rebuilding filter lists'); + try { + $builder = new FilterListBuilder(); + $builder->setLogger($this->logger); + $builder->buildRealmLists('Cloud'); + } catch (Exception $e) { + $this->logger->notice('Failed BuildAllLists: ' . $e->getMessage()); + $this->logger->crit(array( + 'message' => 'Filter list building failed: ' . $e->getMessage(), + 'stacktrace' => $e->getTraceAsString(), + )); + throw new \Exception('Filter list building failed: ' . $e->getMessage()); + } + $this->logger->notice('Done building filter lists'); + } + else { + $console->displayMessage(<<<"EOT" +Re-ingestion and aggregation for the Cloud realm not run. To do this yourself please consult the XDMOD documentation +at https://open.xdmod.org/8.0/cloud.html +EOT + ); + } + } + + private function runEtl($scriptOptions = array()){ + if(count($scriptOptions) < 0 || (!array_key_exists('process-sections', $scriptOptions) && !array_key_exists('actions', $scriptOptions))){ + throw new \Exception('ETL Pipeline / actions not given.'); + } + + $scriptOptions['default-module-name'] = 'xdmod'; + $configOptions = array('default_module_name' => $scriptOptions['default-module-name']); + + if( array_key_exists('variable-overrides', $scriptOptions) ){ + $configOptions['config_variables'] = $scriptOptions['variable-overrides']; + unset($scriptOptions['variable_overrides']); + } + + $etlConfig = new \ETL\Configuration\EtlConfiguration( + CONFIG_DIR . '/etl/etl.json', + null, + $this->logger, + $configOptions + ); + + $etlConfig->initialize(); + \ETL\Utilities::setEtlConfig($etlConfig); + $overseerOptions = new \ETL\EtlOverseerOptions($scriptOptions, $this->logger); + $utilitySchema = $etlConfig->getGlobalEndpoint('utility')->getSchema(); + $overseerOptions->setResourceCodeToIdMapSql(sprintf("SELECT id, code from %s.resourcefact", $utilitySchema)); + $overseer = new \ETL\EtlOverseer($overseerOptions, $this->logger); + $overseer->execute($etlConfig); + } } diff --git a/db/migrations/8.0.0-8.1.0/modw_cloud.sql b/db/migrations/8.0.0-8.1.0/modw_cloud.sql new file mode 100644 index 0000000000..65f782f246 --- /dev/null +++ b/db/migrations/8.0.0-8.1.0/modw_cloud.sql @@ -0,0 +1,14 @@ +USE modw_cloud; + +-- When adding new OpenStack events to track we are also updating the mapping of +-- somme OpenStack events. The events that already exist in the staging and event +-- need to have their mappings updated. Some of the updates include mapping the +-- compute.instance.power_on.start event to POWER_ON_START event and +-- compute.instance.resume.start to REQUEST_RESUME and compute.instance.resume.end +-- to RESUME. + +UPDATE `openstack_staging_event` SET event_type_id = 58 WHERE event_type_id = 7; +UPDATE `openstack_staging_event` SET event_type_id = 45 WHERE event_type_id IN (8,17); + +UPDATE `event` SET event_type_id = 58 WHERE event_type_id = 7; +UPDATE `event` SET event_type_id = 45 WHERE event_type_id IN (8,17); diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl index 5037e9110a..ef8943afab 100644 --- a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl +++ b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl @@ -19,6 +19,38 @@ proc confirmUpgrade { } { set timeout 180 spawn "xdmod-upgrade" confirmUpgrade +expect { + timeout { + send_user "\nFailed to get prompt\n"; exit 1 + } + -re "\nDo you want to run cloud aggregation now." { + send yes\n + } +} +expect { + timeout { + send_user "\nFailed to get prompt\n"; exit 1 + } + -re "\nPlease enter the directory of your cloud logs to use for re-ingestion and aggregation of the Cloud realm." { + send /var/tmp/referencedata/openstack\n + } +} +expect { + timeout { + send_user "\nFailed to get prompt\n"; exit 1 + } + -re "\nPlease enter the name of your cloud resource as shown in XDMOD." { + send openstack\n + } +} +expect { + timeout { + send_user "\nFailed to get prompt\n"; exit 1 + } + -re "\nPlease specify the format of your cloud logs. If your cloud logs come from OpenStack, enter openstack; otherwise enter generic." { + send openstack\n + } +} expect { timeout { send_user "\nFailed to get prompt\n"; exit 1 From 84739d08248d498e8867f5fc3bae005929a70e9f Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Wed, 19 Dec 2018 13:49:37 -0500 Subject: [PATCH 10/12] styles changes --- .../OpenXdmod/Migration/Version800To810/DatabasesMigration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php index d89a06661b..9bad174d02 100644 --- a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php +++ b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php @@ -76,7 +76,7 @@ public function execute() $ingestPipeline = array('jobs-cloud-ingest-openstack'); $extractPipeline = array('jobs-cloud-extract-openstack'); } - else if($cloudLogFormat == 'generic'){ + elseif($cloudLogFormat == 'generic'){ $ingestPipeline = array('jobs-cloud-ingest-openstack'); $extractPipeline = array('jobs-cloud-extract-openstack'); } From 8a81e68ba3b764d9d0d586c9448a0bca1d77ef3b Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Thu, 20 Dec 2018 15:15:45 -0500 Subject: [PATCH 11/12] changing upgrade script to inform uses to run re-ingestion manually instead of trying to do it for them --- .../OpenXdmod/DataWarehouseInitializer.php | 2 +- .../Version800To810/DatabasesMigration.php | 134 ++---------------- .../integration_tests/scripts/bootstrap.sh | 2 + .../scripts/xdmod-upgrade.tcl | 32 ----- 4 files changed, 13 insertions(+), 157 deletions(-) diff --git a/classes/OpenXdmod/DataWarehouseInitializer.php b/classes/OpenXdmod/DataWarehouseInitializer.php index 5c24ea8eb1..cf3549d98b 100644 --- a/classes/OpenXdmod/DataWarehouseInitializer.php +++ b/classes/OpenXdmod/DataWarehouseInitializer.php @@ -353,7 +353,7 @@ public function aggregate( * * @param string $realm The realm you are checking to see if exists */ - private function realmEnabled($realm) + public function realmEnabled($realm) { $realms = $this->warehouseDb->query("SELECT * FROM moddb.realms WHERE display = :realm", [':realm' => $realm]); return (count($realms) > 0); diff --git a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php index 9bad174d02..9eebdea34f 100644 --- a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php +++ b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php @@ -2,7 +2,8 @@ namespace OpenXdmod\Migration\Version800To810; -use FilterListBuilder; +use CCR\DB; +use OpenXdmod\DataWarehouseInitializer; use OpenXdmod\Setup\Console; /** @@ -17,133 +18,18 @@ public function execute() { parent::execute(); - $console = Console::factory(); - $console->displayMessage(<<<"EOT" -There have been updates to cloud aggregation statistics to make the data more accurate. -IF you have the Cloud realm enabled it is recommended that you re-ingest and aggregate your cloud data. -If you have a large amount of cloud data this may take multiple hours. -EOT - ); - $runaggregation = $console->promptBool( - 'Do you want to run cloud aggregation now?', - false - ); - - if (true === $runaggregation) { - - // Events that are now being used were previously discarded during ingestion - // and need to be re-ingested from the log files in order have accurate cloud - // statistics. - $cloudLogDirectory = ''; - $cloudLogFormat = ''; - - $ingestPipeline = array(); - $extractPipeline = array(); - - $cloudLogFormatEntryAttempts = 0; - $cloudLogDirectoryEntryAttempts = 0; - - while(!is_dir($cloudLogDirectory)){ - $cloudLogDirectoryPromptMessage = ($cloudLogDirectoryEntryAttempts === 0) ? - 'Please enter the directory of your cloud logs to use for re-ingestion and aggregation of the Cloud realm.' : - 'The directory you specified does not seem to exist. Please enter the directory of your cloud logs to use for re-ingestion and aggregation of the Cloud realm.'; - - $cloudLogDirectory = $console->prompt( - $cloudLogDirectoryPromptMessage, - false - ); - $cloudLogDirectoryEntryAttempts++; - } - - $cloudResourceName = $console->prompt( - 'Please enter the name of your cloud resource as shown in XDMOD.', - false - ); - - while(!in_array($cloudLogFormat, ['openstack', 'generic'])){ - $cloudLogFormatPromptMessage = ($cloudLogFormatEntryAttempts === 0) ? - 'Please specify the format of your cloud logs. If your cloud logs come from OpenStack, enter openstack; otherwise enter generic.' : - 'You specified an invalid cloud log format. If your cloud logs come from OpenStack, enter openstack; otherwise enter generic.'; - - $cloudLogFormat = $console->prompt( - $cloudLogFormatPromptMessage, - false - ); - $cloudLogFormatEntryAttempts++; - } - - if($cloudLogFormat == 'openstack'){ - $ingestPipeline = array('jobs-cloud-ingest-openstack'); - $extractPipeline = array('jobs-cloud-extract-openstack'); - } - elseif($cloudLogFormat == 'generic'){ - $ingestPipeline = array('jobs-cloud-ingest-openstack'); - $extractPipeline = array('jobs-cloud-extract-openstack'); - } - - $this->runEtl(array('process-sections' => array('jobs-common','jobs-cloud-common','ingest-resources'))); + $hpcdbDb = DB::factory('hpcdb'); + $dwDb = DB::factory('datawarehouse'); + $dwi = new DataWarehouseInitializer($hpcdbDb, $dwDb); - $this->runEtl( - array( - 'process-sections' => $ingestPipeline, - 'include-only-resource-codes' => $cloudResourceName, - 'variable-overrides' => ['CLOUD_EVENT_LOG_DIRECTORY' => $cloudLogDirectory] - ) - ); - - $this->runEtl(array('process-sections' => $extractPipeline)); - $this->runEtl(array('process-sections' => array('cloud-state-pipeline'))); - - $this->logger->notice('Rebuilding filter lists'); - try { - $builder = new FilterListBuilder(); - $builder->setLogger($this->logger); - $builder->buildRealmLists('Cloud'); - } catch (Exception $e) { - $this->logger->notice('Failed BuildAllLists: ' . $e->getMessage()); - $this->logger->crit(array( - 'message' => 'Filter list building failed: ' . $e->getMessage(), - 'stacktrace' => $e->getTraceAsString(), - )); - throw new \Exception('Filter list building failed: ' . $e->getMessage()); - } - $this->logger->notice('Done building filter lists'); - } - else { + if($dwi->realmEnabled('Cloud')){ + $console = Console::factory(); $console->displayMessage(<<<"EOT" -Re-ingestion and aggregation for the Cloud realm not run. To do this yourself please consult the XDMOD documentation -at https://open.xdmod.org/8.0/cloud.html +There have been updates to cloud aggregation statistics to make the data more accurate. +If you have the Cloud realm enabled it is recommended that you re-ingest and aggregate +your cloud data using the commands recommended in our documentation. EOT ); } } - - private function runEtl($scriptOptions = array()){ - if(count($scriptOptions) < 0 || (!array_key_exists('process-sections', $scriptOptions) && !array_key_exists('actions', $scriptOptions))){ - throw new \Exception('ETL Pipeline / actions not given.'); - } - - $scriptOptions['default-module-name'] = 'xdmod'; - $configOptions = array('default_module_name' => $scriptOptions['default-module-name']); - - if( array_key_exists('variable-overrides', $scriptOptions) ){ - $configOptions['config_variables'] = $scriptOptions['variable-overrides']; - unset($scriptOptions['variable_overrides']); - } - - $etlConfig = new \ETL\Configuration\EtlConfiguration( - CONFIG_DIR . '/etl/etl.json', - null, - $this->logger, - $configOptions - ); - - $etlConfig->initialize(); - \ETL\Utilities::setEtlConfig($etlConfig); - $overseerOptions = new \ETL\EtlOverseerOptions($scriptOptions, $this->logger); - $utilitySchema = $etlConfig->getGlobalEndpoint('utility')->getSchema(); - $overseerOptions->setResourceCodeToIdMapSql(sprintf("SELECT id, code from %s.resourcefact", $utilitySchema)); - $overseer = new \ETL\EtlOverseer($overseerOptions, $this->logger); - $overseer->execute($etlConfig); - } } diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh b/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh index 0146b1468b..f6caa1f18d 100755 --- a/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh +++ b/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh @@ -44,4 +44,6 @@ then yum -y install ~/rpmbuild/RPMS/*/*.rpm ~/bin/services start expect $BASEDIR/xdmod-upgrade.tcl | col -b + sudo -u xdmod xdmod-shredder -r openstack -d $REF_DIR/openstack -f openstack + sudo -u xdmod xdmod-ingestor fi diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl index ef8943afab..5037e9110a 100644 --- a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl +++ b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl @@ -19,38 +19,6 @@ proc confirmUpgrade { } { set timeout 180 spawn "xdmod-upgrade" confirmUpgrade -expect { - timeout { - send_user "\nFailed to get prompt\n"; exit 1 - } - -re "\nDo you want to run cloud aggregation now." { - send yes\n - } -} -expect { - timeout { - send_user "\nFailed to get prompt\n"; exit 1 - } - -re "\nPlease enter the directory of your cloud logs to use for re-ingestion and aggregation of the Cloud realm." { - send /var/tmp/referencedata/openstack\n - } -} -expect { - timeout { - send_user "\nFailed to get prompt\n"; exit 1 - } - -re "\nPlease enter the name of your cloud resource as shown in XDMOD." { - send openstack\n - } -} -expect { - timeout { - send_user "\nFailed to get prompt\n"; exit 1 - } - -re "\nPlease specify the format of your cloud logs. If your cloud logs come from OpenStack, enter openstack; otherwise enter generic." { - send openstack\n - } -} expect { timeout { send_user "\nFailed to get prompt\n"; exit 1 From ae52b0c9e545fc721530802b8992444e573868d5 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Fri, 21 Dec 2018 08:11:11 -0500 Subject: [PATCH 12/12] renaming realmEnabled to isRealmEnabled --- classes/OpenXdmod/DataWarehouseInitializer.php | 16 ++++++++-------- .../Version800To810/DatabasesMigration.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/OpenXdmod/DataWarehouseInitializer.php b/classes/OpenXdmod/DataWarehouseInitializer.php index cf3549d98b..f7015ec4e1 100644 --- a/classes/OpenXdmod/DataWarehouseInitializer.php +++ b/classes/OpenXdmod/DataWarehouseInitializer.php @@ -138,7 +138,7 @@ public function ingestAll($startDate = null, $endDate = null) */ public function ingestAllShredded($startDate = null, $endDate = null) { - if( $this->realmEnabled('Jobs')){ + if( $this->isRealmEnabled('Jobs')){ $this->logger->debug('Ingesting shredded data to staging tables'); $this->runEtlPipeline('staging-ingest-common'); $this->runEtlPipeline('staging-ingest-jobs'); @@ -153,7 +153,7 @@ public function ingestAllShredded($startDate = null, $endDate = null) */ public function ingestAllStaging($startDate = null, $endDate = null) { - if( $this->realmEnabled('Jobs')){ + if( $this->isRealmEnabled('Jobs')){ $this->logger->debug('Ingesting staging data to HPCDB'); $this->runEtlPipeline('hpcdb-ingest-common'); $this->runEtlPipeline('hpcdb-ingest-jobs'); @@ -168,7 +168,7 @@ public function ingestAllStaging($startDate = null, $endDate = null) */ public function ingestAllHpcdb($startDate = null, $endDate = null) { - if( $this->realmEnabled('Jobs')){ + if( $this->isRealmEnabled('Jobs')){ $this->logger->debug('Ingesting HPCDB data to modw'); if ($startDate !== null || $endDate !== null) { @@ -206,7 +206,7 @@ public function ingestAllHpcdb($startDate = null, $endDate = null) */ public function ingestCloudDataOpenStack() { - if( $this->realmEnabled('Cloud') ){ + if( $this->isRealmEnabled('Cloud') ){ try{ $this->logger->notice('Ingesting OpenStack event log data'); $this->runEtlPipeline('jobs-cloud-extract-openstack'); @@ -229,7 +229,7 @@ public function ingestCloudDataOpenStack() */ public function ingestCloudDataGeneric() { - if( $this->realmEnabled('Cloud') ){ + if( $this->isRealmEnabled('Cloud') ){ try{ $this->logger->notice('Ingesting generic cloud log files'); $this->runEtlPipeline('jobs-cloud-extract-eucalyptus'); @@ -252,7 +252,7 @@ public function ingestCloudDataGeneric() */ public function aggregateCloudData() { - if( $this->realmEnabled('Cloud') ){ + if( $this->isRealmEnabled('Cloud') ){ $this->logger->notice('Aggregating Cloud data'); $this->runEtlPipeline('cloud-state-pipeline'); @@ -288,7 +288,7 @@ public function initializeAggregation($startDate = null, $endDate = null) */ public function aggregateAllJobs($lastModifiedStartDate) { - if( $this->realmEnabled('Jobs') ){ + if( $this->isRealmEnabled('Jobs') ){ $this->runEtlPipeline( 'jobs-xdw-aggregate', array('last-modified-start-date' => $lastModifiedStartDate) @@ -353,7 +353,7 @@ public function aggregate( * * @param string $realm The realm you are checking to see if exists */ - public function realmEnabled($realm) + public function isRealmEnabled($realm) { $realms = $this->warehouseDb->query("SELECT * FROM moddb.realms WHERE display = :realm", [':realm' => $realm]); return (count($realms) > 0); diff --git a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php index 9eebdea34f..d0fbb9e302 100644 --- a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php +++ b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php @@ -22,7 +22,7 @@ public function execute() $dwDb = DB::factory('datawarehouse'); $dwi = new DataWarehouseInitializer($hpcdbDb, $dwDb); - if($dwi->realmEnabled('Cloud')){ + if($dwi->isRealmEnabled('Cloud')){ $console = Console::factory(); $console->displayMessage(<<<"EOT" There have been updates to cloud aggregation statistics to make the data more accurate.