From 6af0a1e9be086be514bbfd2ff101db29fdabddac Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 4 Apr 2011 14:11:20 -0700 Subject: [PATCH] bug 9298: vm_type can be NULL in "nics" table (for placeholder nics) status 9298: resolved fixed --- setup/db/221to222.sql | 5 +---- setup/db/db/schema-221to222.sql | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/setup/db/221to222.sql b/setup/db/221to222.sql index d4798fdd47a..76dba6bd91a 100644 --- a/setup/db/221to222.sql +++ b/setup/db/221to222.sql @@ -7,12 +7,11 @@ update network_offerings set firewall_service=1, lb_service=1,vpn_service=1,gate alter table domain add column `state` char(32) NOT NULL default 'Active' COMMENT 'state of the domain'; alter table nics add column `vm_type` char(32); update nics set vm_type=(select type from vm_instance where vm_instance.id=nics.instance_id); -delete from configuration where name='router.cleanup'; INSERT INTO configuration (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Network','DEFAULT','none','network.guest.cidr.limit','22','size limit for guest cidr; cant be less than this value'); alter table user_statistics add column `network_id` bigint unsigned; update op_networks set nics_count=(nics_count-1) where id in (select d.network_id from domain_router d, vm_instance i where i.state='Running' and i.id=d.id); update network_offerings set traffic_type='Guest' where system_only=0; -alter table network_offerings add column `guest_type` char(32) NOT NULL; +alter table network_offerings add column `guest_type` char(32); update network_offerings set guest_type='Direct' where id=5; update network_offerings set guest_type='Virtual' where id=6; update network_offerings set guest_type='Direct' where id=7; @@ -29,5 +28,3 @@ update network_offerings set availability='Optional' where id=7; delete from configuration where name='router.cleanup.interval'; INSERT INTO configuration (category, instance, component, name, value, description) VALUES ('Advanced', 'DEFAULT', 'management-server', 'management.network.cidr', NULL, 'The cidr of management server network'); - - diff --git a/setup/db/db/schema-221to222.sql b/setup/db/db/schema-221to222.sql index f27b93cd28f..db9a1f3003f 100644 --- a/setup/db/db/schema-221to222.sql +++ b/setup/db/db/schema-221to222.sql @@ -4,7 +4,7 @@ update network_offerings set system_only=1 where name='System-Guest-Network'; update network_offerings set dns_service=1,userdata_service=1,dhcp_service=1 where system_only=0; update network_offerings set firewall_service=1, lb_service=1,vpn_service=1,gateway_service=1 where traffic_type='guest' and system_only=0; alter table domain add column `state` char(32) NOT NULL default 'Active' COMMENT 'state of the domain'; -alter table nics add column `vm_type` char(32) NOT NULL; +alter table nics add column `vm_type` char(32); update nics set vm_type=(select type from vm_instance where vm_instance.id=nics.instance_id); INSERT INTO configuration (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Network','DEFAULT','none','network.guest.cidr.limit','22','size limit for guest cidr; cant be less than this value'); alter table user_statistics add column `network_id` bigint unsigned; @@ -25,3 +25,5 @@ update network_offerings set specify_vlan=1 where system_only=0 and guest_type=' update networks set traffic_type='Guest' where network_offering_id in (select id from network_offerings where system_only=0); update network_offerings set availability='Optional' where id=7; delete from configuration where name='router.cleanup.interval'; +INSERT INTO configuration (category, instance, component, name, value, description) + VALUES ('Advanced', 'DEFAULT', 'management-server', 'management.network.cidr', NULL, 'The cidr of management server network');