Skip to content

Commit f2ae6dc

Browse files
yadvryadvr
committed
db: Remove and merge 4.1-new-db-schema.sql to schema-40to410.sql
Signed-off-by: Rohit Yadav <[email protected]>
1 parent 46ab973 commit f2ae6dc

4 files changed

Lines changed: 126 additions & 147 deletions

File tree

‎developer/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@
159159
<argument>${basedir}/target/db/create-schema-premium.sql</argument>
160160
<!-- Create schema view -->
161161
<argument>${basedir}/target/db/create-schema-view.sql</argument>
162-
<!-- Create any new db schema -->
163-
<argument>${basedir}/target/db/4.1-new-db-schema.sql</argument>
164162
<!-- Seed templates -->
165163
<argument>${basedir}/target/db/templates.sql</argument>
166164
<!-- Run cloudbridge related sqls -->
@@ -193,7 +191,5 @@
193191
</plugins>
194192
</build>
195193
</profile>
196-
197-
198194
</profiles>
199195
</project>

‎setup/bindir/cloud-setup-databases.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ for full help
211211
""),
212212
)
213213

214-
for f in ["create-database","create-schema", "create-database-premium","create-schema-premium", "create-schema-view", "4.1-new-db-schema"]:
214+
for f in ["create-database","create-schema", "create-database-premium","create-schema-premium", "create-schema-view"]:
215215
p = os.path.join(self.dbFilesPath,"%s.sql"%f)
216216
if not os.path.exists(p): continue
217217
text = file(p).read()

‎setup/db/4.1-new-db-schema.sql‎

Lines changed: 0 additions & 142 deletions
This file was deleted.

‎setup/db/db/schema-40to410.sql‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,131 @@
1919
-- Schema upgrade from 4.0.0 to 4.1.0;
2020
--;
2121

