From efe2549e7a364d9c1c5f5fedfbb75c38ee2b0e63 Mon Sep 17 00:00:00 2001
From: Koushik Das <koushik@apache.org>
Date: Wed, 18 Dec 2013 15:30:16 +0530
Subject: [PATCH] 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

---
 .../entity/api/VirtualMachineEntityImpl.java    |  2 --
 .../engine/cloud/entity/api/db/VMEntityVO.java  | 17 -----------------
 setup/db/db/schema-421to430.sql                 |  7 ++++++-
 3 files changed, 6 insertions(+), 20 deletions(-)

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 dd57f9a03f4..1e50d146f9b 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
@@ -54,7 +54,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);
@@ -72,7 +71,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);
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 b1df9675894..21556059463 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;
 
@@ -513,14 +504,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;
     }
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index d9cdfe6b6b8..9913b082052 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -861,4 +861,9 @@ CREATE TABLE `cloud`.`s2s_vpn_connection_details` (
   `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'True if the detail can be displayed to the end user',
   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;
\ No newline at end of file
+) 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`;
+