From 4ff6fdf05f8412dcac933067a2e399be6fb78df2 Mon Sep 17 00:00:00 2001 From: frank Date: Tue, 6 Mar 2012 11:10:22 -0800 Subject: [PATCH] 2214to30 DB upgrade: directly put simulator_network_label, ovm_network_label when creating physical_network_traffic_types table --- setup/db/db/schema-2214to30.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql index 2cd660cb736..0006f2fb340 100755 --- a/setup/db/db/schema-2214to30.sql +++ b/setup/db/db/schema-2214to30.sql @@ -395,6 +395,8 @@ CREATE TABLE `cloud`.`physical_network_traffic_types` ( `xen_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a XenServer host', `kvm_network_label` varchar(255) DEFAULT 'cloudbr0' COMMENT 'The network name label of the physical device dedicated to this traffic on a KVM host', `vmware_network_label` varchar(255) DEFAULT 'vSwitch0' COMMENT 'The network name label of the physical device dedicated to this traffic on a VMware host', + `simulator_network_label` varchar(255) COMMENT 'The name labels needed for identifying the simulator', + `ovm_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a Ovm host', `vlan` varchar(255) COMMENT 'The vlan tag to be sent down to a VMware host', PRIMARY KEY (`id`), CONSTRAINT `fk_physical_network_traffic_types__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE, @@ -523,7 +525,6 @@ CREATE TABLE `cloud`.`op_user_stats_log` ( UNIQUE KEY (`user_stats_id`, `updated`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `simulator_network_label` varchar(255) COMMENT 'The name labels needed for identifying the simulator'; --; -- Network offerings @@ -648,7 +649,6 @@ UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'kvm.public. UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'kvm.private.network.device'; UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'kvm.guest.network.device'; -ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `ovm_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a Ovm host'; ALTER TABLE `cloud`.`dc_storage_network_ip_range` ADD COLUMN `gateway` varchar(15) NOT NULL COMMENT 'gateway ip address'; ALTER TABLE `cloud`.`volumes` ADD COLUMN `last_pool_id` bigint unsigned;