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 details; @@ -161,9 +155,6 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject computeTags; @@ -513,14 +504,6 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject 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`; +