diff --git a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php index 72a622e82f..d82bf01011 100644 --- a/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php +++ b/classes/OpenXdmod/Migration/Version800To810/DatabasesMigration.php @@ -52,19 +52,69 @@ public function execute() $hpcdbDb = DB::factory('hpcdb'); $dwDb = DB::factory('datawarehouse'); $dwi = new DataWarehouseInitializer($hpcdbDb, $dwDb); - + $db = DB::factory('database'); if($dwi->isRealmEnabled('Cloud')){ + $console = Console::factory(); $console->displayMessage(<<<"EOT" -There have been updates to cloud aggregation statistics to make the data more accurate. -If you have the Cloud realm enabled it is recommended that you re-ingest and aggregate -your cloud data using the commands recommended in our documentation. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +There have been updates to cloud data the current data is INVALID. +If you need the current data back it up NOW. +After you press enter it will be removed. +Canceling the upgrade process now will break XDMoD. + +After the upgrade is complete re-ingest and aggregate your cloud data using the +commands recommended in our documentation. + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + EOT ); + $console->prompt("Press ENTER to continue."); + + $db->execute(' + DROP TABLE IF EXISTS `modw_cloud`.`account`; + DROP TABLE IF EXISTS `modw_cloud`.`asset`; + DROP TABLE IF EXISTS `modw_cloud`.`asset_type`; + DROP TABLE IF EXISTS `modw_cloud`.`avail_zone`; + DROP TABLE IF EXISTS `modw_cloud`.`cloud_events_transient`; + DROP TABLE IF EXISTS `modw_cloud`.`cloud_resource_metadata`; + DROP TABLE IF EXISTS `modw_cloud`.`cloudfact_by_day`; + DROP TABLE IF EXISTS `modw_cloud`.`cloudfact_by_month`; + DROP TABLE IF EXISTS `modw_cloud`.`cloudfact_by_quarter`; + DROP TABLE IF EXISTS `modw_cloud`.`cloudfact_by_year`; + DROP TABLE IF EXISTS `modw_cloud`.`event`; + DROP TABLE IF EXISTS `modw_cloud`.`event_asset`; + DROP TABLE IF EXISTS `modw_cloud`.`event_reconstructed`; + DROP TABLE IF EXISTS `modw_cloud`.`event_type`; + DROP TABLE IF EXISTS `modw_cloud`.`generic_cloud_raw_event`; + DROP TABLE IF EXISTS `modw_cloud`.`generic_cloud_raw_instance_type`; + DROP TABLE IF EXISTS `modw_cloud`.`generic_cloud_raw_volume`; + DROP TABLE IF EXISTS `modw_cloud`.`generic_cloud_staging_event`; + DROP TABLE IF EXISTS `modw_cloud`.`host`; + DROP TABLE IF EXISTS `modw_cloud`.`image`; + DROP TABLE IF EXISTS `modw_cloud`.`instance`; + DROP TABLE IF EXISTS `modw_cloud`.`instance_data`; + DROP TABLE IF EXISTS `modw_cloud`.`instance_type`; + DROP TABLE IF EXISTS `modw_cloud`.`job_record_event`; + DROP TABLE IF EXISTS `modw_cloud`.`memory_buckets`; + DROP TABLE IF EXISTS `modw_cloud`.`openstack_event_map`; + DROP TABLE IF EXISTS `modw_cloud`.`openstack_raw_event`; + DROP TABLE IF EXISTS `modw_cloud`.`openstack_raw_instance_type`; + DROP TABLE IF EXISTS `modw_cloud`.`openstack_staging_event`; + DROP TABLE IF EXISTS `modw_cloud`.`processor_buckets`; + DROP TABLE IF EXISTS `modw_cloud`.`record_type`; + DROP TABLE IF EXISTS `modw_cloud`.`region`; + DROP TABLE IF EXISTS `modw_cloud`.`user`; + '); } - $db = DB::factory('database'); - $result = $db->query('SELECT id FROM Users'); foreach ($result as $row) { diff --git a/configuration/etl/etl_action_defs.d/cloud_common/cloud_transient.json b/configuration/etl/etl_action_defs.d/cloud_common/cloud_transient.json index 9dce6ba94d..aedd6075da 100644 --- a/configuration/etl/etl_action_defs.d/cloud_common/cloud_transient.json +++ b/configuration/etl/etl_action_defs.d/cloud_common/cloud_transient.json @@ -5,9 +5,9 @@ "source_query": { "records": { "instance_id": "e.instance_id", - "start_time": "e.start_time", + "start_time": "FROM_UNIXTIME(e.start_time)", "start_event_type_id": "e.start_event_id", - "end_time": "e.end_time", + "end_time": "FROM_UNIXTIME(e.end_time)", "end_event_type_id": "e.end_event_id", "resource_id": "it.resource_id", "instance": "it.provider_identifier", @@ -16,11 +16,11 @@ "num_cores": "itt.num_cores", "memory_mb": "itt.memory_mb", "disk_gb": "itt.disk_gb", - "start_time_ts": "UNIX_TIMESTAMP(e.start_time)", - "end_time_ts": "UNIX_TIMESTAMP(e.end_time)", - "start_day_id": "YEAR(e.start_time) * 100000 + DAYOFYEAR(e.start_time)", - "end_day_id": "YEAR(e.end_time) * 100000 + DAYOFYEAR(e.end_time)", - "wallduration": "UNIX_TIMESTAMP(e.end_time) - UNIX_TIMESTAMP(e.start_time)", + "start_time_ts": "FLOOR(e.start_time)", + "end_time_ts": "FLOOR(e.end_time)", + "start_day_id": "YEAR(FROM_UNIXTIME(e.start_time)) * 100000 + DAYOFYEAR(FROM_UNIXTIME(e.start_time))", + "end_day_id": "YEAR(FROM_UNIXTIME(e.end_time)) * 100000 + DAYOFYEAR(FROM_UNIXTIME(e.end_time))", + "wallduration": "FLOOR(e.end_time) - FLOOR(e.start_time)", "submission_venue_id": "ev.submission_venue_id" }, "joins": [ diff --git a/configuration/etl/etl_action_defs.d/cloud_generic/staging_event.json b/configuration/etl/etl_action_defs.d/cloud_generic/staging_event.json index 6ba940fa97..47b7b2205b 100644 --- a/configuration/etl/etl_action_defs.d/cloud_generic/staging_event.json +++ b/configuration/etl/etl_action_defs.d/cloud_generic/staging_event.json @@ -18,7 +18,7 @@ "source_query": { "records": { "resource_id": "raw.resource_id", - "event_time_utc": "raw.event_time_utc", + "event_time_utc": "UNIX_TIMESTAMP(CONVERT_TZ(raw.event_time_utc,'+00:00', @@session.time_zone))", "event_type_id": "COALESCE(etype.event_type_id, -1)", "record_type_id": "COALESCE(rtype.record_type_id, -1)", "account_id": "COALESCE(acct.account_id, -1)", diff --git a/configuration/etl/etl_action_defs.d/cloud_generic/volume.json b/configuration/etl/etl_action_defs.d/cloud_generic/volume.json index da283c5523..09e7da539a 100644 --- a/configuration/etl/etl_action_defs.d/cloud_generic/volume.json +++ b/configuration/etl/etl_action_defs.d/cloud_generic/volume.json @@ -11,7 +11,7 @@ "asset_type_id": "atype.asset_type_id", "account_id": "act.account_id", "provider_identifier": "raw.provider_volume_identifier", - "create_time_utc": "raw.create_time_utc", + "create_time_utc": "UNIX_TIMESTAMP(CONVERT_TZ(raw.create_time_utc,'+00:00', @@session.time_zone))", "size": "raw.disk_gb" }, diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/raw_cloud_job_logs.json b/configuration/etl/etl_action_defs.d/cloud_openstack/raw_cloud_job_logs.json index 68d001dc20..6b0114d4ce 100644 --- a/configuration/etl/etl_action_defs.d/cloud_openstack/raw_cloud_job_logs.json +++ b/configuration/etl/etl_action_defs.d/cloud_openstack/raw_cloud_job_logs.json @@ -1,6 +1,6 @@ { - "#": "Load raw event data from OpenStack log files. The resource id will be specified on", - "#": "the ETL command line at run time.", + "#": "Load raw event data from OpenStack log files. The resource id will be", + "#": "specified on the ETL command line at run time.", "table_definition": [ { @@ -18,7 +18,7 @@ "event_type": "event_type", "record_type": "record_type", "event_time_utc": "generated", - "create_time_utc": "created_at", + "create_time_utc": "created_at", "provider_instance_identifier": "instance_id", "hostname": "host", "user_name": "user_name", @@ -26,11 +26,11 @@ "resource_id": "${RESOURCE_ID}", "instance_type": "instance_type", "provider_account": "user_name", - "project_name": "project_name", - "request_id": "request_id", - "project_id": "project_id", - "openstack_resource_id": "resource_id", - "disk_gb": "disk_gb", + "project_name": "project_name", + "request_id": "request_id", + "project_id": "project_id", + "openstack_resource_id": "resource_id", + "disk_gb": "disk_gb", "size": "size", "volume_id": "volume_id", "state": "state" diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/staging_event.json b/configuration/etl/etl_action_defs.d/cloud_openstack/staging_event.json index 8060af2a6c..434309a181 100644 --- a/configuration/etl/etl_action_defs.d/cloud_openstack/staging_event.json +++ b/configuration/etl/etl_action_defs.d/cloud_openstack/staging_event.json @@ -13,7 +13,7 @@ "source_query": { "records": { "resource_id": "raw.resource_id", - "event_time_utc": "raw.event_time_utc", + "event_time_utc": "UNIX_TIMESTAMP(CONVERT_TZ(raw.event_time_utc,'+00:00', @@session.time_zone))", "event_type_id": "COALESCE(etype.event_type_id, -1)", "record_type_id": "COALESCE(rtype.record_type_id, -1)", "account_id": "COALESCE(acct.account_id, -1)", diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json b/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json index e858349446..7efbaf4d24 100644 --- a/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json +++ b/configuration/etl/etl_action_defs.d/cloud_openstack/volume.json @@ -12,7 +12,7 @@ "resource_id": "raw.resource_id", "account_id": "act.account_id", "provider_identifier": "raw.openstack_resource_id", - "create_time_utc": "raw.event_time_utc", + "create_time_utc": "UNIX_TIMESTAMP(CONVERT_TZ(raw.event_time_utc,'+00:00', @@session.time_zone))", "size": "raw.size" }, diff --git a/configuration/etl/etl_tables.d/cloud_common/asset.json b/configuration/etl/etl_tables.d/cloud_common/asset.json index 08732b03ca..82c0118a29 100644 --- a/configuration/etl/etl_tables.d/cloud_common/asset.json +++ b/configuration/etl/etl_tables.d/cloud_common/asset.json @@ -41,17 +41,17 @@ }, { "name": "create_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time that the asset was created in UTC." + "default": 0, + "comment": "The time that the asset was created as a unix timestamp to the microsecond." }, { "name": "destroy_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": true, "default": null, - "comment": "The time that the asset was destroyed in UTC." + "comment": "The time that the asset was destroyed as a unix timestamp to the microsecond." }, { "name": "size", diff --git a/configuration/etl/etl_tables.d/cloud_common/event.json b/configuration/etl/etl_tables.d/cloud_common/event.json index 4f5584fcf8..57c14b59cc 100644 --- a/configuration/etl/etl_tables.d/cloud_common/event.json +++ b/configuration/etl/etl_tables.d/cloud_common/event.json @@ -27,9 +27,9 @@ }, { "name": "event_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00" + "default": 0 }, { "name": "event_type_id", diff --git a/configuration/etl/etl_tables.d/cloud_common/event_reconstructed.json b/configuration/etl/etl_tables.d/cloud_common/event_reconstructed.json index 46cc9661e9..40626ad2b1 100644 --- a/configuration/etl/etl_tables.d/cloud_common/event_reconstructed.json +++ b/configuration/etl/etl_tables.d/cloud_common/event_reconstructed.json @@ -15,7 +15,7 @@ }, { "name": "start_time", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false }, { @@ -25,7 +25,7 @@ }, { "name": "end_time", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false }, { diff --git a/configuration/etl/etl_tables.d/cloud_common/instance_type.json b/configuration/etl/etl_tables.d/cloud_common/instance_type.json index 11046e084e..6ca2b1edd2 100644 --- a/configuration/etl/etl_tables.d/cloud_common/instance_type.json +++ b/configuration/etl/etl_tables.d/cloud_common/instance_type.json @@ -58,17 +58,17 @@ }, { "name": "start_time", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "First time that this configuration was seen, defaults to unknown." + "default": 0, + "comment": "First time that this configuration was seen as a unix timestamp to the microsecond. defaults to unknown." }, { "name": "end_time", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": true, "default": null, - "comment": "End time for this configuration, NULL if it is still in effect." + "comment": "End time for this configuration as a unix timestamp to the microsecond., NULL if it is still in effect." } ], diff --git a/configuration/etl/etl_tables.d/cloud_generic/raw_event.json b/configuration/etl/etl_tables.d/cloud_generic/raw_event.json index be7cf2eb35..5e4b0d1e1c 100644 --- a/configuration/etl/etl_tables.d/cloud_generic/raw_event.json +++ b/configuration/etl/etl_tables.d/cloud_generic/raw_event.json @@ -24,10 +24,10 @@ }, { "name": "event_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time of the event in UTC." + "default": 0, + "comment": "The time of the event as a unix timestamp to the microsecond.." }, { "name": "event_type", diff --git a/configuration/etl/etl_tables.d/cloud_generic/raw_instance_type.json b/configuration/etl/etl_tables.d/cloud_generic/raw_instance_type.json index 327d0a199d..2b3804a05b 100644 --- a/configuration/etl/etl_tables.d/cloud_generic/raw_instance_type.json +++ b/configuration/etl/etl_tables.d/cloud_generic/raw_instance_type.json @@ -54,10 +54,10 @@ }, { "name": "start_time", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": true, - "default": "0000-00-00 00:00:00", - "comment": "First time this configuration was encountered, defaults to unknown." + "default": 0, + "comment": "First time this configuration was encountered as a unix timestamp to the microsecond., defaults to unknown." } ], "indexes": [ diff --git a/configuration/etl/etl_tables.d/cloud_generic/raw_volume.json b/configuration/etl/etl_tables.d/cloud_generic/raw_volume.json index 15b7c29050..c05991f4c3 100644 --- a/configuration/etl/etl_tables.d/cloud_generic/raw_volume.json +++ b/configuration/etl/etl_tables.d/cloud_generic/raw_volume.json @@ -34,24 +34,24 @@ }, { "name": "event_time_utc", - "type": "datetime", + "type": "char(26)", "nullable": false, - "default": "0000-00-00 00:00:00", + "default": "0000-00-00T00:00:00.000000", "comment": "The time of the event in UTC." }, { "name": "attach_time_utc", - "type": "datetime", + "type": "char(26)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time that the volume was attached to an instance in UTC." + "default": "0000-00-00T00:00:00.000000", + "comment": "The time of the event in UTC." }, { "name": "create_time_utc", - "type": "datetime", + "type": "char(26)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time that the volume was created in UTC." + "default": "0000-00-00T00:00:00.000000", + "comment": "The time of the event in UTC." }, { "name": "provider_volume_identifier", diff --git a/configuration/etl/etl_tables.d/cloud_generic/staging_event.json b/configuration/etl/etl_tables.d/cloud_generic/staging_event.json index 0c4bfb971f..3c38cb86ef 100644 --- a/configuration/etl/etl_tables.d/cloud_generic/staging_event.json +++ b/configuration/etl/etl_tables.d/cloud_generic/staging_event.json @@ -18,10 +18,10 @@ }, { "name": "event_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time of the event in UTC." + "default": 0, + "comment": "The time of the event as a unix timestamp to the microsecond.." }, { "name": "event_type_id", diff --git a/configuration/etl/etl_tables.d/cloud_openstack/raw_event.json b/configuration/etl/etl_tables.d/cloud_openstack/raw_event.json index 35cd3a8df3..1fac244a96 100644 --- a/configuration/etl/etl_tables.d/cloud_openstack/raw_event.json +++ b/configuration/etl/etl_tables.d/cloud_openstack/raw_event.json @@ -7,8 +7,7 @@ "name": "openstack_raw_event", "engine": "MyISAM", "comment": "Raw events from Open Stack log events.", - "columns": [ - { + "columns": [{ "name": "resource_id", "type": "int(11)", "nullable": false @@ -22,17 +21,17 @@ }, { "name": "event_time_utc", - "type": "datetime", + "type": "char(26)", "nullable": false, - "default": "0000-00-00 00:00:00", + "default": "0000-00-00T00:00:00.000000", "comment": "The time of the event in UTC." }, { "name": "create_time_utc", - "type": "datetime", + "type": "char(26)", "nullable": true, - "default": "0000-00-00 00:00:00", - "comment": "Time when the resource was created." + "default": "0000-00-00T00:00:00.000000", + "comment": "The time of the event in UTC." }, { "name": "event_type", @@ -43,7 +42,7 @@ "name": "record_type", "type": "varchar(64)", "nullable": true, - "default": null + "default": null }, { "name": "hostname", @@ -83,17 +82,17 @@ "default": null }, { - "name": "project_id", - "type": "varchar(64)", - "nullable": true, - "default": null - }, - { - "name": "request_id", - "type": "varchar(64)", - "nullable": true, - "default": null - }, + "name": "project_id", + "type": "varchar(64)", + "nullable": true, + "default": null + }, + { + "name": "request_id", + "type": "varchar(64)", + "nullable": true, + "default": null + }, { "name": "event_data", "type": "varchar(256)", @@ -102,28 +101,28 @@ "comment": "Additional data specific to an event (e.g., volume, IP address, etc.)" }, { - "name": "openstack_resource_id", - "type": "varchar(64)", - "nullable": true, - "default": null - }, - { - "name": "disk_gb", - "type": "int(11)", - "nullable": true, - "default": null - }, + "name": "openstack_resource_id", + "type": "varchar(64)", + "nullable": true, + "default": null + }, { - "name": "size", - "type": "int(11)", - "nullable": true, - "default": null - }, + "name": "disk_gb", + "type": "int(11)", + "nullable": true, + "default": null + }, { - "name": "volume_id", - "type": "varchar(64)", - "nullable": true, - "default": null + "name": "size", + "type": "int(11)", + "nullable": true, + "default": null + }, + { + "name": "volume_id", + "type": "varchar(64)", + "nullable": true, + "default": null }, { "name": "state", @@ -132,14 +131,12 @@ "default": null } ], - "indexes": [ - { - "name": "resource_id", - "columns": [ - "resource_id" - ], - "is_unique": false - } - ] + "indexes": [{ + "name": "resource_id", + "columns": [ + "resource_id" + ], + "is_unique": false + }] } } diff --git a/configuration/etl/etl_tables.d/cloud_openstack/raw_instance_type.json b/configuration/etl/etl_tables.d/cloud_openstack/raw_instance_type.json index 32b9e75748..10742af7d6 100644 --- a/configuration/etl/etl_tables.d/cloud_openstack/raw_instance_type.json +++ b/configuration/etl/etl_tables.d/cloud_openstack/raw_instance_type.json @@ -54,10 +54,10 @@ }, { "name": "start_time", - "type": "datetime", - "nullable": true, - "default": "0000-00-00 00:00:00", - "comment": "First time this configuration was encountered, defaults to unknown." + "type": "char(26)", + "nullable": false, + "default": "0000-00-00T00:00:00.000000", + "comment": "The time of the event in UTC." } ], "indexes": [ diff --git a/configuration/etl/etl_tables.d/cloud_openstack/raw_volume.json b/configuration/etl/etl_tables.d/cloud_openstack/raw_volume.json index 1c85575357..2cb8bd3815 100644 --- a/configuration/etl/etl_tables.d/cloud_openstack/raw_volume.json +++ b/configuration/etl/etl_tables.d/cloud_openstack/raw_volume.json @@ -34,24 +34,24 @@ }, { "name": "event_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time of the event in UTC." + "default": 0, + "comment": "A unix timestamp to the microsecond." }, { "name": "attach_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time that the volume was attached to an instance in UTC." + "default": 0, + "comment": "The time that the volume was attached to an instance as a unix timestamp to the microsecond." }, { "name": "create_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time that the volume was created in UTC." + "default": 0, + "comment": "The time that the volume was created as a unix timestamp to the microsecond." }, { "name": "provider_volume_identifier", diff --git a/configuration/etl/etl_tables.d/cloud_openstack/staging_event.json b/configuration/etl/etl_tables.d/cloud_openstack/staging_event.json index 6302eec762..442d2d6e0d 100644 --- a/configuration/etl/etl_tables.d/cloud_openstack/staging_event.json +++ b/configuration/etl/etl_tables.d/cloud_openstack/staging_event.json @@ -18,10 +18,10 @@ }, { "name": "event_time_utc", - "type": "datetime", + "type": "decimal(16, 6)", "nullable": false, - "default": "0000-00-00 00:00:00", - "comment": "The time of the event in UTC." + "default": "0", + "comment": "Unix timestamp to the microsecond." }, { "name": "event_type_id", diff --git a/db/migrations/8.0.0-8.1.0/modw_cloud.sql b/db/migrations/8.0.0-8.1.0/modw_cloud.sql deleted file mode 100644 index 65f782f246..0000000000 --- a/db/migrations/8.0.0-8.1.0/modw_cloud.sql +++ /dev/null @@ -1,14 +0,0 @@ -USE modw_cloud; - --- When adding new OpenStack events to track we are also updating the mapping of --- somme OpenStack events. The events that already exist in the staging and event --- need to have their mappings updated. Some of the updates include mapping the --- compute.instance.power_on.start event to POWER_ON_START event and --- compute.instance.resume.start to REQUEST_RESUME and compute.instance.resume.end --- to RESUME. - -UPDATE `openstack_staging_event` SET event_type_id = 58 WHERE event_type_id = 7; -UPDATE `openstack_staging_event` SET event_type_id = 45 WHERE event_type_id IN (8,17); - -UPDATE `event` SET event_type_id = 58 WHERE event_type_id = 7; -UPDATE `event` SET event_type_id = 45 WHERE event_type_id IN (8,17); diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl index 5037e9110a..c883d14ad9 100644 --- a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl +++ b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl @@ -23,6 +23,10 @@ expect { timeout { send_user "\nFailed to get prompt\n"; exit 1 } + "\nPress ENTER to continue." { + send \n + exp_continue + } "Upgrade Complete" { lassign [wait] pid spawnid os_error_flag value }