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 B48E910BAE for ; Thu, 19 Dec 2013 08:46:23 +0000 (UTC) Received: (qmail 32371 invoked by uid 500); 19 Dec 2013 08:46:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 32295 invoked by uid 500); 19 Dec 2013 08:46:23 -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 32288 invoked by uid 99); 19 Dec 2013 08:46:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 08:46:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DB67DE6D0; Thu, 19 Dec 2013 08:46:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: koushik@apache.org To: commits@cloudstack.apache.org Message-Id: <8eb36a8d0497486f8402a596fbc4af77@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to f2fab9d Date: Thu, 19 Dec 2013 08:46:21 +0000 (UTC) Updated Branches: refs/heads/master 26858c16e -> f2fab9d5b CLOUDSTACK-5458: cpu speed is not getting updated in vm_instance table after service offeirngs change Removed cpu, ram and cpu speed fields from the vm_instance table as these are not used Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2fab9d5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2fab9d5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2fab9d5 Branch: refs/heads/master Commit: f2fab9d5b194fcf2d8c08a5511f3d94e6c35edb6 Parents: 26858c1 Author: Koushik Das Authored: Thu Dec 19 14:15:39 2013 +0530 Committer: Koushik Das Committed: Thu Dec 19 14:15:39 2013 +0530 ---------------------------------------------------------------------- .../cloud/entity/api/VirtualMachineEntityImpl.java | 2 -- .../engine/cloud/entity/api/db/VMEntityVO.java | 17 ----------------- setup/db/db/schema-421to430.sql | 5 +++++ 3 files changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2fab9d5/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java index ed8909c..7f2e4ff 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java @@ -57,7 +57,6 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity { this.vmEntityVO.setOwner(owner); this.vmEntityVO.setHostname(hostName); this.vmEntityVO.setDisplayname(displayName); - this.vmEntityVO.setSpeed(speed); this.vmEntityVO.setComputeTags(computeTags); this.vmEntityVO.setRootDiskTags(rootDiskTags); this.vmEntityVO.setNetworkIds(networks); @@ -76,7 +75,6 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity { this.vmEntityVO.setOwner(owner); this.vmEntityVO.setHostname(hostName); this.vmEntityVO.setDisplayname(displayName); - this.vmEntityVO.setSpeed(speed); this.vmEntityVO.setComputeTags(computeTags); this.vmEntityVO.setRootDiskTags(rootDiskTags); this.vmEntityVO.setNetworkIds(networks); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2fab9d5/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java index a4a0cc9..19d608b 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java @@ -145,12 +145,6 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject details; @@ -161,9 +155,6 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject computeTags; @@ -491,14 +482,6 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject getComputeTags() { return computeTags; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2fab9d5/setup/db/db/schema-421to430.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql index 7cc0d4d..ba19ae6 100644 --- a/setup/db/db/schema-421to430.sql +++ b/setup/db/db/schema-421to430.sql @@ -863,3 +863,8 @@ CREATE TABLE `cloud`.`s2s_vpn_connection_details` ( PRIMARY KEY (`id`), CONSTRAINT `fk_s2s_vpn_connection_details__s2s_vpn_connection_id` FOREIGN KEY `fk_s2s_vpn_connection_details__s2s_vpn_connection_id`(`s2s_vpn_connection_id`) REFERENCES `s2s_vpn_connection`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `cpu`; +ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `ram`; +ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `speed`; +