Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 777B5FE4E for ; Tue, 6 Aug 2013 11:45:27 +0000 (UTC) Received: (qmail 60619 invoked by uid 500); 6 Aug 2013 11:45:27 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 60605 invoked by uid 500); 6 Aug 2013 11:45:27 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 60597 invoked by uid 99); 6 Aug 2013 11:45:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Aug 2013 11:45:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 59EB78B9E46; Tue, 6 Aug 2013 11:45:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nitin@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to 1970a0d Date: Tue, 6 Aug 2013 11:45:26 +0000 (UTC) Updated Branches: refs/heads/4.2 fab45b518 -> 1970a0ddf CLOUDSTACK-4043 Introduced new column format for volumes as per the hypervisor by joining the storage pool and cluster table. Since pre 4.2 storage pool will always have cluster id populated. Signed off by : nitin mehta Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1970a0dd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1970a0dd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1970a0dd Branch: refs/heads/4.2 Commit: 1970a0ddffeb46ab6928560268c144af07a193a9 Parents: fab45b5 Author: Nitin Mehta Authored: Tue Aug 6 17:14:11 2013 +0530 Committer: Nitin Mehta Committed: Tue Aug 6 17:14:29 2013 +0530 ---------------------------------------------------------------------- setup/db/db/schema-410to420.sql | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1970a0dd/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 6c98802..e554b19 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -492,6 +492,10 @@ ALTER TABLE `cloud`.`user_vm_details` ADD COLUMN `display_detail` tinyint(1) NOT ALTER TABLE `cloud`.`volumes` ADD COLUMN `display_volume` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Should volume be displayed to the end user'; ALTER TABLE `cloud`.`volumes` ADD COLUMN `format` varchar(255) COMMENT 'volume format'; +update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='VHD' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='XenServer'; +update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='OVA' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='VMware'; +update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='QCOW2' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='KVM'; +update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='RAW' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='Ovm'; ALTER TABLE `cloud`.`networks` ADD COLUMN `display_network` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Should network be displayed to the end user';