From 3cc9f3ff06a66489f92daca73f20bd20e7e14bc0 Mon Sep 17 00:00:00 2001 From: Prachi Damle Date: Thu, 17 Jan 2013 19:34:47 -0800 Subject: [PATCH] Adding defaults to new columns --- .../engine/provisioning/test/ProvisioningTest.java | 6 +++--- setup/db/4.1-new-db-schema.sql | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java index 1f7cc1f0ca7..25a37eb3710 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java @@ -127,9 +127,9 @@ public class ProvisioningTest extends TestCase { @Test public void testProvisioning() { - //registerAndEnableZone(); - //registerAndEnablePod(); - //registerAndEnableCluster(); + registerAndEnableZone(); + registerAndEnablePod(); + registerAndEnableCluster(); registerAndEnableHost(); } diff --git a/setup/db/4.1-new-db-schema.sql b/setup/db/4.1-new-db-schema.sql index cbce3d05aea..175b97d1f65 100644 --- a/setup/db/4.1-new-db-schema.sql +++ b/setup/db/4.1-new-db-schema.sql @@ -27,20 +27,20 @@ alter table vm_instance add column disk_offering_id bigint unsigned; alter table data_center add column owner varchar(255); alter table data_center add column created datetime COMMENT 'date created'; alter table data_center add column lastUpdated datetime COMMENT 'last updated'; -alter table data_center add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; +alter table data_center add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone'; alter table host_pod_ref add column owner varchar(255); alter table host_pod_ref add column created datetime COMMENT 'date created'; alter table host_pod_ref add column lastUpdated datetime COMMENT 'last updated'; -alter table host_pod_ref add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; +alter table host_pod_ref add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone'; alter table host add column owner varchar(255); alter table host add column lastUpdated datetime COMMENT 'last updated'; -alter table host add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; +alter table host add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone'; alter table cluster add column owner varchar(255); alter table cluster add column created datetime COMMENT 'date created'; alter table cluster add column lastUpdated datetime COMMENT 'last updated'; -alter table cluster add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; +alter table cluster add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone'; CREATE TABLE `cloud`.`data_store_provider` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',