Skip to content

Commit b87a5ce

Browse files
author
Alena Prokharchyk
committed
Fixed deploydb for 4.5 branch
1 parent 62e005b commit b87a5ce

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎setup/db/create-schema.sql‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ CREATE TABLE `cloud`.`networks` (
246246
`broadcast_domain_type` varchar(32) NOT NULL COMMENT 'type of broadcast domain used',
247247
`broadcast_uri` varchar(255) COMMENT 'broadcast domain specifier',
248248
`gateway` varchar(15) COMMENT 'gateway for this network configuration',
249-
`cidr` varchar(18) COMMENT 'network cidr',
249+
`cidr` varchar(18) COMMENT 'network cidr',
250250
`mode` varchar(32) COMMENT 'How to retrieve ip address in this network',
251251
`network_offering_id` bigint unsigned NOT NULL COMMENT 'network offering id that this configuration is created from',
252252
`physical_network_id` bigint unsigned COMMENT 'physical network id that this configuration is based on',
@@ -270,14 +270,14 @@ CREATE TABLE `cloud`.`networks` (
270270
`specify_ip_ranges` int(1) unsigned NOT NULL DEFAULT 0 COMMENT 'true if the network provides an ability to define ip ranges',
271271
`vpc_id` bigint unsigned COMMENT 'vpc this network belongs to',
272272
PRIMARY KEY (`id`),
273-
CONSTRAINT `fk_networks__network_offering_id` FOREIGN KEY (`network_offering_id`) REFERENCES `network_offerings`(`id`),
273+
CONSTRAINT `fk_networks__network_offering_id` FOREIGN KEY (`network_offering_id`) REFERENCES `network_offerings`(`id`),
274274
CONSTRAINT `fk_networks__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE,
275275
CONSTRAINT `fk_networks__related` FOREIGN KEY(`related`) REFERENCES `networks`(`id`) ON DELETE CASCADE,
276276
CONSTRAINT `fk_networks__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`),
277277
CONSTRAINT `fk_networks__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`),
278278
CONSTRAINT `fk_networks__vpc_id` FOREIGN KEY(`vpc_id`) REFERENCES `vpc`(`id`),
279279
CONSTRAINT `uc_networks__uuid` UNIQUE (`uuid`),
280-
INDEX `i_networks__removed`(`removed`)
280+
INDEX `i_networks__removed`(`removed`)
281281
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
282282

283283
CREATE TABLE `cloud`.`account_network_ref` (
@@ -301,7 +301,7 @@ CREATE TABLE `cloud`.`nics` (
301301
`ip_type` varchar(32) COMMENT 'type of ip',
302302
`broadcast_uri` varchar(255) COMMENT 'broadcast uri',
303303
`network_id` bigint unsigned NOT NULL COMMENT 'network configuration id',
304-
`mode` varchar(32) COMMENT 'mode of getting ip address',
304+
`mode` varchar(32) COMMENT 'mode of getting ip address',
305305
`state` varchar(32) NOT NULL COMMENT 'state of the creation',
306306
`strategy` varchar(32) NOT NULL COMMENT 'reservation strategy',
307307
`reserver_name` varchar(255) COMMENT 'Name of the component that reserved the ip address',
@@ -431,11 +431,11 @@ CREATE TABLE `cloud`.`op_ha_work` (
431431
`time_to_try` bigint COMMENT 'time to try do this work',
432432
`updated` bigint unsigned NOT NULL COMMENT 'time the VM state was updated when it was stored into work queue',
433433
PRIMARY KEY (`id`),
434-
CONSTRAINT `fk_op_ha_work__instance_id` FOREIGN KEY `fk_op_ha_work__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE,
434+
CONSTRAINT `fk_op_ha_work__instance_id` FOREIGN KEY `fk_op_ha_work__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE,
435435
INDEX `i_op_ha_work__instance_id`(`instance_id`),
436436
CONSTRAINT `fk_op_ha_work__host_id` FOREIGN KEY `fk_op_ha_work__host_id` (`host_id`) REFERENCES `host` (`id`),
437-
INDEX `i_op_ha_work__host_id`(`host_id`),
438-
INDEX `i_op_ha_work__step`(`step`),
437+
INDEX `i_op_ha_work__host_id`(`host_id`),
438+
INDEX `i_op_ha_work__step`(`step`),
439439
INDEX `i_op_ha_work__type`(`type`),
440440
CONSTRAINT `fk_op_ha_work__mgmt_server_id` FOREIGN KEY `fk_op_ha_work__mgmt_server_id`(`mgmt_server_id`) REFERENCES `mshost`(`msid`),
441441
INDEX `i_op_ha_work__mgmt_server_id`(`mgmt_server_id`)
@@ -682,7 +682,7 @@ CREATE TABLE `cloud`.`host_pod_ref` (
682682
`gateway` varchar(255) NOT NULL COMMENT 'gateway for the pod',
683683
`cidr_address` varchar(15) NOT NULL COMMENT 'CIDR address for the pod',
684684
`cidr_size` bigint unsigned NOT NULL COMMENT 'CIDR size for the pod',
685-
`description` varchar(255) COMMENT 'store private ip range in startIP-endIP format',
685+
`description` varchar(255) COMMENT 'store private ip range in startIP-endIP format',
686686
`allocation_state` varchar(32) NOT NULL DEFAULT 'Enabled' COMMENT 'Is this Pod enabled for allocation for new resources',
687687
`external_dhcp` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this Pod using external DHCP',
688688
`removed` datetime COMMENT 'date removed if not null',
@@ -692,13 +692,13 @@ CREATE TABLE `cloud`.`host_pod_ref` (
692692
INDEX `i_host_pod_ref__allocation_state`(`allocation_state`),
693693
INDEX `i_host_pod_ref__removed`(`removed`),
694694
CONSTRAINT `uc_host_pod_ref__uuid` UNIQUE (`uuid`)
695-
695+
696696
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
697697

698698
CREATE TABLE `cloud`.`op_dc_vnet_alloc` (
699699
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary id',
700700
`vnet` varchar(18) NOT NULL COMMENT 'vnet',
701-
`physical_network_id` bigint unsigned NOT NULL COMMENT 'physical network the vnet belongs to',
701+
`physical_network_id` bigint unsigned NOT NULL COMMENT 'physical network the vnet belongs to',
702702
`data_center_id` bigint unsigned NOT NULL COMMENT 'data center the vnet belongs to',
703703
`reservation_id` char(40) NULL COMMENT 'reservation id',
704704
`account_id` bigint unsigned NULL COMMENT 'account the vnet belongs to right now',
@@ -812,7 +812,7 @@ CREATE TABLE `cloud`.`port_forwarding_rules` (
812812
CREATE TABLE `cloud`.`host` (
813813
`id` bigint unsigned NOT NULL auto_increment,
814814
`name` varchar(255) NOT NULL,
815-
`uuid` varchar(40) COMMENT 'this uuid is different with guid below, the later one is used by hypervisor resource',
815+
`uuid` varchar(40) COMMENT 'this uuid is different with guid below, the later one is used by hypervisor resource',
816816
`status` varchar(32) NOT NULL,
817817
`type` varchar(32) NOT NULL,
818818
`private_ip_address` char(40) NOT NULL,
@@ -869,7 +869,7 @@ CREATE TABLE `cloud`.`op_host` (
869869
`id` bigint unsigned NOT NULL UNIQUE COMMENT 'host id',
870870
`sequence` bigint unsigned DEFAULT 1 NOT NULL COMMENT 'sequence for the host communication',
871871
PRIMARY KEY (`id`),
872-
CONSTRAINT `fk_op_host__id` FOREIGN KEY (`id`) REFERENCES `host`(`id`) ON DELETE CASCADE
872+
CONSTRAINT `fk_op_host__id` FOREIGN KEY (`id`) REFERENCES `host`(`id`) ON DELETE CASCADE
873873
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
874874

875875
CREATE TABLE `cloud`.`account_details` (
@@ -915,7 +915,7 @@ CREATE TABLE `cloud`.`mshost_peer` (
915915
`peer_runid` bigint NOT NULL,
916916
`peer_state` varchar(10) NOT NULL DEFAULT 'Down',
917917
`last_update` DATETIME NULL COMMENT 'Last record update time',
918-
918+
919919
PRIMARY KEY (`id`),
920920
CONSTRAINT `fk_mshost_peer__owner_mshost` FOREIGN KEY (`owner_mshost`) REFERENCES `mshost`(`id`) ON DELETE CASCADE,
921921
CONSTRAINT `fk_mshost_peer__peer_mshost` FOREIGN KEY (`peer_mshost`) REFERENCES `mshost`(`id`),
@@ -965,7 +965,7 @@ CREATE TABLE `cloud`.`event` (
965965
`description` varchar(1024) NOT NULL,
966966
`user_id` bigint unsigned NOT NULL,
967967
`account_id` bigint unsigned NOT NULL,
968-
`domain_id` bigint unsigned NOT NULL,
968+
`domain_id` bigint unsigned NOT NULL,
969969
`created` datetime NOT NULL,
970970
`level` varchar(16) NOT NULL,
971971
`start_id` bigint unsigned NOT NULL DEFAULT 0,
@@ -1046,7 +1046,7 @@ CREATE TABLE `cloud`.`vm_template` (
10461046
`hvm` int(1) unsigned NOT NULL COMMENT 'requires HVM',
10471047
`bits` int(6) unsigned NOT NULL COMMENT '32 bit or 64 bit',
10481048
`url` varchar(255) NULL COMMENT 'the url where the template exists externally',
1049-
`format` varchar(32) NOT NULL COMMENT 'format for the template',
1049+
`format` varchar(32) NOT NULL COMMENT 'format for the template',
10501050
`created` datetime NOT NULL COMMENT 'Date created',
10511051
`removed` datetime COMMENT 'Date removed if not null',
10521052
`account_id` bigint unsigned NOT NULL COMMENT 'id of the account that created this template',
@@ -1153,7 +1153,7 @@ CREATE TABLE `cloud`.`domain_router` (
11531153
`public_ip_address` char(40) COMMENT 'public ip address used for source net',
11541154
`public_netmask` varchar(15) COMMENT 'netmask used for the domR',
11551155
`guest_netmask` varchar(15) COMMENT 'netmask used for the guest network',
1156-
`guest_ip_address` char(40) COMMENT ' ip address in the guest network',
1156+
`guest_ip_address` char(40) COMMENT ' ip address in the guest network',
11571157
`is_redundant_router` int(1) unsigned NOT NULL COMMENT 'if in redundant router mode',
11581158
`priority` int(4) unsigned COMMENT 'priority of router in the redundant router mode',
11591159
`is_priority_bumpup` int(1) unsigned NOT NULL COMMENT 'if the priority has been bumped up',
@@ -1230,7 +1230,7 @@ CREATE TABLE `cloud`.`volume_host_ref` (
12301230
`local_path` varchar(255),
12311231
`install_path` varchar(255),
12321232
`url` varchar(255),
1233-
`format` varchar(32) NOT NULL COMMENT 'format for the volume',
1233+
`format` varchar(32) NOT NULL COMMENT 'format for the volume',
12341234
`destroyed` tinyint(1) COMMENT 'indicates whether the volume_host entry was destroyed by the user or not',
12351235
PRIMARY KEY (`id`),
12361236
CONSTRAINT `fk_volume_host_ref__host_id` FOREIGN KEY `fk_volume_host_ref__host_id` (`host_id`) REFERENCES `host` (`id`) ON DELETE CASCADE,
@@ -1330,9 +1330,9 @@ CREATE TABLE `cloud`.`account` (
13301330
INDEX i_account__removed(`removed`),
13311331
CONSTRAINT `fk_account__default_zone_id` FOREIGN KEY `fk_account__default_zone_id`(`default_zone_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE,
13321332
INDEX `i_account__cleanup_needed`(`cleanup_needed`),
1333-
INDEX `i_account__account_name__domain_id__removed`(`account_name`, `domain_id`, `removed`),
1333+
INDEX `i_account__account_name__domain_id__removed`(`account_name`, `domain_id`, `removed`),
13341334
CONSTRAINT `fk_account__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain` (`id`),
1335-
INDEX `i_account__domain_id`(`domain_id`),
1335+
INDEX `i_account__domain_id`(`domain_id`),
13361336
CONSTRAINT `uc_account__uuid` UNIQUE (`uuid`)
13371337
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
13381338

@@ -1380,7 +1380,7 @@ CREATE TABLE `cloud`.`op_host_capacity` (
13801380
INDEX `i_op_host_capacity__host_type`(`host_id`, `capacity_type`),
13811381
INDEX `i_op_host_capacity__pod_id`(`pod_id`),
13821382
INDEX `i_op_host_capacity__data_center_id`(`data_center_id`),
1383-
INDEX `i_op_host_capacity__cluster_id`(`cluster_id`)
1383+
INDEX `i_op_host_capacity__cluster_id`(`cluster_id`)
13841384
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
13851385

13861386
CREATE TABLE `cloud`.`alert` (
@@ -1404,7 +1404,7 @@ CREATE TABLE `cloud`.`async_job` (
14041404
`user_id` bigint unsigned NOT NULL,
14051405
`account_id` bigint unsigned NOT NULL,
14061406
`session_key` varchar(64) COMMENT 'all async-job manage to apply session based security enforcement',
1407-
`instance_type` varchar(64) COMMENT 'instance_type and instance_id work together to allow attaching an instance object to a job',
1407+
`instance_type` varchar(64) COMMENT 'instance_type and instance_id work together to allow attaching an instance object to a job',
14081408
`instance_id` bigint unsigned,
14091409
`job_cmd` varchar(64) NOT NULL COMMENT 'command name',
14101410
`job_cmd_originator` varchar(64) COMMENT 'command originator',
@@ -1437,7 +1437,7 @@ CREATE TABLE `cloud`.`async_job` (
14371437

14381438
CREATE TABLE `cloud`.`sync_queue` (
14391439
`id` bigint unsigned NOT NULL auto_increment,
1440-
`sync_objtype` varchar(64) NOT NULL,
1440+
`sync_objtype` varchar(64) NOT NULL,
14411441
`sync_objid` bigint unsigned NOT NULL,
14421442
`queue_proc_msid` bigint,
14431443
`queue_proc_number` bigint COMMENT 'process number, increase 1 for each iteration',
@@ -1815,7 +1815,7 @@ CREATE TABLE `cloud`.`instance_group` (
18151815
`created` datetime COMMENT 'date the group was created',
18161816
PRIMARY KEY (`id`),
18171817
INDEX `i_instance_group__removed`(`removed`),
1818-
CONSTRAINT `uc_instance_group__uuid` UNIQUE (`uuid`),
1818+
CONSTRAINT `uc_instance_group__uuid` UNIQUE (`uuid`),
18191819
CONSTRAINT `fk_instance_group__account_id` FOREIGN KEY(`account_id`) REFERENCES `account` (`id`)
18201820
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
18211821

@@ -1850,7 +1850,7 @@ CREATE TABLE `cloud`.`usage_event` (
18501850
`resource_name` varchar(255),
18511851
`offering_id` bigint unsigned,
18521852
`template_id` bigint unsigned,
1853-
`size` bigint unsigned,
1853+
`size` bigint unsigned,
18541854
`resource_type` varchar(32),
18551855
`processed` tinyint NOT NULL default '0',
18561856
PRIMARY KEY (`id`),
@@ -2055,17 +2055,17 @@ CREATE TABLE `cloud`.`physical_network` (
20552055
`name` varchar(255) NOT NULL,
20562056
`data_center_id` bigint unsigned NOT NULL COMMENT 'data center id that this physical network belongs to',
20572057
`vnet` varchar(255),
2058-
`speed` varchar(32),
2058+
`speed` varchar(32),
20592059
`domain_id` bigint unsigned COMMENT 'foreign key to domain id',
2060-
`broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'POD' COMMENT 'range of broadcast domain : POD/ZONE',
2060+
`broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'POD' COMMENT 'range of broadcast domain : POD/ZONE',
20612061
`state` varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'what state is this configuration in',
20622062
`created` datetime COMMENT 'date created',
20632063
`removed` datetime COMMENT 'date removed if not null',
20642064
PRIMARY KEY (`id`),
20652065
CONSTRAINT `fk_physical_network__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE,
20662066
CONSTRAINT `fk_physical_network__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`),
20672067
CONSTRAINT `uc_physical_networks__uuid` UNIQUE (`uuid`),
2068-
INDEX `i_physical_network__removed`(`removed`)
2068+
INDEX `i_physical_network__removed`(`removed`)
20692069
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
20702070

20712071
CREATE TABLE `cloud`.`physical_network_tags` (
@@ -2091,7 +2091,7 @@ CREATE TABLE `cloud`.`physical_network_traffic_types` (
20912091
`uuid` varchar(40),
20922092
`physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network',
20932093
`traffic_type` varchar(32) NOT NULL COMMENT 'type of traffic going through this network',
2094-
`xenserver_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a XenServer host',
2094+
`xen_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a XenServer host',
20952095
`kvm_network_label` varchar(255) DEFAULT 'cloudbr0' COMMENT 'The network name label of the physical device dedicated to this traffic on a KVM host',
20962096
`vmware_network_label` varchar(255) DEFAULT 'vSwitch0' COMMENT 'The network name label of the physical device dedicated to this traffic on a VMware host',
20972097
`simulator_network_label` varchar(255) COMMENT 'The name labels needed for identifying the simulator',
@@ -2333,7 +2333,7 @@ CREATE TABLE `cloud`.`vpc` (
23332333
PRIMARY KEY (`id`),
23342334
INDEX `i_vpc__removed`(`removed`),
23352335
CONSTRAINT `fk_vpc__zone_id` FOREIGN KEY `fk_vpc__zone_id` (`zone_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE,
2336-
CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`) REFERENCES `vpc_offerings`(`id`),
2336+
CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`) REFERENCES `vpc_offerings`(`id`),
23372337
CONSTRAINT `fk_vpc__account_id` FOREIGN KEY `fk_vpc__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE,
23382338
CONSTRAINT `fk_vpc__domain_id` FOREIGN KEY `fk_vpc__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE
23392339
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -2423,7 +2423,7 @@ CREATE TABLE `cloud`.`static_routes` (
24232423
`id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
24242424
`uuid` varchar(40),
24252425
`vpc_gateway_id` bigint unsigned COMMENT 'id of the corresponding ip address',
2426-
`cidr` varchar(18) COMMENT 'cidr for the static route',
2426+
`cidr` varchar(18) COMMENT 'cidr for the static route',
24272427
`state` char(32) NOT NULL COMMENT 'current state of this rule',
24282428
`vpc_id` bigint unsigned COMMENT 'vpc the firewall rule is associated with',
24292429
`account_id` bigint unsigned NOT NULL COMMENT 'owner id',

‎setup/db/db/schema-440to450.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,4 @@ CREATE VIEW `cloud`.`volume_view` AS
233233
and async_job.job_status = 0;
234234

235235
/* As part of the separation of Xen and XenServer, update the column for the network labels */
236-
ALTER TABLE `cloud`.`physical_network_traffic_types` CHANGE `xen_network_label` `xenserver_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a XenServer host'
236+
ALTER TABLE `cloud`.`physical_network_traffic_types` CHANGE `xen_network_label` `xenserver_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a XenServer host';

0 commit comments

Comments
 (0)