From 6bd5fa1f9c5eb7ebb5db83d40d55b6e36dc57e94 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 11 Apr 2011 12:21:18 -0700 Subject: [PATCH] bug 9374: removed guest_ip/mac/netmask info from user_vm table. This information is kept in nics table in 2.2.x status 9374: resolved fixed --- setup/db/create-schema.sql | 3 --- setup/db/db/schema-222to224.sql | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 4c9e704f9aa..17facd3cd5b 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -845,9 +845,6 @@ CREATE TABLE `cloud`.`user_vm` ( `id` bigint unsigned UNIQUE NOT NULL, `iso_id` bigint unsigned, `display_name` varchar(255), - `guest_ip_address` char(40) COMMENT 'ip address within the guest network', - `guest_mac_address` varchar(17) COMMENT 'mac address within the guest network', - `guest_netmask` varchar(15) COMMENT 'netmask within the guest network', `user_data` varchar(2048), PRIMARY KEY (`id`), CONSTRAINT `fk_user_vm__id` FOREIGN KEY `fk_user_vm__id` (`id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE diff --git a/setup/db/db/schema-222to224.sql b/setup/db/db/schema-222to224.sql index 45e9e703b16..63ba1618246 100644 --- a/setup/db/db/schema-222to224.sql +++ b/setup/db/db/schema-222to224.sql @@ -132,3 +132,9 @@ UPDATE `cloud`.`service_offering` s, `cloud`.`disk_offering` d SET s.ha_enabled= ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__account_id` FOREIGN KEY `fk_vm_instance__account_id` (`account_id`) REFERENCES `account` (`id`); ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__service_offering_id` FOREIGN KEY `fk_vm_instance__service_offering_id` (`service_offering_id`) REFERENCES `service_offering` (`id`); + + + +ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_ip_address; +ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_mac_address; +ALTER TABLE `cloud`.`user_vm` DROP COLUMN guest_netmask;