diff --git a/classes/ETL/Ingestor/CloudResourceSpecsStateTransformIngestor.php b/classes/ETL/Ingestor/CloudResourceSpecsStateTransformIngestor.php new file mode 100644 index 0000000000..4e8ea77080 --- /dev/null +++ b/classes/ETL/Ingestor/CloudResourceSpecsStateTransformIngestor.php @@ -0,0 +1,140 @@ + + * @date 2021-01-27 + */ + +namespace ETL\Ingestor; + +use ETL\aOptions; +use ETL\iAction; +use ETL\aAction; +use ETL\Configuration\EtlConfiguration; +use ETL\EtlOverseerOptions; + +use Psr\Log\LoggerInterface; + +class CloudResourceSpecsStateTransformIngestor extends pdoIngestor implements iAction +{ + + private $_instance_state; + + /** + * @see ETL\Ingestor\pdoIngestor::__construct() + */ + public function __construct(aOptions $options, EtlConfiguration $etlConfig, LoggerInterface $logger = null) + { + parent::__construct($options, $etlConfig, $logger); + + $this->_end_time = $etlConfig->getVariableStore()->endDate ? date('Y-m-d H:i:s', strtotime($etlConfig->getVariableStore()->endDate)) : null; + + $this->resetInstance(); + } + + private function initInstance($srcRecord) + { + // Since we only get information for when a configuration changes we assume a configuration has an end date + // of today unless we have a row that tells us otherwise + $default_end_time = isset($this->_end_time) ? $this->_end_time : date('Y-m-d') . ' 23:59:59'; + + $this->_instance_state = array( + 'resource_id' => $srcRecord['resource_id'], + 'hostname' => $srcRecord['hostname'], + 'vcpus' => $srcRecord['vcpus'], + 'memory_mb' => $srcRecord['memory_mb'], + 'start_date_ts' => strtotime($srcRecord['fact_date'] . " 00:00:00"), + 'end_date_ts' => strtotime($default_end_time), + 'start_day_id' => date('Y', strtotime($srcRecord['fact_date'])) * 100000 + date('z', strtotime($srcRecord['fact_date'])) + 1, + 'end_day_id' => date('Y', strtotime($default_end_time)) * 100000 + date('z', strtotime($default_end_time)) + 1 + ); + } + + private function resetInstance() + { + $this->_instance_state = null; + } + + private function updateInstance($srcRecord) + { + // The -1 is to make sure we use the last second of the previous day + $end_date_timestamp = strtotime($srcRecord['fact_date'] . " 00:00:00") - 1; + $this->_instance_state['end_date_ts'] = $end_date_timestamp; + + // date(z) is zero indexed so +1 is needed to get the correct day of the year + $this->_instance_state['end_day_id'] = date('Y', $end_date_timestamp) * 100000 + date('z', $end_date_timestamp) + 1; + } + + /** + * @see ETL\Ingestor\pdoIngestor::transform() + */ + protected function transform(array $srcRecord, &$orderId) + { + // We want to just flush when we hit the dummy row + if ($srcRecord['fact_date'] === 0) { + if (isset($this->_instance_state)) { + return array($this->_instance_state); + } else { + return array(); + } + } + + if ($this->_instance_state === null) { + if($srcRecord['vcpus'] == -1 && $srcRecord['memory_mb'] == -1) { + return array(); + } + + $this->initInstance($srcRecord); + } + + $transformedRecord = array(); + + if (($this->_instance_state['hostname'] != $srcRecord['hostname']) || ($this->_instance_state['resource_id'] != $srcRecord['resource_id']) || ($this->_instance_state['vcpus'] != $srcRecord['vcpus'] || $this->_instance_state['memory_mb'] != $srcRecord['memory_mb'])) { + + // Only update the instance if the only thing that is different between $srcRecord and $this->_instance_state is that either the memory or vcpus changed + if (($this->_instance_state['vcpus'] != $srcRecord['vcpus'] || $this->_instance_state['memory_mb'] != $srcRecord['memory_mb']) + && ($this->_instance_state['hostname'] == $srcRecord['hostname']) && ($this->_instance_state['resource_id'] == $srcRecord['resource_id'])) { + $this->updateInstance($srcRecord); + } + + $transformedRecord[] = $this->_instance_state; + $this->resetInstance(); + + // Under most circumstances when we detect a change we want to start a new row with data from the row that has changed. This is not + // the case when the change detected is a -1 value for vcpus or memory_mb. When vcpus or memory_mb is -1 it means the host has been + // removed and we just want to end the row and not create a new row. + if($srcRecord['vcpus'] != -1 && $srcRecord['memory_mb'] != -1) { + $this->initInstance($srcRecord); + } + } + + return $transformedRecord; + } + + protected function getSourceQueryString() + { + $sql = parent::getSourceQueryString(); + + // Due to the way the Finite State Machine handles the rows in event reconstruction, the last row + // is lost. To work around this we add a dummy row filled with zeroes. + $colCount = count($this->etlSourceQuery->records); + $unionValues = array_fill(0, $colCount, 0); + $sql .= "\nUNION ALL\nSELECT " . implode(',', $unionValues) . "\nORDER BY 1 DESC, 2 ASC, 5 ASC"; + + return $sql; + } + + public function transformHelper(array $srcRecord) + { + $orderId = 0; + return $this->transform($srcRecord, $orderId); + } +} diff --git a/classes/OpenXdmod/Migration/Version900To950/DatabaseMigration.php b/classes/OpenXdmod/Migration/Version900To950/DatabaseMigration.php new file mode 100644 index 0000000000..6576c899f0 --- /dev/null +++ b/classes/OpenXdmod/Migration/Version900To950/DatabaseMigration.php @@ -0,0 +1,32 @@ +tableExists('modw_cloud.cloud_resource_specs')) { + Utilities::runEtlPipeline( + ['cloud-migration-9_0_0-9_5_0'], + $this->logger, + [ + 'last-modified-start-date' => '2017-01-01 00:00:00' + ] + ); + } + } +} diff --git a/configuration/etl/etl.d/cloud_ingest_resource_specs.json b/configuration/etl/etl.d/cloud_ingest_resource_specs.json index 0c4ea0e451..40289437c2 100644 --- a/configuration/etl/etl.d/cloud_ingest_resource_specs.json +++ b/configuration/etl/etl.d/cloud_ingest_resource_specs.json @@ -85,8 +85,8 @@ "ingest-cloud-resource-specs": [ { "name": "CloudResourceSpecsReconstructor", - "class": "DatabaseIngestor", - "definition_file": "cloud_common/resource_specifications.json", + "class": "CloudResourceSpecsStateTransformIngestor", + "definition_file": "cloud_common/resource_specifications_transformer.json", "description": "Sets a start and end time for memory and vcpu paring for a compute node on a cloud resource" } ], diff --git a/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json b/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json index 349a1766e9..1bb1a4d5bc 100644 --- a/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json +++ b/configuration/etl/etl.d/xdmod-migration-9_0_0-9_5_0.json @@ -5,7 +5,25 @@ "namespace": "ETL\\Maintenance", "class": "ExecuteSql", "options_class": "MaintenanceOptions" - } + }, + "cloud-migration-9_0_0-9_5_0": { + "namespace": "ETL\\Ingestor", + "options_class": "IngestorOptions", + "endpoints": { + "source": { + "type": "mysql", + "name": "Cloud DB", + "config": "datawarehouse", + "schema": "modw_cloud" + }, + "destination": { + "type": "mysql", + "name": "Cloud DB", + "config": "datawarehouse", + "schema": "modw_cloud" + } + } + } }, "migration-9_0_0-9_5_0": [ { @@ -84,5 +102,45 @@ } } } - ] + ], + "cloud-migration-9_0_0-9_5_0": [ + { + "name": "CloudResourceSpecsReconstructor", + "class": "CloudResourceSpecsStateTransformIngestor", + "definition_file": "cloud_common/resource_specifications_transformer.json", + "description": "Sets a start and end time for memory and vcpu paring for a compute node on a cloud resource", + "endpoints": { + "destination": { + "type": "mysql", + "name": "Cloud DB", + "config": "datawarehouse", + "schema": "modw_cloud", + "truncate_destination": true + } + } + }, + { + "#": "Asset data must be aggregated post ingestion", + "name": "CloudResourceSpecsAggregator", + "class": "SimpleAggregator", + "namespace": "ETL\\Aggregator", + "options_class": "AggregatorOptions", + "description": "Aggregate cloud records.", + "definition_file": "cloud_common/cloud_resource_specs_aggregation.json", + "table_prefix": "resourcespecsfact_by_", + "aggregation_units": [ + "day", "month", "quarter", "year" + ], + "endpoints": { + "destination": { + "type": "mysql", + "name": "Aggregate DB", + "config": "datawarehouse", + "schema": "modw_aggregates", + "create_schema_if_not_exists": true, + "truncate_destination": true + } + } + } + ] } diff --git a/configuration/etl/etl_action_defs.d/cloud_common/cloud_metrics_aggregation.json b/configuration/etl/etl_action_defs.d/cloud_common/cloud_metrics_aggregation.json index e8cd589065..a5a4ae6cd1 100644 --- a/configuration/etl/etl_action_defs.d/cloud_common/cloud_metrics_aggregation.json +++ b/configuration/etl/etl_action_defs.d/cloud_common/cloud_metrics_aggregation.json @@ -60,6 +60,11 @@ "instance_type_id", "account_id", "systemaccount_id", + "submission_venue_id", + "domain_id", + "service_provider", + "principalinvestigator_person_id", + "fos_id", "person_id" ], "joins":[ diff --git a/configuration/etl/etl_action_defs.d/cloud_common/cloud_resource_specs_aggregation.json b/configuration/etl/etl_action_defs.d/cloud_common/cloud_resource_specs_aggregation.json index d543484a95..68160e1d5c 100644 --- a/configuration/etl/etl_action_defs.d/cloud_common/cloud_resource_specs_aggregation.json +++ b/configuration/etl/etl_action_defs.d/cloud_common/cloud_resource_specs_aggregation.json @@ -27,7 +27,7 @@ "year": "${:YEAR_VALUE}", "${AGGREGATION_UNIT}": "${:PERIOD_VALUE}", "resource_id": "crs.resource_id", - "core_time_available": "COALESCE(SUM(${wallduration}) * crs.vcpus, 0)" + "core_time_available": "COALESCE(SUM(${wallduration} * crs.vcpus), 0)" }, "groupby": [ "${AGGREGATION_UNIT}_id", diff --git a/configuration/etl/etl_action_defs.d/cloud_common/resource_specifications_transformer.json b/configuration/etl/etl_action_defs.d/cloud_common/resource_specifications_transformer.json new file mode 100644 index 0000000000..9310815b10 --- /dev/null +++ b/configuration/etl/etl_action_defs.d/cloud_common/resource_specifications_transformer.json @@ -0,0 +1,35 @@ +{ + "table_definition": { + "$ref": "${table_definition_dir}/cloud_common/cloud_resource_specs.json#/table_definition" + }, + "destination_record_map": { + "cloud_resource_specs": { + "resource_id": "resource_id", + "hostname": "hostname", + "vcpus": "vcpus", + "memory_mb": "memory_mb", + "start_date_ts": "start_date_ts", + "end_date_ts": "end_date_ts", + "start_day_id": "start_day_id", + "end_day_id": "end_day_id" + } + }, + "source_query": { + "records": { + "resource_id": "srs.resource_id", + "hostname": "srs.hostname", + "vcpus": "srs.vcpus", + "memory_mb": "srs.memory_mb", + "fact_date": "srs.fact_date", + "start_date_ts": -1, + "end_date_ts": -1, + "start_day_id": -1, + "end_day_id": -1 + }, + "joins": [{ + "name": "staging_resource_specifications", + "schema": "${SOURCE_SCHEMA}", + "alias": "srs" + }] + } +} diff --git a/configuration/etl/etl_tables.d/cloud_common/cloud_resource_specs.json b/configuration/etl/etl_tables.d/cloud_common/cloud_resource_specs.json index 43dd03cc14..681a0414b6 100644 --- a/configuration/etl/etl_tables.d/cloud_common/cloud_resource_specs.json +++ b/configuration/etl/etl_tables.d/cloud_common/cloud_resource_specs.json @@ -32,8 +32,7 @@ { "name": "vcpus", "type": "int(5)", - "nullable": false, - "default": null + "nullable": false }, { "name": "start_date_ts", diff --git a/tests/artifacts/xdmod/etlv2/configuration/input/etl_action_defs_8.0.0.d/cloud_resource_specs_state.json b/tests/artifacts/xdmod/etlv2/configuration/input/etl_action_defs_8.0.0.d/cloud_resource_specs_state.json new file mode 100644 index 0000000000..609568b84b --- /dev/null +++ b/tests/artifacts/xdmod/etlv2/configuration/input/etl_action_defs_8.0.0.d/cloud_resource_specs_state.json @@ -0,0 +1,34 @@ +{ + "table_definition": { + "$ref": "../etl_tables_8.0.0.d/cloud_resource_specs.json#/table_definition" + }, + "destination_record_map": { + "cloud_resource_specs": { + "resource_id": "resource_id", + "hostname": "hostname", + "vcpus": "vcpus", + "memory_mb": "memory_mb", + "start_date_ts": "start_date_ts", + "end_date_ts": "end_date_ts", + "start_day_id": "start_day_id", + "end_day_id": "end_day_id" + } + }, + "source_query": { + "records": { + "resource_id": "srs.resource_id", + "hostname": "srs.hostname", + "vcpus": "srs.vcpus", + "memory_mb": "srs.memory_mb", + "start_date_ts": "srs.fact_date", + "end_date_ts": -1, + "start_day_id": -1, + "end_day_id": -1 + }, + "joins": [{ + "name": "staging_resource_specifications", + "schema": "${SOURCE_SCHEMA}", + "alias": "srs" + }] + } +} diff --git a/tests/artifacts/xdmod/etlv2/configuration/input/etl_tables_8.0.0.d/cloud_resource_specs.json b/tests/artifacts/xdmod/etlv2/configuration/input/etl_tables_8.0.0.d/cloud_resource_specs.json index 6f874594c4..681a0414b6 100644 --- a/tests/artifacts/xdmod/etlv2/configuration/input/etl_tables_8.0.0.d/cloud_resource_specs.json +++ b/tests/artifacts/xdmod/etlv2/configuration/input/etl_tables_8.0.0.d/cloud_resource_specs.json @@ -32,18 +32,34 @@ { "name": "vcpus", "type": "int(5)", - "nullable": true, - "default": null + "nullable": false + }, + { + "name": "start_date_ts", + "type": "int(12) unsigned", + "nullable": false + }, + { + "name": "end_date_ts", + "type": "int(12) unsigned", + "nullable": true }, { - "name": "start_date", - "type": "date", + "name": "start_day_id", + "type": "int(11) unsigned", "nullable": false }, { - "name": "end_date", - "type": "date", + "name": "end_day_id", + "type": "int(11) unsigned", "nullable": true + }, + { + "name": "last_modified", + "type": "timestamp", + "nullable": false, + "default": "CURRENT_TIMESTAMP", + "extra": "on update CURRENT_TIMESTAMP" } ], @@ -59,7 +75,7 @@ "hostname", "memory_mb", "vcpus", - "start_date" + "start_date_ts" ], "is_unique": true }, diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Day-reference.csv index b87b7ead8c..e25e4ac9cb 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,9 +6,9 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Core Hour Utilization (%)" -c1.m4,0.7919 -c4.m16,0.3704 -c2.m4,0.3670 -c1.m1,0.0058 +c1.m4,0.8414 +c4.m16,0.3936 +c2.m4,0.3899 +c1.m1,0.0062 c2.m8,0.0004 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Month-reference.csv index 821dfcc8da..b87b7ead8c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,9 +6,9 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Core Hour Utilization (%)" -c1.m4,0.7479 -c4.m16,0.3499 -c2.m4,0.3466 -c1.m1,0.0055 +c1.m4,0.7919 +c4.m16,0.3704 +c2.m4,0.3670 +c1.m1,0.0058 c2.m8,0.0004 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Quarter-reference.csv index f21f2df330..8284f371f2 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,9 +6,9 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Core Hour Utilization (%)" -c1.m4,0.1302 -c4.m16,0.0609 -c2.m4,0.0603 -c1.m1,0.0010 +c1.m4,0.1437 +c4.m16,0.0672 +c2.m4,0.0666 +c1.m1,0.0011 c2.m8,0.0001 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Year-reference.csv index 14bb289224..56e8eaef80 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,9 +6,9 @@ start,end 2018-04-18,2018-04-30 --------- "Instance Type","Core Hour Utilization (%)" -c1.m4,0.0373 -c4.m16,0.0174 -c2.m4,0.0173 +c1.m4,0.0414 +c4.m16,0.0194 +c2.m4,0.0192 c1.m1,0.0003 c2.m8,0.0000 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Day-reference.csv index 4a2e741f5d..89bdbb4575 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[c1.m4] Core Hour Utilization (%)","[c4.m16] Core Hour Utilization (%)","[c 2018-04-21,0.8929,0,0.5952,0,0 2018-04-22,0.8929,0,0.5952,0,0 2018-04-23,0.8929,0,0.5952,0,0 -2018-04-24,0.7653,0,0.5102,0,0 -2018-04-25,0.7653,0,0.5102,0,0 -2018-04-26,0.7702,0.2701,0.5102,0,0 -2018-04-27,0.7653,1.0204,0.4215,0.0603,0 -2018-04-28,0.7653,1.0204,0,0,0 -2018-04-29,0.7653,1.0204,0,0,0 -2018-04-30,0.7336,0.9785,0.1124,0,0 +2018-04-24,0.8523,0,0.5682,0,0 +2018-04-25,0.8523,0,0.5682,0,0 +2018-04-26,0.8577,0.3008,0.5682,0,0 +2018-04-27,0.8523,1.1364,0.4694,0.0671,0 +2018-04-28,0.8523,1.1364,0,0,0 +2018-04-29,0.8523,1.1364,0,0,0 +2018-04-30,0.8169,1.0897,0.1252,0,0 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Month-reference.csv index 1c6a6217fb..5b7e8f6546 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[c1.m4] Core Hour Utilization (%)","[c4.m16] Core Hour Utilization (%)","[c2.m4] Core Hour Utilization (%)","[c1.m1] Core Hour Utilization (%)","[c2.m8] Core Hour Utilization (%)" -2018-04,0.7479,0.3499,0.3466,0.0055,0.0004 +2018-04,0.7919,0.3704,0.3670,0.0058,0.0004 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Quarter-reference.csv index 7649806ccf..2153044f5f 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[c1.m4] Core Hour Utilization (%)","[c4.m16] Core Hour Utilization (%)","[c2.m4] Core Hour Utilization (%)","[c1.m1] Core Hour Utilization (%)","[c2.m8] Core Hour Utilization (%)" -"2018 Q2",0.1302,0.0609,0.0603,0.0010,0.0001 +"2018 Q2",0.1437,0.0672,0.0666,0.0011,0.0001 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Year-reference.csv index cdcb2632c1..167a0e7e2d 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/configuration/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[c1.m4] Core Hour Utilization (%)","[c4.m16] Core Hour Utilization (%)","[c2.m4] Core Hour Utilization (%)","[c1.m1] Core Hour Utilization (%)","[c2.m8] Core Hour Utilization (%)" -2018,0.0373,0.0174,0.0173,0.0003,0.0000 +2018,0.0414,0.0194,0.0192,0.0003,0.0000 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Day-reference.csv index e2efb0e254..a4aae153f9 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Domain,"Core Hour Utilization (%)" -Default,1.5355 +Default,1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Month-reference.csv index e0f0c93f5d..e2efb0e254 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Domain,"Core Hour Utilization (%)" -Default,1.4502 +Default,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Quarter-reference.csv index bcfd1ea78b..a41a8771e5 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Domain,"Core Hour Utilization (%)" -Default,0.2525 +Default,0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Year-reference.csv index 6419a56c57..2f9598fd94 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Domain,"Core Hour Utilization (%)" -Default,0.0723 +Default,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Day-reference.csv index 2ed07eb437..5c21415d08 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[Default] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Month-reference.csv index 56f6c22358..37be7b893d 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Default] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Quarter-reference.csv index 27543dac8b..aa97349a58 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Default] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Year-reference.csv index 8f824d2a9b..142777e6a0 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/domain/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Default] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Day-reference.csv index 42c4738e99..b06f1233d6 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "PI Group","Core Hour Utilization (%)" -"Mechanics and Materials",1.5355 +"Mechanics and Materials",1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Month-reference.csv index 406c21dc63..42c4738e99 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "PI Group","Core Hour Utilization (%)" -"Mechanics and Materials",1.4502 +"Mechanics and Materials",1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Quarter-reference.csv index 2a01c99430..9ae0c980bd 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "PI Group","Core Hour Utilization (%)" -"Mechanics and Materials",0.2525 +"Mechanics and Materials",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Year-reference.csv index a52ed7f462..d131660c51 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "PI Group","Core Hour Utilization (%)" -"Mechanics and Materials",0.0723 +"Mechanics and Materials",0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Day-reference.csv index d42fd7d352..0574da3fa0 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[Mechanics and Materials] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Month-reference.csv index 7cff31afad..b88d9fc163 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Mechanics and Materials] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Quarter-reference.csv index f52f8fdd4d..1afe90005f 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Mechanics and Materials] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Year-reference.csv index 223c0e70ac..2dbea8134b 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/fieldofscience/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Mechanics and Materials] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Day-reference.csv index 46a492ccad..07afa339e5 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Core Hour Utilization (%)" -Screwdriver,1.5355 +Screwdriver,1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Month-reference.csv index 521c5c4b97..46a492ccad 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Core Hour Utilization (%)" -Screwdriver,1.4502 +Screwdriver,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Quarter-reference.csv index 8ccd94f50c..72d3f181e3 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Core Hour Utilization (%)" -Screwdriver,0.2525 +Screwdriver,0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Year-reference.csv index 6f8292c937..f46adb26e7 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Summary,"Core Hour Utilization (%)" -Screwdriver,0.0723 +Screwdriver,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Day-reference.csv index 7212b8335b..f22394e756 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[Screwdriver] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Month-reference.csv index 81575027e4..ad05e744c0 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Screwdriver] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Quarter-reference.csv index 73c6a163a7..85b27091ea 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Screwdriver] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Year-reference.csv index ae8089cb9e..86a0dc1915 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/none/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Screwdriver] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Day-reference.csv index f2085339d7..ae8df1c117 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Decanal Unit","Core Hour Utilization (%)" -Engineering,1.5355 +Engineering,1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Month-reference.csv index c04c85e89b..f2085339d7 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Decanal Unit","Core Hour Utilization (%)" -Engineering,1.4502 +Engineering,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Quarter-reference.csv index 789ff439b2..2c63a7a36c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Decanal Unit","Core Hour Utilization (%)" -Engineering,0.2525 +Engineering,0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Year-reference.csv index 942ba2eeaa..4465f48b28 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Decanal Unit","Core Hour Utilization (%)" -Engineering,0.0723 +Engineering,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Day-reference.csv index 91d6ded17e..1b41d5b230 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[Engineering] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Month-reference.csv index b67742d04c..f4eab51a5d 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Engineering] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Quarter-reference.csv index 31a31a8c35..c0dc699de5 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Engineering] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Year-reference.csv index dcd6370333..91d942c383 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/nsfdirectorate/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Engineering] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Day-reference.csv index 09edaa42f0..c3b43ba7c1 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Department,"Core Hour Utilization (%)" -"Mechanical and Structural Systems",1.5355 +"Mechanical and Structural Systems",1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Month-reference.csv index 96bd9d5239..09edaa42f0 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Department,"Core Hour Utilization (%)" -"Mechanical and Structural Systems",1.4502 +"Mechanical and Structural Systems",1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Quarter-reference.csv index ba531e1584..70f5dd104f 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Department,"Core Hour Utilization (%)" -"Mechanical and Structural Systems",0.2525 +"Mechanical and Structural Systems",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Year-reference.csv index 9ee2ada277..f93865ff7c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Department,"Core Hour Utilization (%)" -"Mechanical and Structural Systems",0.0723 +"Mechanical and Structural Systems",0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Day-reference.csv index c72d680f84..93b6191241 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[Mechanical and Structural Systems] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Month-reference.csv index 4788fb43ff..962d3edbab 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Mechanical and Structural Systems] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Quarter-reference.csv index 25392fd137..9fbc4f8bef 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Mechanical and Structural Systems] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Year-reference.csv index ed61ec52d0..3573aa029a 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/parentscience/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Mechanical and Structural Systems] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Day-reference.csv index f8a1f5729f..fbf0fbe9c5 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- User,"Core Hour Utilization (%)" -"Warbler, Yellow-rumped",1.1454 -"Warbler, Yellow",0.3862 -"Warbler, Blackburnian",0.0039 +"Warbler, Yellow-rumped",1.2170 +"Warbler, Yellow",0.4103 +"Warbler, Blackburnian",0.0042 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Month-reference.csv index d0c1d5ca91..f8a1f5729f 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- User,"Core Hour Utilization (%)" -"Warbler, Yellow-rumped",1.0817 -"Warbler, Yellow",0.3647 -"Warbler, Blackburnian",0.0037 +"Warbler, Yellow-rumped",1.1454 +"Warbler, Yellow",0.3862 +"Warbler, Blackburnian",0.0039 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Quarter-reference.csv index 4558cae81e..9e24a3d20c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- User,"Core Hour Utilization (%)" -"Warbler, Yellow-rumped",0.1883 -"Warbler, Yellow",0.0635 -"Warbler, Blackburnian",0.0006 +"Warbler, Yellow-rumped",0.2078 +"Warbler, Yellow",0.0701 +"Warbler, Blackburnian",0.0007 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Year-reference.csv index 0bf32a2869..14a4a43478 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- User,"Core Hour Utilization (%)" -"Warbler, Yellow-rumped",0.0539 -"Warbler, Yellow",0.0182 +"Warbler, Yellow-rumped",0.0599 +"Warbler, Yellow",0.0202 "Warbler, Blackburnian",0.0002 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Day-reference.csv index cd3c64a618..8bbedd6d6e 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[Warbler, Yellow-rumped] Core Hour Utilization (%)","[Warbler, Yellow] Core 2018-04-21,0.8929,0.5952,0 2018-04-22,0.8929,0.5952,0 2018-04-23,0.8929,0.5952,0 -2018-04-24,0.7653,0.5102,0 -2018-04-25,0.7653,0.5102,0 -2018-04-26,1.0403,0.5102,0 -2018-04-27,1.7857,0.4818,0 -2018-04-28,1.7857,0,0 -2018-04-29,1.7857,0,0 -2018-04-30,1.7121,0.1124,0 +2018-04-24,0.8523,0.5682,0 +2018-04-25,0.8523,0.5682,0 +2018-04-26,1.1585,0.5682,0 +2018-04-27,1.9886,0.5365,0 +2018-04-28,1.9886,0,0 +2018-04-29,1.9886,0,0 +2018-04-30,1.9067,0.1252,0 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Month-reference.csv index 90187f496a..698c1c6e18 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Warbler, Yellow-rumped] Core Hour Utilization (%)","[Warbler, Yellow] Core Hour Utilization (%)","[Warbler, Blackburnian] Core Hour Utilization (%)" -2018-04,1.0817,0.3647,0.0037 +2018-04,1.1454,0.3862,0.0039 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Quarter-reference.csv index 4bd27000b8..b4514679cd 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Warbler, Yellow-rumped] Core Hour Utilization (%)","[Warbler, Yellow] Core Hour Utilization (%)","[Warbler, Blackburnian] Core Hour Utilization (%)" -"2018 Q2",0.1883,0.0635,0.0006 +"2018 Q2",0.2078,0.0701,0.0007 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Year-reference.csv index 1128db4b19..87dca86cba 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/person/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Warbler, Yellow-rumped] Core Hour Utilization (%)","[Warbler, Yellow] Core Hour Utilization (%)","[Warbler, Blackburnian] Core Hour Utilization (%)" -2018,0.0539,0.0182,0.0002 +2018,0.0599,0.0202,0.0002 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Day-reference.csv index ee2a874fd2..4337a20d91 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- PI,"Core Hour Utilization (%)" -"Tern, Sandwich",1.5355 +"Tern, Sandwich",1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Month-reference.csv index 472b3a24e7..ee2a874fd2 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- PI,"Core Hour Utilization (%)" -"Tern, Sandwich",1.4502 +"Tern, Sandwich",1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Quarter-reference.csv index 04d449c660..e425f3db4a 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- PI,"Core Hour Utilization (%)" -"Tern, Sandwich",0.2525 +"Tern, Sandwich",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Year-reference.csv index 7b7ba1f534..5912795369 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- PI,"Core Hour Utilization (%)" -"Tern, Sandwich",0.0723 +"Tern, Sandwich",0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Day-reference.csv index 19328fcc48..8b6d9a95ff 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[Tern, Sandwich] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Month-reference.csv index 5d1e8c24d9..94f8d88f49 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[Tern, Sandwich] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Quarter-reference.csv index ee53373c73..637d1a581f 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[Tern, Sandwich] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Year-reference.csv index 1205b74d62..ddd6d2930d 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/pi/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[Tern, Sandwich] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Day-reference.csv index 4c30ce97eb..23286863d2 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Core Hour Utilization (%)" -zealous,1.5355 +zealous,1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Month-reference.csv index d6e73a4a6e..4c30ce97eb 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Core Hour Utilization (%)" -zealous,1.4502 +zealous,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Quarter-reference.csv index a9ea4028e1..a1ac5cee60 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Core Hour Utilization (%)" -zealous,0.2525 +zealous,0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Year-reference.csv index 5da1f62cc2..ad04e38508 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Project,"Core Hour Utilization (%)" -zealous,0.0723 +zealous,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Day-reference.csv index 92ed8aad46..56081dae5c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[zealous] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Month-reference.csv index d920fc3971..19adb73454 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[zealous] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Quarter-reference.csv index 409ebc4fcf..19c5019686 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[zealous] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Year-reference.csv index a7ad82e64b..92294468e6 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/project/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[zealous] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Day-reference.csv index 6f534c4f4c..c34fd6d0ac 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Provider,"Core Hour Utilization (%)" -"screw - Screwdriver",1.5355 +"screw - Screwdriver",1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Month-reference.csv index 6fef52e1b6..6f534c4f4c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Provider,"Core Hour Utilization (%)" -"screw - Screwdriver",1.4502 +"screw - Screwdriver",1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Quarter-reference.csv index 2534fe4d8c..07da37086e 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Provider,"Core Hour Utilization (%)" -"screw - Screwdriver",0.2525 +"screw - Screwdriver",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Year-reference.csv index 2f09cb942b..bd4f064b4b 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Provider,"Core Hour Utilization (%)" -"screw - Screwdriver",0.0723 +"screw - Screwdriver",0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Day-reference.csv index 9daa7c1fe3..628e0eef23 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[screw - Screwdriver] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Month-reference.csv index dae806a3f9..16d7d49bb8 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[screw - Screwdriver] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Quarter-reference.csv index b65b5c6bbc..acbb0fa11e 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[screw - Screwdriver] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Year-reference.csv index b826395852..63770cba27 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/provider/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[screw - Screwdriver] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Day-reference.csv index 65173947f7..4e3f71285e 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Core Hour Utilization (%)" -openstack,1.5355 +openstack,1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Month-reference.csv index e8ded7efbc..65173947f7 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Core Hour Utilization (%)" -openstack,1.4502 +openstack,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Quarter-reference.csv index 59794c862b..4062340694 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Core Hour Utilization (%)" -openstack,0.2525 +openstack,0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Year-reference.csv index 7c6611f1d5..625a7e2e3f 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Resource,"Core Hour Utilization (%)" -openstack,0.0723 +openstack,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Day-reference.csv index 28cd15d6d1..9c2980a085 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[openstack] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Month-reference.csv index e02b5ec8b9..67487fa095 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[openstack] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Quarter-reference.csv index db56114ef7..85c905e5fe 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[openstack] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Year-reference.csv index 72bb797534..322f835946 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/resource/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[openstack] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Day-reference.csv index 5e2fa7b050..c38abffc48 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Core Hour Utilization (%)" -"OpenStack API",1.5355 +"OpenStack API",1.6315 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Month-reference.csv index 7121092e61..5e2fa7b050 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Core Hour Utilization (%)" -"OpenStack API",1.4502 +"OpenStack API",1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Quarter-reference.csv index 7950d71d31..e44afa1793 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Core Hour Utilization (%)" -"OpenStack API",0.2525 +"OpenStack API",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Year-reference.csv index 03e3d91f77..061303f2f6 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- "Submission Venue","Core Hour Utilization (%)" -"OpenStack API",0.0723 +"OpenStack API",0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Day-reference.csv index cb87b20b64..dc3d2f4235 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[OpenStack API] Core Hour Utilization (%)" 2018-04-21,1.4881 2018-04-22,1.4881 2018-04-23,1.4881 -2018-04-24,1.2755 -2018-04-25,1.2755 -2018-04-26,1.5505 -2018-04-27,2.2675 -2018-04-28,1.7857 -2018-04-29,1.7857 -2018-04-30,1.8245 +2018-04-24,1.4205 +2018-04-25,1.4205 +2018-04-26,1.7267 +2018-04-27,2.5252 +2018-04-28,1.9886 +2018-04-29,1.9886 +2018-04-30,2.0319 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Month-reference.csv index b30e5a68b1..3c1736bbfd 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[OpenStack API] Core Hour Utilization (%)" -2018-04,1.4502 +2018-04,1.5355 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Quarter-reference.csv index adbe6a544f..a736944078 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[OpenStack API] Core Hour Utilization (%)" -"2018 Q2",0.2525 +"2018 Q2",0.2786 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Year-reference.csv index 9af83caee1..baab2ca6f2 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/submission_venue/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[OpenStack API] Core Hour Utilization (%)" -2018,0.0723 +2018,0.0803 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cd.csv index ba59e3ab7c..1b28fc5e01 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cd.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,1.1454 -ylwwa,0.3862 -setusca,0.0039 +yerwa,1.2170 +ylwwa,0.4103 +setusca,0.0042 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cs.csv index ba59e3ab7c..1b28fc5e01 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Day-cs.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,1.1454 -ylwwa,0.3862 -setusca,0.0039 +yerwa,1.2170 +ylwwa,0.4103 +setusca,0.0042 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cd.csv index 2abbc33541..ba59e3ab7c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cd.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,1.0817 -ylwwa,0.3647 -setusca,0.0037 +yerwa,1.1454 +ylwwa,0.3862 +setusca,0.0039 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cs.csv index 2abbc33541..ba59e3ab7c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Month-cs.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,1.0817 -ylwwa,0.3647 -setusca,0.0037 +yerwa,1.1454 +ylwwa,0.3862 +setusca,0.0039 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cd.csv index fa86e30fbe..716242a4bc 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cd.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,0.1883 -ylwwa,0.0635 -setusca,0.0006 +yerwa,0.2078 +ylwwa,0.0701 +setusca,0.0007 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cs.csv index fa86e30fbe..716242a4bc 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Quarter-cs.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,0.1883 -ylwwa,0.0635 -setusca,0.0006 +yerwa,0.2078 +ylwwa,0.0701 +setusca,0.0007 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cd.csv index ad225deeb9..24f719a638 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cd.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,0.0539 -ylwwa,0.0182 +yerwa,0.0599 +ylwwa,0.0202 setusca,0.0002 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cs.csv index ad225deeb9..24f719a638 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/aggregate-Year-cs.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "System Username","Core Hour Utilization (%)" -yerwa,0.0539 -ylwwa,0.0182 +yerwa,0.0599 +ylwwa,0.0202 setusca,0.0002 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cd.csv index 49ffce82a0..47149c8779 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cd.csv @@ -12,11 +12,11 @@ Day,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[se 2018-04-21,0.8929,0.5952,0 2018-04-22,0.8929,0.5952,0 2018-04-23,0.8929,0.5952,0 -2018-04-24,0.7653,0.5102,0 -2018-04-25,0.7653,0.5102,0 -2018-04-26,1.0403,0.5102,0 -2018-04-27,1.7857,0.4818,0 -2018-04-28,1.7857,0,0 -2018-04-29,1.7857,0,0 -2018-04-30,1.7121,0.1124,0 +2018-04-24,0.8523,0.5682,0 +2018-04-25,0.8523,0.5682,0 +2018-04-26,1.1585,0.5682,0 +2018-04-27,1.9886,0.5365,0 +2018-04-28,1.9886,0,0 +2018-04-29,1.9886,0,0 +2018-04-30,1.9067,0.1252,0 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cs.csv index 49ffce82a0..47149c8779 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Day-cs.csv @@ -12,11 +12,11 @@ Day,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[se 2018-04-21,0.8929,0.5952,0 2018-04-22,0.8929,0.5952,0 2018-04-23,0.8929,0.5952,0 -2018-04-24,0.7653,0.5102,0 -2018-04-25,0.7653,0.5102,0 -2018-04-26,1.0403,0.5102,0 -2018-04-27,1.7857,0.4818,0 -2018-04-28,1.7857,0,0 -2018-04-29,1.7857,0,0 -2018-04-30,1.7121,0.1124,0 +2018-04-24,0.8523,0.5682,0 +2018-04-25,0.8523,0.5682,0 +2018-04-26,1.1585,0.5682,0 +2018-04-27,1.9886,0.5365,0 +2018-04-28,1.9886,0,0 +2018-04-29,1.9886,0,0 +2018-04-30,1.9067,0.1252,0 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cd.csv index 2500774e58..c833049e20 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cd.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[setusca] Core Hour Utilization (%)" -2018-04,1.0817,0.3647,0.0037 +2018-04,1.1454,0.3862,0.0039 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cs.csv index 2500774e58..c833049e20 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Month-cs.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[setusca] Core Hour Utilization (%)" -2018-04,1.0817,0.3647,0.0037 +2018-04,1.1454,0.3862,0.0039 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cd.csv index de1d639006..3c436f5331 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cd.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[setusca] Core Hour Utilization (%)" -"2018 Q2",0.1883,0.0635,0.0006 +"2018 Q2",0.2078,0.0701,0.0007 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cs.csv index de1d639006..3c436f5331 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Quarter-cs.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[setusca] Core Hour Utilization (%)" -"2018 Q2",0.1883,0.0635,0.0006 +"2018 Q2",0.2078,0.0701,0.0007 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cd.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cd.csv index e3ea321f66..ab1061cb04 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cd.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cd.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[setusca] Core Hour Utilization (%)" -2018,0.0539,0.0182,0.0002 +2018,0.0599,0.0202,0.0002 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cs.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cs.csv index e3ea321f66..ab1061cb04 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cs.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/username/cloud_core_utilization/timeseries-Year-cs.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[yerwa] Core Hour Utilization (%)","[ylwwa] Core Hour Utilization (%)","[setusca] Core Hour Utilization (%)" -2018,0.0539,0.0182,0.0002 +2018,0.0599,0.0202,0.0002 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Day-reference.csv index 11797e1f27..889285f868 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Core Hour Utilization (%)" -1,0.7977 -"2 - 3",0.3674 -"4 - 7",0.3704 +1,0.8475 +"2 - 3",0.3904 +"4 - 7",0.3936 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Month-reference.csv index 4baae242e7..11797e1f27 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Core Hour Utilization (%)" -1,0.7534 -"2 - 3",0.3470 -"4 - 7",0.3499 +1,0.7977 +"2 - 3",0.3674 +"4 - 7",0.3704 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Quarter-reference.csv index d7eb5e124d..1e7f4a9826 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Core Hour Utilization (%)" -1,0.1311 -"2 - 3",0.0604 -"4 - 7",0.0609 +1,0.1447 +"2 - 3",0.0667 +"4 - 7",0.0672 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Year-reference.csv index 912018089b..ca0157a93d 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,7 +6,7 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Cores","Core Hour Utilization (%)" -1,0.0376 -"2 - 3",0.0173 -"4 - 7",0.0174 +1,0.0417 +"2 - 3",0.0192 +"4 - 7",0.0194 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Day-reference.csv index 2009242d3e..c3cbbfd14e 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[1] Core Hour Utilization (%)","[2 - 3] Core Hour Utilization (%)","[4 - 7] 2018-04-21,0.8929,0.5952,0 2018-04-22,0.8929,0.5952,0 2018-04-23,0.8929,0.5952,0 -2018-04-24,0.7653,0.5102,0 -2018-04-25,0.7653,0.5102,0 -2018-04-26,0.7702,0.5102,0.2701 -2018-04-27,0.8256,0.4215,1.0204 -2018-04-28,0.7653,0,1.0204 -2018-04-29,0.7653,0,1.0204 -2018-04-30,0.7336,0.1124,0.9785 +2018-04-24,0.8523,0.5682,0 +2018-04-25,0.8523,0.5682,0 +2018-04-26,0.8577,0.5682,0.3008 +2018-04-27,0.9194,0.4694,1.1364 +2018-04-28,0.8523,0,1.1364 +2018-04-29,0.8523,0,1.1364 +2018-04-30,0.8169,0.1252,1.0897 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Month-reference.csv index 557c6b5711..d27c6bbe48 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[1] Core Hour Utilization (%)","[2 - 3] Core Hour Utilization (%)","[4 - 7] Core Hour Utilization (%)" -2018-04,0.7534,0.3470,0.3499 +2018-04,0.7977,0.3674,0.3704 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Quarter-reference.csv index fcafb223f4..95be92eab7 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[1] Core Hour Utilization (%)","[2 - 3] Core Hour Utilization (%)","[4 - 7] Core Hour Utilization (%)" -"2018 Q2",0.1311,0.0604,0.0609 +"2018 Q2",0.1447,0.0667,0.0672 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Year-reference.csv index 8acfb4057f..177bd3e91c 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[1] Core Hour Utilization (%)","[2 - 3] Core Hour Utilization (%)","[4 - 7] Core Hour Utilization (%)" -2018,0.0376,0.0173,0.0174 +2018,0.0417,0.0192,0.0194 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Day-reference.csv index fc9fd61d9f..2ec9e1eeb8 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Day-reference.csv @@ -6,8 +6,8 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Core Hour Utilization (%)" -"2 - 4 GB",1.1589 -"8 - 16 GB",0.3704 -"< 2 GB",0.0058 +"2 - 4 GB",1.2313 +"8 - 16 GB",0.3936 +"< 2 GB",0.0062 "4 - 8 GB",0.0004 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Month-reference.csv index 25d074de89..fc9fd61d9f 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Month-reference.csv @@ -6,8 +6,8 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Core Hour Utilization (%)" -"2 - 4 GB",1.0945 -"8 - 16 GB",0.3499 -"< 2 GB",0.0055 +"2 - 4 GB",1.1589 +"8 - 16 GB",0.3704 +"< 2 GB",0.0058 "4 - 8 GB",0.0004 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Quarter-reference.csv index 917821ac7e..2e27f3d51b 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Quarter-reference.csv @@ -6,8 +6,8 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Core Hour Utilization (%)" -"2 - 4 GB",0.1905 -"8 - 16 GB",0.0609 -"< 2 GB",0.0010 +"2 - 4 GB",0.2103 +"8 - 16 GB",0.0672 +"< 2 GB",0.0011 "4 - 8 GB",0.0001 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Year-reference.csv index 647b7bae36..37e96f2b33 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/aggregate-Year-reference.csv @@ -6,8 +6,8 @@ start,end 2018-04-18,2018-04-30 --------- "VM Size: Memory","Core Hour Utilization (%)" -"2 - 4 GB",0.0546 -"8 - 16 GB",0.0174 +"2 - 4 GB",0.0606 +"8 - 16 GB",0.0194 "< 2 GB",0.0003 "4 - 8 GB",0.0000 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Day-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Day-reference.csv index ad93b8898f..aa7bd24bdb 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Day-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Day-reference.csv @@ -12,11 +12,11 @@ Day,"[2 - 4 GB] Core Hour Utilization (%)","[8 - 16 GB] Core Hour Utilization (% 2018-04-21,1.4881,0,0,0 2018-04-22,1.4881,0,0,0 2018-04-23,1.4881,0,0,0 -2018-04-24,1.2755,0,0,0 -2018-04-25,1.2755,0,0,0 -2018-04-26,1.2804,0.2701,0,0 -2018-04-27,1.1868,1.0204,0.0603,0 -2018-04-28,0.7653,1.0204,0,0 -2018-04-29,0.7653,1.0204,0,0 -2018-04-30,0.8460,0.9785,0,0 +2018-04-24,1.4205,0,0,0 +2018-04-25,1.4205,0,0,0 +2018-04-26,1.4259,0.3008,0,0 +2018-04-27,1.3217,1.1364,0.0671,0 +2018-04-28,0.8523,1.1364,0,0 +2018-04-29,0.8523,1.1364,0,0 +2018-04-30,0.9421,1.0897,0,0 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Month-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Month-reference.csv index f7dd443f20..66e464a395 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Month-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Month-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Month,"[2 - 4 GB] Core Hour Utilization (%)","[8 - 16 GB] Core Hour Utilization (%)","[< 2 GB] Core Hour Utilization (%)","[4 - 8 GB] Core Hour Utilization (%)" -2018-04,1.0945,0.3499,0.0055,0.0004 +2018-04,1.1589,0.3704,0.0058,0.0004 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Quarter-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Quarter-reference.csv index cc004e8ac1..503f4a45a2 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Quarter-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Quarter-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Quarter,"[2 - 4 GB] Core Hour Utilization (%)","[8 - 16 GB] Core Hour Utilization (%)","[< 2 GB] Core Hour Utilization (%)","[4 - 8 GB] Core Hour Utilization (%)" -"2018 Q2",0.1905,0.0609,0.0010,0.0001 +"2018 Q2",0.2103,0.0672,0.0011,0.0001 --------- diff --git a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Year-reference.csv b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Year-reference.csv index c465f437fd..ec7394e0ba 100644 --- a/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Year-reference.csv +++ b/tests/artifacts/xdmod/regression/current/expected/reference/Cloud/vm_size_memory/cloud_core_utilization/timeseries-Year-reference.csv @@ -6,5 +6,5 @@ start,end 2018-04-18,2018-04-30 --------- Year,"[2 - 4 GB] Core Hour Utilization (%)","[8 - 16 GB] Core Hour Utilization (%)","[< 2 GB] Core Hour Utilization (%)","[4 - 8 GB] Core Hour Utilization (%)" -2018,0.0546,0.0174,0.0003,0.0000 +2018,0.0606,0.0194,0.0003,0.0000 --------- diff --git a/tests/component/lib/ETL/CloudResourceSpecsStateTransformIngestorTest.php b/tests/component/lib/ETL/CloudResourceSpecsStateTransformIngestorTest.php new file mode 100644 index 0000000000..cdeb552a63 --- /dev/null +++ b/tests/component/lib/ETL/CloudResourceSpecsStateTransformIngestorTest.php @@ -0,0 +1,254 @@ + + */ + +namespace ComponentTests\ETL; + +use ETL\Ingestor\CloudResourceSpecsStateTransformIngestor; +use ETL\Ingestor\IngestorOptions; +use ETL\Configuration\EtlConfiguration; + +/** + * Test Cloud Resource Specifications State FSM + */ + +class CloudResourceSpecsStateTransformIngestorTest extends \PHPUnit_Framework_TestCase +{ + private $resource_spec_01 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 196514, + "fact_date" => '2018-04-17', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_day_id" => 1 + ); + + private $resource_spec_02 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 100, + "memory_mb" => 196514, + "fact_date" => '2018-04-20', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_day_id" => 1 + ); + + private $resource_spec_03 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 100, + "memory_mb" => 262030, + "fact_date" => '2018-04-24', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_time_ts" => 1 + ); + + private $resource_spec_04 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 196514, + "fact_date" => '2018-04-30', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_day_id" => 1 + ); + + private $resource_spec_05 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 262030, + "fact_date" => '2018-05-02', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_day_id" => 1 + ); + + private $resource_spec_06 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => -1, + "memory_mb" => -1, + "fact_date" => '2018-05-10', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_day_id" => 1 + ); + + private $resource_spec_07 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 196514, + "fact_date" => '2018-05-15', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_day_id" => 1 + ); + + private $resource_spec_08 = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 64, + "memory_mb" => 196514, + "fact_date" => '2019-04-01', + "start_date_ts" => -1, + "end_date_ts" => -1, + "start_day_id" => -1, + "end_day_id" => 1 + ); + + private $resource_spec_zero = array( + "resource_id" => 0, + "hostname" => 0, + "vcpus" => 0, + "memory_mb" => 0, + "start_date_ts" => 0, + "end_date_ts" => 0, + "start_day_id" => 0, + "end_day_id" => 0 + ); + + private $resource_spec_vcpu_changed = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 196514, + "start_date_ts" => 1523923200, + "end_date_ts" => 1524182399, + "start_day_id" => 201800107, + "end_day_id" => 201800109 + ); + + private $resource_spec_memory_changed = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 100, + "memory_mb" => 196514, + "start_date_ts" => 1524182400, + "end_date_ts" => 1524527999, + "start_day_id" => 201800110, + "end_day_id" => 201800113 + ); + + private $resource_spec_vcpu_changed_original_value = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 196514, + "start_date_ts" => 1525046400, + "end_date_ts" => 1525219199, + "start_day_id" => 201800120, + "end_day_id" => 201800121 + ); + + private $resource_spec_host_removed = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 196514, + "start_date_ts" => 1523923200, + "end_date_ts" => 1525910399, + "start_day_id" => 201800107, + "end_day_id" => 201800129 + ); + + private $resource_spec_host_added_back = array( + "resource_id" => 8, + "hostname" => 'srv-p24-36.cbls.ccr.buffalo.edu', + "vcpus" => 56, + "memory_mb" => 196514, + "start_date_ts" => 1526342400, + "end_date_ts" => 1554076799, + "start_day_id" => 201800135, + "end_day_id" => 201900090 + ); + + private $options_array = array( + "name" => "ingest-cloud-resource-specs", + "class" => "CloudResourceSpecsStateTransformIngestor", + "destination" => "modw_test", + "definition_file" => "" + ); + + private $fsm; + + public function __construct() + { + $configFile = realpath(BASE_DIR . '/tests/artifacts/xdmod/etlv2/configuration/input/xdmod_etl_config_8.0.0.json'); + + // This needs to be explicitly defined here so PHP 5.4 doesn't complain + $this->options_array["definition_file"] = BASE_DIR . "/tests/artifacts/xdmod/etlv2/configuration/input/etl_action_defs_8.0.0.d/cloud_state.json"; + + $options = new IngestorOptions($this->options_array); + $conf = EtlConfiguration::factory($configFile); + + $this->fsm = new CloudResourceSpecsStateTransformIngestor($options, $conf); + } + + // Test for when the VCpus change for a host + public function testChangeVcpus() + { + $this->fsm->transformHelper($this->resource_spec_01); + $resource_spec = $this->fsm->transformHelper($this->resource_spec_02); + + $this->assertEquals($this->resource_spec_vcpu_changed, $resource_spec[0]); + } + + // Test for when the memory_mb changes for a host + public function testChangeMemory() + { + $this->fsm->transformHelper($this->resource_spec_02); + $resource_spec = $this->fsm->transformHelper($this->resource_spec_03); + + $this->assertEquals($this->resource_spec_memory_changed, $resource_spec[0]); + } + + // Test for when vcpus change to a value and the back to a previous value + // eg. from 10 to 5 and back to 10 on different days + public function testVcpusChangeToPreviousValue() + { + $this->fsm->transformHelper($this->resource_spec_01); + $resource_specs = $this->fsm->transformHelper($this->resource_spec_02); + $this->fsm->transformHelper($this->resource_spec_04); + $resource_spec_2 = $this->fsm->transformHelper($this->resource_spec_05); + + $this->assertEquals($this->resource_spec_vcpu_changed, $resource_specs[0]); + $this->assertEquals($this->resource_spec_vcpu_changed_original_value, $resource_spec_2[0]); + } + + // Test for when a host is marked as removed + public function testHostRemoved() + { + $this->fsm->transformHelper($this->resource_spec_01); + $resource_specs = $this->fsm->transformHelper($this->resource_spec_06); + + $this->assertEquals($this->resource_spec_host_removed, $resource_specs[0]); + } + + // Test for when a host is removed on one day and added back on another + public function testHostRemovedAndAddedBack() + { + $this->fsm->transformHelper($this->resource_spec_01); + $resource_specs = $this->fsm->transformHelper($this->resource_spec_06); + $this->fsm->transformHelper($this->resource_spec_07); + $resource_specs_2 = $this->fsm->transformHelper($this->resource_spec_08); + + $this->assertEquals($this->resource_spec_host_removed, $resource_specs[0]); + $this->assertEquals($this->resource_spec_host_added_back, $resource_specs_2[0]); + } +}