22+
use cloud;
23+
24+
alter table vm_template add image_data_store_id bigint unsigned;
25+
alter table vm_template add size bigint unsigned;
26+
alter table vm_template add state varchar(255);
27+
alter table vm_template add update_count bigint unsigned;
28+
alter table vm_template add updated datetime;
29+
alter table storage_pool add storage_provider_id bigint unsigned;
30+
alter table storage_pool add scope varchar(255);
31+
alter table storage_pool modify id bigint unsigned AUTO_INCREMENT UNIQUE NOT NULL;
32+
alter table template_spool_ref add state varchar(255);
33+
alter table template_spool_ref add update_count bigint unsigned;
34+
alter table volumes add disk_type varchar(255);
35+
alter table volumes drop foreign key `fk_volumes__account_id`;
36+
alter table vm_instance add column disk_offering_id bigint unsigned;
37+
alter table vm_instance add column cpu int(10) unsigned;
38+
alter table vm_instance add column ram bigint unsigned;
39+
alter table vm_instance add column owner varchar(255);
40+
alter table vm_instance add column speed int(10) unsigned;
41+
alter table vm_instance add column host_name varchar(255);
42+
alter table vm_instance add column display_name varchar(255);
43+
44+
alter table data_center add column owner varchar(255);
45+
alter table data_center add column created datetime COMMENT 'date created';
46+
alter table data_center add column lastUpdated datetime COMMENT 'last updated';
47+
alter table data_center add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone';
48+
alter table host_pod_ref add column owner varchar(255);
49+
alter table host_pod_ref add column created datetime COMMENT 'date created';
50+
alter table host_pod_ref add column lastUpdated datetime COMMENT 'last updated';
51+
alter table host_pod_ref add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone';
52+
alter table host add column owner varchar(255);
53+
alter table host add column lastUpdated datetime COMMENT 'last updated';
54+
alter table host add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone';
55+
56+
alter table cluster add column owner varchar(255);
57+
alter table cluster add column created datetime COMMENT 'date created';
58+
alter table cluster add column lastUpdated datetime COMMENT 'last updated';
59+
alter table cluster add column engine_state varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'the engine state of the zone';
60+
CREATE TABLE `cloud`.`object_datastore_ref` (
61+
`id` bigint unsigned NOT NULL auto_increment,
62+
`datastore_id` bigint unsigned NOT NULL,
63+
`datastore_role` varchar(255) NOT NULL,
64+
`object_id` bigint unsigned NOT NULL,
65+
`object_type` varchar(255) NOT NULL,
66+
`created` DATETIME NOT NULL,
67+
`last_updated` DATETIME,
68+
`job_id` varchar(255),
69+
`download_pct` int(10) unsigned,
70+
`download_state` varchar(255),
71+
`error_str` varchar(255),
72+
`local_path` varchar(255),
73+
`install_path` varchar(255),
74+
`size` bigint unsigned COMMENT 'the size of the template on the pool',
75+
`state` varchar(255) NOT NULL,
76+
`update_count` bigint unsigned NOT NULL,
77+
`updated` DATETIME,
78+
PRIMARY KEY (`id`)
79+
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
80+
81+
CREATE TABLE `cloud`.`data_store_provider` (
82+
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
83+
`name` varchar(255) NOT NULL COMMENT 'name of primary data store provider',
84+
`uuid` varchar(255) NOT NULL COMMENT 'uuid of primary data store provider',
85+
PRIMARY KEY(`id`)
86+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
87+
88+
CREATE TABLE `cloud`.`image_data_store` (
89+
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
90+
`name` varchar(255) NOT NULL COMMENT 'name of data store',
91+
`image_provider_id` bigint unsigned NOT NULL COMMENT 'id of image_data_store_provider',
92+
`protocol` varchar(255) NOT NULL COMMENT 'protocol of data store',
93+
`data_center_id` bigint unsigned COMMENT 'datacenter id of data store',
94+
`scope` varchar(255) COMMENT 'scope of data store',
95+
`uuid` varchar(255) COMMENT 'uuid of data store',
96+
PRIMARY KEY(`id`),
97+
CONSTRAINT `fk_tags__image_data_store_provider_id` FOREIGN KEY(`image_provider_id`) REFERENCES `data_store_provider`(`id`)
98+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
99+
100+
CREATE TABLE `cloud`.`vm_compute_tags` (
101+
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
102+
`vm_id` bigint unsigned NOT NULL COMMENT 'vm id',
103+
`compute_tag` varchar(255) NOT NULL COMMENT 'name of tag',
104+
PRIMARY KEY(`id`)
105+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
106+
107+
CREATE TABLE `cloud`.`vm_root_disk_tags` (
108+
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
109+
`vm_id` bigint unsigned NOT NULL COMMENT 'vm id',
110+
`root_disk_tag` varchar(255) NOT NULL COMMENT 'name of tag',
111+
PRIMARY KEY(`id`)
112+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
113+
114+
115+
CREATE TABLE `cloud`.`vm_network_map` (
116+
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
117+
`vm_id` bigint unsigned NOT NULL COMMENT 'vm id',
118+
`network_id` bigint unsigned NOT NULL COMMENT 'network id',
119+
PRIMARY KEY(`id`)
120+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
121+
122+
123+
CREATE TABLE `cloud`.`vm_reservation` (
124+
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
125+
`uuid` varchar(40) NOT NULL COMMENT 'reservation id',
126+
`vm_id` bigint unsigned NOT NULL COMMENT 'vm id',
127+
`data_center_id` bigint unsigned NOT NULL COMMENT 'zone id',
128+
`pod_id` bigint unsigned NOT NULL COMMENT 'pod id',
129+
`cluster_id` bigint unsigned NOT NULL COMMENT 'cluster id',
130+
`host_id` bigint unsigned NOT NULL COMMENT 'host id',
131+
`created` datetime COMMENT 'date created',
132+
`removed` datetime COMMENT 'date removed if not null',
133+
CONSTRAINT `uc_vm_reservation__uuid` UNIQUE (`uuid`),
134+
PRIMARY KEY(`id`)
135+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
136+
137+
CREATE TABLE `cloud`.`volume_reservation` (
138+
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
139+
`vm_reservation_id` bigint unsigned NOT NULL COMMENT 'id of the vm reservation',
140+
`vm_id` bigint unsigned NOT NULL COMMENT 'vm id',
141+
`volume_id` bigint unsigned NOT NULL COMMENT 'volume id',
142+
`pool_id` bigint unsigned NOT NULL COMMENT 'pool assigned to the volume',
143+
CONSTRAINT `fk_vm_pool_reservation__vm_reservation_id` FOREIGN KEY (`vm_reservation_id`) REFERENCES `vm_reservation`(`id`) ON DELETE CASCADE,
144+
PRIMARY KEY(`id`)
145+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
146+
22147
CREATE TABLE `cloud`.`s3` (
23148
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
24149
`uuid` varchar(40),

0 commit comments

Comments
 (0)