You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2013/12/19 09:46:21 UTC
git commit: updated refs/heads/master to f2fab9d
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 <ko...@apache.org>
Authored: Thu Dec 19 14:15:39 2013 +0530
Committer: Koushik Das <ko...@apache.org>
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<State, Virt
@Enumerated(value = EnumType.STRING)
protected HypervisorType hypervisorType;
- @Column(name = "ram")
- protected long ram;
-
- @Column(name = "cpu")
- protected int cpu;
-
@Transient
Map<String, String> details;
@@ -161,9 +155,6 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject<State, Virt
@Column(name = "owner")
private String owner = null;
- @Column(name = "speed")
- private int speed;
-
@Transient
List<String> computeTags;
@@ -491,14 +482,6 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject<State, Virt
this.owner = owner;
}
- public int getSpeed() {
- return speed;
- }
-
- public void setSpeed(int speed) {
- this.speed = speed;
- }
-
public List<String> 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`;
+