This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 9f1577d2a8d pre-commit: check more file types for trailing whitespace
(#9352)
9f1577d2a8d is described below
commit 9f1577d2a8dc4b26789e439961a1e0e5e13a33cf
Author: John Bampton <jbamp...@users.noreply.github.com>
AuthorDate: Wed Jul 10 17:22:02 2024 +1000
pre-commit: check more file types for trailing whitespace (#9352)
---
.pre-commit-config.yaml | 3 +-
build/replace.properties | 4 +-
.../main/resources/META-INF/db/data-217to218.sql | 4 +-
.../main/resources/META-INF/db/schema-20to21.sql | 12 +--
.../main/resources/META-INF/db/schema-217to218.sql | 4 +-
.../META-INF/db/schema-21to22-cleanup.sql | 4 +-
.../META-INF/db/schema-21to22-premium.sql | 6 +-
.../main/resources/META-INF/db/schema-21to22.sql | 28 +++----
.../resources/META-INF/db/schema-2210to2211.sql | 4 +-
.../META-INF/db/schema-2211to2212-premium.sql | 4 +-
.../resources/META-INF/db/schema-2211to2212.sql | 4 +-
.../resources/META-INF/db/schema-2212to2213.sql | 4 +-
.../resources/META-INF/db/schema-2213to2214.sql | 6 +-
.../META-INF/db/schema-2214to30-cleanup.sql | 6 +-
.../main/resources/META-INF/db/schema-2214to30.sql | 76 +++++++++----------
.../META-INF/db/schema-221to222-cleanup.sql | 4 +-
.../META-INF/db/schema-221to222-premium.sql | 4 +-
.../main/resources/META-INF/db/schema-221to222.sql | 6 +-
.../META-INF/db/schema-222to224-cleanup.sql | 4 +-
.../META-INF/db/schema-222to224-premium.sql | 4 +-
.../main/resources/META-INF/db/schema-222to224.sql | 10 +--
.../META-INF/db/schema-224to225-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-224to225.sql | 4 +-
.../main/resources/META-INF/db/schema-225to226.sql | 4 +-
.../META-INF/db/schema-227to228-premium.sql | 4 +-
.../main/resources/META-INF/db/schema-227to228.sql | 8 +-
.../main/resources/META-INF/db/schema-228to229.sql | 4 +-
.../resources/META-INF/db/schema-229to2210.sql | 4 +-
.../META-INF/db/schema-22beta1to22beta2.sql | 4 +-
.../META-INF/db/schema-22beta3to22beta4.sql | 12 +--
.../META-INF/db/schema-301to302-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-301to302.sql | 6 +-
.../main/resources/META-INF/db/schema-302to303.sql | 6 +-
.../META-INF/db/schema-302to40-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-302to40.sql | 18 ++---
.../META-INF/db/schema-304to305-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-304to305.sql | 8 +-
.../META-INF/db/schema-305to306-cleanup.sql | 4 +-
.../main/resources/META-INF/db/schema-305to306.sql | 4 +-
.../main/resources/META-INF/db/schema-306to307.sql | 4 +-
.../main/resources/META-INF/db/schema-307to410.sql | 12 +--
.../main/resources/META-INF/db/schema-30to301.sql | 4 +-
.../main/resources/META-INF/db/schema-40to410.sql | 56 +++++++-------
.../main/resources/META-INF/db/schema-410to420.sql | 88 +++++++++++-----------
.../resources/META-INF/db/schema-41310to41400.sql | 2 +-
.../main/resources/META-INF/db/schema-420to421.sql | 4 +-
.../main/resources/META-INF/db/schema-442to450.sql | 4 +-
.../META-INF/db/schema-481to490-cleanup.sql | 2 +-
.../main/resources/META-INF/db/schema-481to490.sql | 16 ++--
.../resources/META-INF/db/schema-4930to41000.sql | 4 +-
.../main/resources/META-INF/db/schema-level.sql | 4 +-
.../META-INF/db/schema-snapshot-217to224.sql | 4 +-
.../META-INF/db/schema-snapshot-223to224.sql | 4 +-
packaging/centos7/replace.properties | 4 +-
packaging/centos8/replace.properties | 4 +-
packaging/debian/replace.properties | 4 +-
services/console-proxy/rdpconsole/README.txt | 2 +-
setup/db/22beta4to22GA.sql | 8 +-
setup/db/create-database-premium.sql | 4 +-
setup/db/create-database-simulator.sql | 4 +-
setup/db/create-database.sql | 14 ++--
setup/db/create-schema-premium.sql | 10 +--
setup/db/create-schema-simulator.sql | 4 +-
setup/db/data-20to21.sql | 8 +-
setup/db/data-22beta1to22beta2.sql | 4 +-
setup/db/index-20to21.sql | 4 +-
setup/db/index-212to213.sql | 4 +-
setup/db/postprocess-20to21.sql | 4 +-
setup/db/server-setup.sql | 4 +-
setup/db/templates.simulator.sql | 4 +-
setup/db/templates.sql | 4 +-
test/conf/deploy.properties | 4 +-
test/conf/log4j-stdout.properties | 4 +-
test/conf/log4j.properties | 4 +-
test/conf/tool.properties | 4 +-
test/metadata/func/error_events.properties | 4 +-
test/metadata/func/regression_events.properties | 4 +-
test/scripts/usercloud.properties | 4 +-
tools/devcloud-kvm/devcloud-kvm.sql | 4 +-
tools/devcloud-kvm/kvm.properties | 4 +-
tools/devcloud4/prefill.sql | 4 +-
tools/marvin/CHANGES.txt | 4 +-
tools/marvin/DISCLAIMER.txt | 12 +--
tools/marvin/marvin/misc/build/kvm.properties | 4 +-
tools/marvin/marvin/misc/build/xen.properties | 4 +-
.../marvin/sandbox/advanced/setup.properties | 4 +-
.../marvin/sandbox/advancedsg/setup.properties | 4 +-
tools/marvin/marvin/sandbox/basic/setup.properties | 4 +-
.../demo/simulator/simulatordemo.properties | 4 +-
tools/transifex/README-transifex.txt | 4 +-
90 files changed, 347 insertions(+), 346 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 51ad34f2dbe..8736e5bac94 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -59,8 +59,9 @@ repos:
- id: mixed-line-ending
exclude: \.(cs|xml)$
- id: trailing-whitespace
- files: \.(in|java|md|py|rb|sh|vue|yaml|yml)$
+ files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|yaml|yml)$
args: [--markdown-linebreak-ext=md]
+ exclude:
^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
- repo: https://github.com/pycqa/flake8
rev: 7.0.0
hooks:
diff --git a/build/replace.properties b/build/replace.properties
index 3d9a4597060..ce38727b80a 100644
--- a/build/replace.properties
+++ b/build/replace.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/data-217to218.sql
b/engine/schema/src/main/resources/META-INF/db/data-217to218.sql
index 5c1253143f4..1a03e9b7998 100755
--- a/engine/schema/src/main/resources/META-INF/db/data-217to218.sql
+++ b/engine/schema/src/main/resources/META-INF/db/data-217to218.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql
b/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql
index 7013046ca43..000d0f077cc 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-20to21.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -141,14 +141,14 @@ ALTER TABLE `cloud`.`host` ADD COLUMN `cluster_id` bigint
unsigned;
--
-- enforced in postporcess-20to21.sql
-ALTER TABLE `cloud`.`host_pod_ref` ADD COLUMN `gateway` varchar(255); -- need
to migrage data with user input
+ALTER TABLE `cloud`.`host_pod_ref` ADD COLUMN `gateway` varchar(255); -- need
to migrage data with user input
-ALTER TABLE `cloud`.`service_offering` ADD COLUMN `recreatable` tinyint(1)
unsigned NOT NULL DEFAULT 0;
+ALTER TABLE `cloud`.`service_offering` ADD COLUMN `recreatable` tinyint(1)
unsigned NOT NULL DEFAULT 0;
ALTER TABLE `cloud`.`service_offering` ADD COLUMN `tags` varchar(255);
-ALTER TABLE `cloud`.`user_vm` MODIFY COLUMN `domain_router_id` bigint
unsigned; -- change from NOT NULL to NULL
+ALTER TABLE `cloud`.`user_vm` MODIFY COLUMN `domain_router_id` bigint
unsigned; -- change from NOT NULL to NULL
-ALTER TABLE `cloud`.`event` ADD COLUMN `state` varchar(32) NOT NULL DEFAULT
'Completed';
+ALTER TABLE `cloud`.`event` ADD COLUMN `state` varchar(32) NOT NULL DEFAULT
'Completed';
ALTER TABLE `cloud`.`event` ADD COLUMN `start_id` bigint unsigned NOT NULL
DEFAULT 0;
ALTER TABLE `cloud`.`disk_offering` ADD COLUMN `tags` varchar(4096);
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-217to218.sql
b/engine/schema/src/main/resources/META-INF/db/schema-217to218.sql
index f2b6b291f78..006a3f1cd7b 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-217to218.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-217to218.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql
index c8757833fab..8a3ca39d5e7 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql
b/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql
index 45202840565..a34b65dc8ab 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -50,7 +50,7 @@ CREATE TABLE `cloud_usage`.`usage_event` (
`resource_name` varchar(255),
`offering_id` bigint unsigned,
`template_id` bigint unsigned,
- `size` bigint unsigned,
+ `size` bigint unsigned,
`processed` tinyint NOT NULL default '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql
b/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql
index eb473cfc7f6..8da29caae53 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-21to22.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,7 +22,7 @@ ALTER TABLE `cloud`.`cluster` ADD COLUMN `guid` varchar(255)
UNIQUE DEFAULT NULL
ALTER TABLE `cloud`.`cluster` ADD COLUMN `cluster_type` varchar(64) DEFAULT
'CloudManaged';
ALTER TABLE `cloud`.`vm_template` ADD COLUMN `hypervisor_type` varchar(32)
COMMENT 'hypervisor that the template is belonged to';
ALTER TABLE `cloud`.`vm_template` ADD COLUMN `extractable` int(1) unsigned NOT
NULL default 0 COMMENT 'Is this template extractable';
-ALTER TABLE `cloud`.`template_spool_ref` ADD CONSTRAINT
`fk_template_spool_ref__template_id` FOREIGN KEY (`template_id`) REFERENCES
`vm_template`(`id`);
+ALTER TABLE `cloud`.`template_spool_ref` ADD CONSTRAINT
`fk_template_spool_ref__template_id` FOREIGN KEY (`template_id`) REFERENCES
`vm_template`(`id`);
ALTER TABLE `cloud`.`guest_os` modify `name` varchar(255) ;
@@ -104,7 +104,7 @@ CREATE TABLE `cloud`.`networks` (
`broadcast_domain_type` varchar(32) NOT NULL COMMENT 'type of broadcast
domain used',
`broadcast_uri` varchar(255) COMMENT 'broadcast domain specifier',
`gateway` varchar(15) COMMENT 'gateway for this network configuration',
- `cidr` varchar(18) COMMENT 'network cidr',
+ `cidr` varchar(18) COMMENT 'network cidr',
`mode` varchar(32) COMMENT 'How to retrieve ip address in this network',
`network_offering_id` bigint unsigned NOT NULL COMMENT 'network offering id
that this configuration is created from',
`data_center_id` bigint unsigned NOT NULL COMMENT 'data center id that this
configuration is used in',
@@ -167,7 +167,7 @@ CREATE TABLE `cloud`.`nics` (
`ip_type` varchar(32) COMMENT 'type of ip',
`broadcast_uri` varchar(255) COMMENT 'broadcast uri',
`network_id` bigint unsigned NOT NULL COMMENT 'network configuration id',
- `mode` varchar(32) COMMENT 'mode of getting ip address',
+ `mode` varchar(32) COMMENT 'mode of getting ip address',
`state` varchar(32) NOT NULL COMMENT 'state of the creation',
`strategy` varchar(32) NOT NULL COMMENT 'reservation strategy',
`reserver_name` varchar(255) COMMENT 'Name of the component that reserved
the ip address',
@@ -176,7 +176,7 @@ CREATE TABLE `cloud`.`nics` (
`update_time` timestamp NOT NULL COMMENT 'time the state was changed',
`isolation_uri` varchar(255) COMMENT 'id for isolation',
`ip6_address` char(40) COMMENT 'ip6 address',
- `default_nic` tinyint NOT NULL COMMENT "None",
+ `default_nic` tinyint NOT NULL COMMENT "None",
`created` datetime NOT NULL COMMENT 'date created',
`removed` datetime COMMENT 'date removed if not null',
PRIMARY KEY (`id`),
@@ -253,7 +253,7 @@ CREATE TABLE `cloud`.`op_host` (
`id` bigint unsigned NOT NULL UNIQUE COMMENT 'host id',
`sequence` bigint unsigned DEFAULT 1 NOT NULL COMMENT 'sequence for the host
communication',
PRIMARY KEY (`id`),
- CONSTRAINT `fk_op_host__id` FOREIGN KEY (`id`) REFERENCES `host`(`id`) ON
DELETE CASCADE
+ CONSTRAINT `fk_op_host__id` FOREIGN KEY (`id`) REFERENCES `host`(`id`) ON
DELETE CASCADE
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`guest_os_hypervisor` (
@@ -261,7 +261,7 @@ CREATE TABLE `cloud`.`guest_os_hypervisor` (
`hypervisor_type` varchar(32) NOT NULL,
`guest_os_name` varchar(255) NOT NULL,
`guest_os_id` bigint unsigned NOT NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
INSERT INTO op_host(id, sequence) select id, sequence from host;
@@ -269,7 +269,7 @@ INSERT INTO op_host(id, sequence) select id, sequence from
host;
-- Alter Tables to add Columns;
ALTER TABLE `cloud`.`cluster` ADD COLUMN `hypervisor_type` varchar(32);
-UPDATE `cloud`.`cluster` SET hypervisor_type=(SELECT DISTINCT
host.hypervisor_type from host where host.cluster_id = cluster.id GROUP BY
host.hypervisor_type);
+UPDATE `cloud`.`cluster` SET hypervisor_type=(SELECT DISTINCT
host.hypervisor_type from host where host.cluster_id = cluster.id GROUP BY
host.hypervisor_type);
ALTER TABLE `cloud`.`volumes` ADD COLUMN `attached` datetime;
UPDATE `cloud`.`volumes` SET attached=now() WHERE removed IS NULL AND
instance_id IS NOT NULL;
@@ -286,7 +286,7 @@ ALTER TABLE `cloud`.`vlan` ADD COLUMN `network_id` bigint
unsigned NOT NULL;
ALTER TABLE `cloud`.`data_center` ADD COLUMN `domain` varchar(100);
ALTER TABLE `cloud`.`data_center` ADD COLUMN `domain_id` bigint unsigned;
-ALTER TABLE `cloud`.`data_center` ADD COLUMN `networktype` varchar(255) NOT
NULL DEFAULT 'Basic';
+ALTER TABLE `cloud`.`data_center` ADD COLUMN `networktype` varchar(255) NOT
NULL DEFAULT 'Basic';
ALTER TABLE `cloud`.`data_center` ADD COLUMN `dns_provider` char(64) DEFAULT
'VirtualRouter';
ALTER TABLE `cloud`.`data_center` ADD COLUMN `gateway_provider` char(64)
DEFAULT 'VirtualRouter';
ALTER TABLE `cloud`.`data_center` ADD COLUMN `firewall_provider` char(64)
DEFAULT 'VirtualRouter';
@@ -306,7 +306,7 @@ UPDATE `cloud`.`op_dc_link_local_ip_address_alloc` SET
reservation_id=concat(cas
ALTER TABLE `cloud`.`host_pod_ref` ADD COLUMN `enabled` tinyint NOT NULL
DEFAULT 1;
ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD COLUMN `reservation_id` char(40)
NULL;
-UPDATE op_dc_vnet_alloc set reservation_id=concat(cast(data_center_id as
CHAR), concat("-", vnet)) WHERE taken is NOT NULL;
+UPDATE op_dc_vnet_alloc set reservation_id=concat(cast(data_center_id as
CHAR), concat("-", vnet)) WHERE taken is NOT NULL;
ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `service_offering_id` bigint
unsigned NOT NULL;
ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `reservation_id` char(40);
@@ -326,7 +326,7 @@ ALTER TABLE `cloud`.`user_vm` ADD COLUMN `display_name`
varchar(255);
UPDATE user_vm inner join vm_instance on user_vm.id=vm_instance.id set
user_vm.iso_id=vm_instance.iso_id,
user_vm.display_name=vm_instance.display_name where vm_instance.type='User';
ALTER TABLE `cloud`.`template_host_ref` ADD COLUMN `physical_size` bigint
unsigned DEFAULT 0;
-UPDATE template_host_ref INNER JOIN template_spool_ref ON
template_host_ref.template_id=template_spool_ref.template_id SET
template_host_ref.physical_size=template_spool_ref.template_size;
+UPDATE template_host_ref INNER JOIN template_spool_ref ON
template_host_ref.template_id=template_spool_ref.template_id SET
template_host_ref.physical_size=template_spool_ref.template_size;
CREATE TABLE `cloud`.`user_vm_details` (
@@ -412,7 +412,7 @@ CREATE TABLE `cloud`.`vpn_users` (
CONSTRAINT `fk_vpn_users__owner_id` FOREIGN KEY (`owner_id`) REFERENCES
`account`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_vpn_users__domain_id` FOREIGN KEY (`domain_id`) REFERENCES
`domain`(`id`) ON DELETE CASCADE,
INDEX `i_vpn_users_username`(`username`),
- UNIQUE `i_vpn_users__account_id__username`(`owner_id`, `username`)
+ UNIQUE `i_vpn_users__account_id__username`(`owner_id`, `username`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud`.`storage_pool` ADD COLUMN `status` varchar(32);
@@ -490,7 +490,7 @@ CREATE TABLE `cloud`.`usage_event` (
`resource_name` varchar(255),
`offering_id` bigint unsigned,
`template_id` bigint unsigned,
- `size` bigint unsigned,
+ `size` bigint unsigned,
`processed` tinyint NOT NULL default '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql
b/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql
index 01bec020d63..f352f5ef44d 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212-premium.sql
b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212-premium.sql
index 0cb187e2b9d..eae13acc78c 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212-premium.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212-premium.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql
b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql
index 94c3d75a29f..00d0fcaac76 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql
b/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql
index 2e86599f792..c69809e8205 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql
b/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql
index 6c0cc4b6c70..41e3944dc18 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,7 +29,7 @@ CREATE TABLE `cloud`.`mshost_peer` (
`peer_runid` bigint NOT NULL,
`peer_state` varchar(10) NOT NULL DEFAULT 'Down',
`last_update` DATETIME NULL COMMENT 'Last record update time',
-
+
PRIMARY KEY (`id`),
CONSTRAINT `fk_mshost_peer__owner_mshost` FOREIGN KEY (`owner_mshost`)
REFERENCES `mshost`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_mshost_peer__peer_mshost` FOREIGN KEY (`peer_mshost`)
REFERENCES `mshost`(`id`),
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql
index c90707c75b7..844280d29b6 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,7 +22,7 @@ ALTER TABLE `cloud_usage`.`usage_network` DROP COLUMN
`current_bytes_sent`;
ALTER TABLE `cloud`.`template_host_ref` DROP COLUMN `pool_id`;
DELETE from `cloud`.`op_host_capacity` where capacity_type in (2,4,6);
-ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `private_netmask`;
+ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `private_netmask`;
ALTER TABLE `cloud`.`security_group_rule` drop foreign key
`fk_security_ingress_rule___security_group_id`;
ALTER TABLE `cloud`.`security_group_rule` drop foreign key
`fk_security_ingress_rule___allowed_network_id`;
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql
b/engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql
index 22fda616649..8be481e4736 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-2214to30.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -54,7 +54,7 @@ CREATE TABLE `cloud`.`projects` (
PRIMARY KEY (`id`),
CONSTRAINT `fk_projects__project_account_id` FOREIGN
KEY(`project_account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_projects__domain_id` FOREIGN KEY(`domain_id`) REFERENCES
`domain`(`id`) ON DELETE CASCADE,
- INDEX `i_projects__removed`(`removed`)
+ INDEX `i_projects__removed`(`removed`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -177,97 +177,97 @@ ALTER TABLE `cloud`.`alert` ADD `cluster_id` bigint
unsigned;
ALTER TABLE `cloud`.`user_statistics` ADD COLUMN `agg_bytes_received` bigint
unsigned NOT NULL default '0';
ALTER TABLE `cloud`.`user_statistics` ADD COLUMN `agg_bytes_sent` bigint
unsigned NOT NULL default '0';
-ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `uc_vm_instance_uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`async_job` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`async_job` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`async_job` ADD CONSTRAINT `uc_async__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`domain` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`domain` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`domain` ADD CONSTRAINT `uc_domain__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`account` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`account` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`account` ADD CONSTRAINT `uc_account__uuid` UNIQUE
(`uuid`);
ALTER TABLE `cloud_usage`.`account` ADD COLUMN `uuid` varchar(40);
-ALTER TABLE `cloud`.`user` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`user` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`user` ADD CONSTRAINT `uc_user__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`projects` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`projects` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`projects` ADD CONSTRAINT `uc_projects__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`data_center` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`data_center` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`data_center` ADD CONSTRAINT `uc_data_center__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`host` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`host` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`host` ADD CONSTRAINT `uc_host__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud`.`host` ADD COLUMN `update_count` bigint unsigned NOT NULL
DEFAULT 0 COMMENT 'atomic increase count making status update operation
atomical';
-ALTER TABLE `cloud`.`vm_template` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`vm_template` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`vm_template` ADD CONSTRAINT `uc_vm_template__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`disk_offering` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`disk_offering` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`disk_offering` ADD CONSTRAINT `uc_disk_offering__uuid`
UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`networks` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`networks` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`networks` ADD CONSTRAINT `uc_networks__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`security_group` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`security_group` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `uc_security_group__uuid`
UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`instance_group` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`instance_group` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`instance_group` ADD CONSTRAINT `uc_instance_group__uuid`
UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`host_pod_ref` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`host_pod_ref` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`host_pod_ref` ADD CONSTRAINT `uc_host_pod_ref__uuid`
UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`snapshots` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`snapshots` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`snapshots` ADD CONSTRAINT `uc_snapshots__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`snapshot_policy` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`snapshot_policy` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`snapshot_policy` ADD CONSTRAINT
`uc_snapshot_policy__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`snapshot_schedule` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`snapshot_schedule` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`snapshot_schedule` ADD CONSTRAINT
`uc_snapshot_schedule__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`volumes` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`volumes` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`volumes` ADD CONSTRAINT `uc_volumes__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`vlan` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`vlan` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`vlan` ADD CONSTRAINT `uc_vlan__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`user_ip_address` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`user_ip_address` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT
`uc_user_ip_address__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`firewall_rules` ADD CONSTRAINT `uc_firewall_rules__uuid`
UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`cluster` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`cluster` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`cluster` ADD CONSTRAINT `uc_cluster__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`network_offerings` ADD CONSTRAINT
`uc_network_offerings__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`hypervisor_capabilities` ADD CONSTRAINT
`uc_hypervisor_capabilities__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`vpn_users` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`vpn_users` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`vpn_users` ADD CONSTRAINT `uc_vpn_users__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`event` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`event` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`event` ADD CONSTRAINT `uc_event__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`alert` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`alert` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`alert` ADD CONSTRAINT `uc_alert__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`guest_os` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`guest_os` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`guest_os` ADD CONSTRAINT `uc_guest_os__uuid` UNIQUE
(`uuid`);
-ALTER TABLE `cloud`.`guest_os_category` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`guest_os_category` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`guest_os_category` ADD CONSTRAINT
`uc_guest_os_category__uuid` UNIQUE (`uuid`);
-ALTER TABLE `cloud`.`nics` ADD COLUMN `uuid` varchar(40);
+ALTER TABLE `cloud`.`nics` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`nics` ADD CONSTRAINT `uc_nics__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud`.`op_host_capacity` ADD COLUMN `created` datetime;
@@ -304,7 +304,7 @@ ALTER TABLE `cloud_usage`.`usage_ip_address` ADD COLUMN
`is_system` smallint(1)
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Premium', 'DEFAULT',
'management-server', 'usage.sanity.check.interval', null, 'Interval (in days)
to check sanity of usage data');
DELETE FROM `cloud`.`configuration` WHERE name='host.capacity.checker.wait';
-DELETE FROM `cloud`.`configuration` WHERE
name='host.capacity.checker.interval';
+DELETE FROM `cloud`.`configuration` WHERE
name='host.capacity.checker.interval';
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'disable.extraction' , 'false', 'Flag for disabling
extraction of template, isos and volumes');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'NetworkManager', 'router.check.interval' , '30', 'Interval (in seconds) to
report redundant router status.');
@@ -362,9 +362,9 @@ CREATE TABLE `cloud`.`physical_network` (
`name` varchar(255) NOT NULL,
`data_center_id` bigint unsigned NOT NULL COMMENT 'data center id that this
physical network belongs to',
`vnet` varchar(255),
- `speed` varchar(32),
+ `speed` varchar(32),
`domain_id` bigint unsigned COMMENT 'foreign key to domain id',
- `broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'POD' COMMENT 'range
of broadcast domain : POD/ZONE',
+ `broadcast_domain_range` varchar(32) NOT NULL DEFAULT 'POD' COMMENT 'range
of broadcast domain : POD/ZONE',
`state` varchar(32) NOT NULL DEFAULT 'Disabled' COMMENT 'what state is this
configuration in',
`created` datetime COMMENT 'date created',
`removed` datetime COMMENT 'date removed if not null',
@@ -372,7 +372,7 @@ CREATE TABLE `cloud`.`physical_network` (
CONSTRAINT `fk_physical_network__data_center_id` FOREIGN KEY
(`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_physical_network__domain_id` FOREIGN KEY(`domain_id`)
REFERENCES `domain`(`id`),
CONSTRAINT `uc_physical_networks__uuid` UNIQUE (`uuid`),
- INDEX `i_physical_network__removed`(`removed`)
+ INDEX `i_physical_network__removed`(`removed`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`physical_network_tags` (
@@ -690,7 +690,7 @@ CREATE TABLE `cloud_usage`.`usage_security_group` (
`vm_instance_id` bigint unsigned NOT NULL,
`security_group_id` bigint unsigned NOT NULL,
`created` DATETIME NOT NULL,
- `deleted` DATETIME NULL
+ `deleted` DATETIME NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX
`i_usage_security_group__account_id`(`account_id`);
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql
index d999b939103..5ed5f834f68 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-221to222-premium.sql
b/engine/schema/src/main/resources/META-INF/db/schema-221to222-premium.sql
index 5477fd8a348..01603a40658 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-221to222-premium.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-221to222-premium.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql
b/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql
index 0c663b1ca03..d07b71fb6cb 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-221to222.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,7 +23,7 @@ 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);
-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');
+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;
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-222to224-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-222to224-cleanup.sql
index 1bcd5d4c5f0..31f6eefb5fa 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-222to224-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-222to224-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql
b/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql
index 9a5f62794c4..33d954d3a88 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql
b/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql
index 8be64169b44..abbaf447bba 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-222to224.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -99,7 +99,7 @@ ALTER TABLE `cloud`.`op_host_capacity` MODIFY `used_capacity`
bigint signed NOT
ALTER TABLE `cloud`.`op_host_capacity` MODIFY `reserved_capacity` bigint
signed NOT NULL;
ALTER TABLE `cloud`.`op_host_capacity` MODIFY `total_capacity` bigint signed
NOT NULL;
-INSERT IGNORE INTO `cloud`.`configuration` VALUES
+INSERT IGNORE INTO `cloud`.`configuration` VALUES
('Advanced','DEFAULT','management-server','control.cidr','169.254.0.0/16','Changes
the cidr for the control network traffic. Defaults to using link local. Must
be unique within pods'),
('Advanced','DEFAULT','management-server','control.gateway','169.254.0.1','gateway
for the control network traffic'),
('Advanced','DEFAULT','AgentManager','cmd.wait','7200','Time (in seconds) to
wait for some heavy time-consuming commands'),
@@ -110,7 +110,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES
('Console
Proxy','DEFAULT','AgentManager','consoleproxy.url.domain','realhostip.com','Console
proxy url domain'),
('Advanced','DEFAULT','management-server','extract.url.cleanup.interval','120','The
interval (in seconds) to wait before cleaning up the extract URL\'s '),
('Network','DEFAULT','AgentManager','guest.ip.network','10.1.1.1','The network
address of the guest virtual network. Virtual machines will be assigned an IP
in this subnet.'),
-('Network','DEFAULT','AgentManager','guest.netmask','255.255.255.0','The
netmask of the guest virtual network.'),
+('Network','DEFAULT','AgentManager','guest.netmask','255.255.255.0','The
netmask of the guest virtual network.'),
('Network','DEFAULT','management-server','guest.vlan.bits','12','The number of
bits to reserve for the VLAN identifier in the guest subnet.'),
('Advanced','DEFAULT','management-server','host.capacity.checker.interval','3600','Time
(in seconds) to wait before recalculating host\'s capacity'),
('Advanced','DEFAULT','management-server','host.capacity.checker.wait','3600','Time
(in seconds) to wait before starting host capacity background checker'),
@@ -175,7 +175,7 @@ ALTER TABLE `cloud`.`snapshot_schedule` ADD UNIQUE KEY
`volume_id` (`volume_id`
ALTER TABLE `cloud`.`storage_pool` MODIFY COLUMN `uuid` varchar(255) UNIQUE;
ALTER TABLE `cloud`.`user_statistics` DROP KEY `account_id`;
-ALTER TABLE `cloud`.`user_statistics` ADD UNIQUE KEY `account_id`
(`account_id`,`data_center_id`, `public_ip_address`,
`device_id`,`device_type`);
+ALTER TABLE `cloud`.`user_statistics` ADD UNIQUE KEY `account_id`
(`account_id`,`data_center_id`, `public_ip_address`, `device_id`,`device_type`);
ALTER TABLE `cloud`.`usage_event` ADD INDEX
`i_usage_event__created`(`created`);
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-224to225-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-224to225-cleanup.sql
index b018d7f280e..5f24290a1fd 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-224to225-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-224to225-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql
b/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql
index 65334af306f..735c30a943c 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-224to225.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql
b/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql
index ec1baae2e69..3527921af84 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-225to226.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql
b/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql
index 40fcbfa6838..2e21f0c249e 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql
b/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql
index 343c7663fd2..ac3c014894d 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-227to228.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -136,9 +136,9 @@ ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `vm_type`
varchar(32) NOT NULL;
UPDATE vm_instance set vm_type=type;
ALTER TABLE `cloud`.`networks` ADD COLUMN `is_domain_specific` int(1) unsigned
NOT NULL DEFAULT 0 COMMENT '1 if network is domain specific, 0 false otherwise';
-INSERT INTO configuration (`category`, `instance`, `component`, `name`,
`value`, `description`) VALUES ('Advanced', 'DEFAULT', 'NetworkManager',
'allow.subdomain.network.access', 'true', 'Allow subdomains to use networks
dedicated to their parent domain(s)');
+INSERT INTO configuration (`category`, `instance`, `component`, `name`,
`value`, `description`) VALUES ('Advanced', 'DEFAULT', 'NetworkManager',
'allow.subdomain.network.access', 'true', 'Allow subdomains to use networks
dedicated to their parent domain(s)');
-INSERT INTO configuration (`category`, `instance`, `component`, `name`,
`value`, `description`) VALUES ('Advanced', 'DEFAULT', 'management-server',
'encode.api.response', 'false', 'Do UTF-8 encoding for the api response, false
by default');
+INSERT INTO configuration (`category`, `instance`, `component`, `name`,
`value`, `description`) VALUES ('Advanced', 'DEFAULT', 'management-server',
'encode.api.response', 'false', 'Do UTF-8 encoding for the api response, false
by default');
DELETE FROM load_balancer_vm_map WHERE instance_id IN (SELECT id FROM
vm_instance WHERE removed IS NOT NULL);
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql
b/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql
index 9d5baa4c403..2496dd4c472 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-228to229.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql
b/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql
index 9c5c46242af..1d2980f6564 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-229to2210.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-22beta1to22beta2.sql
b/engine/schema/src/main/resources/META-INF/db/schema-22beta1to22beta2.sql
index 1b7c6a64eb0..dd03e61e17e 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-22beta1to22beta2.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-22beta1to22beta2.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql
b/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql
index c73d16537ac..a93d6d5d7e5 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -83,7 +83,7 @@ CREATE TABLE `cloud`.`user_vm_details` (
`value` varchar(1024) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
+
CREATE TABLE `cloud`.`cluster_details` (
`id` bigint unsigned NOT NULL auto_increment,
`cluster_id` bigint unsigned NOT NULL COMMENT 'cluster id',
@@ -99,9 +99,9 @@ ALTER TABLE `cloud`.`service_offering` ADD COLUMN `host_tag`
varchar(255);
ALTER TABLE `cloud`.`op_it_work` change created created_at bigint unsigned NOT
NULL COMMENT 'when was this work detail created';
ALTER TABLE `cloud`.`op_it_work` change state step char(32) NOT NULL COMMENT
'state';
ALTER TABLE `cloud`.`op_it_work` change cancel_taken updated_at bigint
unsigned NOT NULL COMMENT 'time it was taken over';
-ALTER TABLE `cloud`.`op_it_work` ADD COLUMN `instance_id` bigint unsigned NOT
NULL COMMENT 'vm instance';
-ALTER TABLE `cloud`.`op_it_work` ADD COLUMN `resource_id` bigint unsigned
COMMENT 'resource id being worked on';
-ALTER TABLE `cloud`.`op_it_work` ADD COLUMN `resource_type` char(32) COMMENT
'type of resource being worked on';
+ALTER TABLE `cloud`.`op_it_work` ADD COLUMN `instance_id` bigint unsigned NOT
NULL COMMENT 'vm instance';
+ALTER TABLE `cloud`.`op_it_work` ADD COLUMN `resource_id` bigint unsigned
COMMENT 'resource id being worked on';
+ALTER TABLE `cloud`.`op_it_work` ADD COLUMN `resource_type` char(32) COMMENT
'type of resource being worked on';
ALTER TABLE `cloud`.`hypervsior_properties` ADD COLUMN `is_default` int(1)
unsigned NOT NULL DEFAULT 0 COMMENT '1 if network is default';
ALTER TABLE `cloud`.`network_offerings` drop column TYPE;
ALTER TABLE `cloud`.`domain_router` ADD COLUMN `host_tag` varchar(255) COMMENT
'host tag specified by the service_offering';
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-301to302-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-301to302-cleanup.sql
index 7922d98ea99..d32644f471c 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-301to302-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-301to302-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-301to302.sql
b/engine/schema/src/main/resources/META-INF/db/schema-301to302.sql
index 4532757d052..99a555dedca 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-301to302.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-301to302.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden',
'DEFAULT', 'managem
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'network.disable.rpfilter', 'true', 'disable rp_filter on
Domain Router VM public interfaces.');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'network.securitygroups.work.cleanup.interval', '120',
'Time interval (seconds) in which finished work is cleaned up from the work
table');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'network.securitygroups.work.lock.timeout', '300', 'Lock
wait timeout (seconds) while updating the security group work queues');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'network.securitygroups.work.per.agent.queue.size', '100',
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'network.securitygroups.work.per.agent.queue.size', '100',
'The number of outstanding security group work items that can be queued to a
host. If exceeded, work items will get dropped to conserve memory. Security
Group Sync will take care of ensuring that the host gets updated eventually');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'network.securitygroups.workers.pool.size', '50', 'Number
of worker threads processing the security group update work queue');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT',
'management-server', 'ovm.guest.network.device', null, 'Specify the private
bridge on host for private network');
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql
b/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql
index b475a8e9958..07faf98cf74 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -55,7 +55,7 @@ CREATE TABLE `cloud`.`volume_host_ref` (
`local_path` varchar(255),
`install_path` varchar(255),
`url` varchar(255),
- `format` varchar(32) NOT NULL COMMENT 'format for the volume',
+ `format` varchar(32) NOT NULL COMMENT 'format for the volume',
`destroyed` tinyint(1) COMMENT 'indicates whether the volume_host entry was
destroyed by the user or not',
PRIMARY KEY (`id`),
CONSTRAINT `fk_volume_host_ref__host_id` FOREIGN KEY
`fk_volume_host_ref__host_id` (`host_id`) REFERENCES `host` (`id`) ON DELETE
CASCADE,
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-302to40-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-302to40-cleanup.sql
index 4d89a078b2d..540c7716189 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-302to40-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-302to40-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-302to40.sql
b/engine/schema/src/main/resources/META-INF/db/schema-302to40.sql
index ca99f0106d2..47e4c3fd6d5 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-302to40.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-302to40.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,7 +59,7 @@ CREATE TABLE `cloud`.`volume_host_ref` (
`local_path` varchar(255),
`install_path` varchar(255),
`url` varchar(255),
- `format` varchar(32) NOT NULL COMMENT 'format for the volume',
+ `format` varchar(32) NOT NULL COMMENT 'format for the volume',
`destroyed` tinyint(1) COMMENT 'indicates whether the volume_host entry was
destroyed by the user or not',
PRIMARY KEY (`id`),
CONSTRAINT `fk_volume_host_ref__host_id` FOREIGN KEY
`fk_volume_host_ref__host_id` (`host_id`) REFERENCES `host` (`id`) ON DELETE
CASCADE,
@@ -236,9 +236,9 @@ from information_schema.key_column_usage A
JOIN information_schema.key_column_usage B ON B.table_name =
'physical_network_service_providers' AND B.COLUMN_NAME = 'provider_name' AND
A.COLUMN_NAME ='physical_network_id' AND B.CONSTRAINT_NAME=A.CONSTRAINT_NAME
where A.table_name = 'physical_network_service_providers' LIMIT 1);
-PREPARE stmt1 FROM @constraintname;
-EXECUTE stmt1;
-DEALLOCATE PREPARE stmt1;
+PREPARE stmt1 FROM @constraintname;
+EXECUTE stmt1;
+DEALLOCATE PREPARE stmt1;
AlTER TABLE `cloud`.`physical_network_service_providers` ADD CONSTRAINT
`fk_pnetwork_service_providers__physical_network_id` FOREIGN KEY
(`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE;
UPDATE `cloud`.`configuration` SET description='In second, timeout for
creating volume from snapshot' WHERE name='create.volume.from.snapshot.wait';
@@ -299,7 +299,7 @@ CREATE TABLE `cloud`.`vpc` (
PRIMARY KEY (`id`),
INDEX `i_vpc__removed`(`removed`),
CONSTRAINT `fk_vpc__zone_id` FOREIGN KEY `fk_vpc__zone_id` (`zone_id`)
REFERENCES `data_center` (`id`) ON DELETE CASCADE,
- CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`)
REFERENCES `vpc_offerings`(`id`),
+ CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`)
REFERENCES `vpc_offerings`(`id`),
CONSTRAINT `fk_vpc__account_id` FOREIGN KEY `fk_vpc__account_id`
(`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_vpc__domain_id` FOREIGN KEY `fk_vpc__domain_id` (`domain_id`)
REFERENCES `domain`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -360,7 +360,7 @@ CREATE TABLE `cloud`.`static_routes` (
`id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
`uuid` varchar(40),
`vpc_gateway_id` bigint unsigned COMMENT 'id of the corresponding ip
address',
- `cidr` varchar(18) COMMENT 'cidr for the static route',
+ `cidr` varchar(18) COMMENT 'cidr for the static route',
`state` char(32) NOT NULL COMMENT 'current state of this rule',
`vpc_id` bigint unsigned COMMENT 'vpc the firewall rule is associated with',
`account_id` bigint unsigned NOT NULL COMMENT 'owner id',
@@ -468,7 +468,7 @@ UPDATE `cloud`.`configuration` SET description='Comma
separated list of cidrs in
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'site2site.vpn.vpngateway.connection.limit', '4', 'The
maximum number of VPN connection per VPN gateway');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'site2site.vpn.customergateway.subnets.limit', '10', 'The
maximum number of subnets per customer gateway');
-INSERT IGNORE INTO `cloud`.`guest_os_category` VALUES ('11','None',NULL);
+INSERT IGNORE INTO `cloud`.`guest_os_category` VALUES ('11','None',NULL);
ALTER TABLE `cloud`.`user` ADD COLUMN `incorrect_login_attempts` integer
unsigned NOT NULL DEFAULT '0';
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'incorrect.login.attempts.allowed', '5', 'Incorrect login
attempts allowed before the user is disabled');
UPDATE `cloud`.`configuration` set description ='Uuid of the service offering
used by console proxy; if NULL - system offering will be used' where name
='consoleproxy.service.offering';
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql
index 3b5c8f5a356..1184c98e182 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql
b/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql
index dfeff3f683b..cb2efb3edd0 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -80,7 +80,7 @@ CREATE TABLE `cloud`.`vpc` (
PRIMARY KEY (`id`),
INDEX `i_vpc__removed`(`removed`),
CONSTRAINT `fk_vpc__zone_id` FOREIGN KEY `fk_vpc__zone_id` (`zone_id`)
REFERENCES `data_center` (`id`) ON DELETE CASCADE,
- CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`)
REFERENCES `vpc_offerings`(`id`),
+ CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`)
REFERENCES `vpc_offerings`(`id`),
CONSTRAINT `fk_vpc__account_id` FOREIGN KEY `fk_vpc__account_id`
(`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_vpc__domain_id` FOREIGN KEY `fk_vpc__domain_id` (`domain_id`)
REFERENCES `domain`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -141,7 +141,7 @@ CREATE TABLE `cloud`.`static_routes` (
`id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
`uuid` varchar(40),
`vpc_gateway_id` bigint unsigned COMMENT 'id of the corresponding ip
address',
- `cidr` varchar(18) COMMENT 'cidr for the static route',
+ `cidr` varchar(18) COMMENT 'cidr for the static route',
`state` char(32) NOT NULL COMMENT 'current state of this rule',
`vpc_id` bigint unsigned COMMENT 'vpc the firewall rule is associated with',
`account_id` bigint unsigned NOT NULL COMMENT 'owner id',
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql
index f15ad4fbc5c..850d48b6526 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql
b/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql
index b1294a21054..e9a620bb4cc 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-305to306.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql
b/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql
index a43833efa43..0ddee9ec5db 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-306to307.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-307to410.sql
b/engine/schema/src/main/resources/META-INF/db/schema-307to410.sql
index 944d910fec4..55d78b59437 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-307to410.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-307to410.sql
@@ -22,7 +22,7 @@
SET foreign_key_checks = 0;
--- DB upgrade steps from 302-40
+-- DB upgrade steps from 302-40
CREATE TABLE `cloud`.`external_nicira_nvp_devices` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
`uuid` varchar(255) UNIQUE,
@@ -59,9 +59,9 @@ from information_schema.key_column_usage A
JOIN information_schema.key_column_usage B ON B.table_name =
'physical_network_service_providers' AND B.COLUMN_NAME = 'provider_name' AND
A.COLUMN_NAME ='physical_network_id' AND B.CONSTRAINT_NAME=A.CONSTRAINT_NAME
where A.table_name = 'physical_network_service_providers' LIMIT 1);
-PREPARE stmt1 FROM @constraintname;
-EXECUTE stmt1;
-DEALLOCATE PREPARE stmt1;
+PREPARE stmt1 FROM @constraintname;
+EXECUTE stmt1;
+DEALLOCATE PREPARE stmt1;
AlTER TABLE physical_network_service_providers ADD CONSTRAINT
`fk_pnetwork_service_providers__physical_network_id` FOREIGN KEY
(`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE;
UPDATE `cloud`.`configuration` SET description='Do URL encoding for the api
response, false by default' WHERE name='encode.api.response';
@@ -351,8 +351,8 @@ ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_range`
varchar(255);
ALTER TABLE `cloud`.`data_center` ADD COLUMN `ip6_dns1` varchar(255);
ALTER TABLE `cloud`.`data_center` ADD COLUMN `ip6_dns2` varchar(255);
-UPDATE `cloud`.`networks` INNER JOIN `cloud`.`vlan` ON networks.id =
vlan.network_id
-SET networks.gateway = vlan.vlan_gateway, networks.ip6_gateway =
vlan.ip6_gateway, networks.ip6_cidr = vlan.ip6_cidr
+UPDATE `cloud`.`networks` INNER JOIN `cloud`.`vlan` ON networks.id =
vlan.network_id
+SET networks.gateway = vlan.vlan_gateway, networks.ip6_gateway =
vlan.ip6_gateway, networks.ip6_cidr = vlan.ip6_cidr
WHERE networks.data_center_id = vlan.data_center_id AND
networks.physical_network_id = vlan.physical_network_id;
-- DB views for list api
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-30to301.sql
b/engine/schema/src/main/resources/META-INF/db/schema-30to301.sql
index 0cc51e7d08f..81339bf2a53 100755
--- a/engine/schema/src/main/resources/META-INF/db/schema-30to301.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-30to301.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql
b/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql
index 1b3a29b27a4..845b31ca04a 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-40to410.sql
@@ -457,15 +457,15 @@ ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_range`
varchar(255);
ALTER TABLE `cloud`.`data_center` ADD COLUMN `ip6_dns1` varchar(255);
ALTER TABLE `cloud`.`data_center` ADD COLUMN `ip6_dns2` varchar(255);
-UPDATE `cloud`.`networks` INNER JOIN `cloud`.`vlan` ON networks.id =
vlan.network_id
-SET networks.gateway = vlan.vlan_gateway, networks.ip6_gateway =
vlan.ip6_gateway, networks.ip6_cidr = vlan.ip6_cidr
+UPDATE `cloud`.`networks` INNER JOIN `cloud`.`vlan` ON networks.id =
vlan.network_id
+SET networks.gateway = vlan.vlan_gateway, networks.ip6_gateway =
vlan.ip6_gateway, networks.ip6_cidr = vlan.ip6_cidr
WHERE networks.data_center_id = vlan.data_center_id AND
networks.physical_network_id = vlan.physical_network_id;
-- DB views for list api
DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
CREATE VIEW `cloud`.`user_vm_view` AS
- select
+ select
vm_instance.id id,
vm_instance.name name,
user_vm.display_name display_name,
@@ -504,7 +504,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
vm_instance.vm_type vm_type,
data_center.id data_center_id,
data_center.uuid data_center_uuid,
- data_center.name data_center_name,
+ data_center.name data_center_name,
data_center.is_security_group_enabled security_group_enabled,
host.id host_id,
host.uuid host_uuid,
@@ -634,7 +634,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
DROP VIEW IF EXISTS `cloud`.`domain_router_view`;
CREATE VIEW `cloud`.`domain_router_view` AS
- select
+ select
vm_instance.id id,
vm_instance.name name,
account.id account_id,
@@ -740,7 +740,7 @@ CREATE VIEW `cloud`.`domain_router_view` AS
DROP VIEW IF EXISTS `cloud`.`security_group_view`;
CREATE VIEW `cloud`.`security_group_view` AS
- select
+ select
security_group.id id,
security_group.name name,
security_group.description description,
@@ -799,7 +799,7 @@ CREATE VIEW `cloud`.`security_group_view` AS
DROP VIEW IF EXISTS `cloud`.`resource_tag_view`;
CREATE VIEW `cloud`.`resource_tag_view` AS
- select
+ select
resource_tags.id,
resource_tags.uuid,
resource_tags.key,
@@ -831,7 +831,7 @@ CREATE VIEW `cloud`.`resource_tag_view` AS
DROP VIEW IF EXISTS `cloud`.`event_view`;
CREATE VIEW `cloud`.`event_view` AS
- select
+ select
event.id,
event.uuid,
event.type,
@@ -870,7 +870,7 @@ CREATE VIEW `cloud`.`event_view` AS
DROP VIEW IF EXISTS `cloud`.`instance_group_view`;
CREATE VIEW `cloud`.`instance_group_view` AS
- select
+ select
instance_group.id,
instance_group.uuid,
instance_group.name,
@@ -898,7 +898,7 @@ CREATE VIEW `cloud`.`instance_group_view` AS
DROP VIEW IF EXISTS `cloud`.`user_view`;
CREATE VIEW `cloud`.`user_view` AS
- select
+ select
user.id,
user.uuid,
user.username,
@@ -941,7 +941,7 @@ CREATE VIEW `cloud`.`user_view` AS
DROP VIEW IF EXISTS `cloud`.`project_view`;
CREATE VIEW `cloud`.`project_view` AS
- select
+ select
projects.id,
projects.uuid,
projects.name,
@@ -982,7 +982,7 @@ CREATE VIEW `cloud`.`project_view` AS
DROP VIEW IF EXISTS `cloud`.`project_account_view`;
CREATE VIEW `cloud`.`project_account_view` AS
- select
+ select
project_account.id,
account.id account_id,
account.uuid account_uuid,
@@ -1007,7 +1007,7 @@ CREATE VIEW `cloud`.`project_account_view` AS
DROP VIEW IF EXISTS `cloud`.`project_invitation_view`;
CREATE VIEW `cloud`.`project_invitation_view` AS
- select
+ select
project_invitations.id,
project_invitations.uuid,
project_invitations.email,
@@ -1035,7 +1035,7 @@ CREATE VIEW `cloud`.`project_invitation_view` AS
DROP VIEW IF EXISTS `cloud`.`host_view`;
CREATE VIEW `cloud`.`host_view` AS
- select
+ select
host.id,
host.uuid,
host.name,
@@ -1105,7 +1105,7 @@ CREATE VIEW `cloud`.`host_view` AS
DROP VIEW IF EXISTS `cloud`.`volume_view`;
CREATE VIEW `cloud`.`volume_view` AS
- select
+ select
volumes.id,
volumes.uuid,
volumes.name,
@@ -1206,7 +1206,7 @@ CREATE VIEW `cloud`.`volume_view` AS
DROP VIEW IF EXISTS `cloud`.`account_netstats_view`;
CREATE VIEW `cloud`.`account_netstats_view` AS
- SELECT
+ SELECT
account_id,
sum(net_bytes_received) + sum(current_bytes_received) as bytesReceived,
sum(net_bytes_sent) + sum(current_bytes_sent) as bytesSent
@@ -1217,7 +1217,7 @@ CREATE VIEW `cloud`.`account_netstats_view` AS
DROP VIEW IF EXISTS `cloud`.`account_vmstats_view`;
CREATE VIEW `cloud`.`account_vmstats_view` AS
- SELECT
+ SELECT
account_id, state, count(*) as vmcount
from
`cloud`.`vm_instance`
@@ -1225,7 +1225,7 @@ CREATE VIEW `cloud`.`account_vmstats_view` AS
DROP VIEW IF EXISTS `cloud`.`free_ip_view`;
CREATE VIEW `cloud`.`free_ip_view` AS
- select
+ select
count(user_ip_address.id) free_ip
from
`cloud`.`user_ip_address`
@@ -1237,7 +1237,7 @@ CREATE VIEW `cloud`.`free_ip_view` AS
DROP VIEW IF EXISTS `cloud`.`account_view`;
CREATE VIEW `cloud`.`account_view` AS
- select
+ select
account.id,
account.uuid,
account.account_name,
@@ -1348,7 +1348,7 @@ CREATE VIEW `cloud`.`account_view` AS
DROP VIEW IF EXISTS `cloud`.`async_job_view`;
CREATE VIEW `cloud`.`async_job_view` AS
- select
+ select
account.id account_id,
account.uuid account_uuid,
account.account_name account_name,
@@ -1457,7 +1457,7 @@ CREATE VIEW `cloud`.`async_job_view` AS
DROP VIEW IF EXISTS `cloud`.`storage_pool_view`;
CREATE VIEW `cloud`.`storage_pool_view` AS
- select
+ select
storage_pool.id,
storage_pool.uuid,
storage_pool.name,
@@ -1475,7 +1475,7 @@ CREATE VIEW `cloud`.`storage_pool_view` AS
cluster.cluster_type,
data_center.id data_center_id,
data_center.uuid data_center_uuid,
- data_center.name data_center_name,
+ data_center.name data_center_name,
host_pod_ref.id pod_id,
host_pod_ref.uuid pod_uuid,
host_pod_ref.name pod_name,
@@ -1507,7 +1507,7 @@ CREATE VIEW `cloud`.`storage_pool_view` AS
DROP VIEW IF EXISTS `cloud`.`disk_offering_view`;
CREATE VIEW `cloud`.`disk_offering_view` AS
- select
+ select
disk_offering.id,
disk_offering.uuid,
disk_offering.name,
@@ -1532,7 +1532,7 @@ CREATE VIEW `cloud`.`disk_offering_view` AS
DROP VIEW IF EXISTS `cloud`.`service_offering_view`;
CREATE VIEW `cloud`.`service_offering_view` AS
- select
+ select
service_offering.id,
disk_offering.uuid,
disk_offering.name,
@@ -1563,10 +1563,10 @@ CREATE VIEW `cloud`.`service_offering_view` AS
`cloud`.`disk_offering` ON service_offering.id = disk_offering.id
left join
`cloud`.`domain` ON disk_offering.domain_id = domain.id;
-
+
DROP VIEW IF EXISTS `cloud`.`data_center_view`;
CREATE VIEW `cloud`.`data_center_view` AS
- select
+ select
data_center.id,
data_center.uuid,
data_center.name,
@@ -1593,8 +1593,8 @@ CREATE VIEW `cloud`.`data_center_view` AS
from
`cloud`.`data_center`
left join
- `cloud`.`domain` ON data_center.domain_id = domain.id;
-
+ `cloud`.`domain` ON data_center.domain_id = domain.id;
+
CREATE TABLE `cloud`.`baremetal_dhcp_devices` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql
b/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql
index 3556e7e1b4a..35f73b35d3c 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-410to420.sql
@@ -113,7 +113,7 @@ CREATE TABLE `cloud`.`image_store` (
`uuid` varchar(255) COMMENT 'uuid of data store',
`parent` varchar(255) COMMENT 'parent path for the storage server',
`created` datetime COMMENT 'date the image store first signed on',
- `removed` datetime COMMENT 'date removed if not null',
+ `removed` datetime COMMENT 'date removed if not null',
`total_size` bigint unsigned COMMENT 'storage total size statistics',
`used_bytes` bigint unsigned COMMENT 'storage available bytes statistics',
PRIMARY KEY(`id`)
@@ -131,7 +131,7 @@ CREATE TABLE `cloud`.`image_store_details` (
DROP VIEW IF EXISTS `cloud`.`image_store_view`;
CREATE VIEW `cloud`.`image_store_view` AS
- select
+ select
image_store.id,
image_store.uuid,
image_store.name,
@@ -153,9 +153,9 @@ CREATE VIEW `cloud`.`image_store_view` AS
left join
`cloud`.`image_store_details` ON image_store_details.store_id =
image_store.id;
-
+
-- here we have to allow null for store_id to accommodate baremetal case to
search for ready templates since template state is only stored in this table
--- FK also commented out due to this
+-- FK also commented out due to this
CREATE TABLE `cloud`.`template_store_ref` (
`id` bigint unsigned NOT NULL auto_increment,
`store_id` bigint unsigned,
@@ -165,7 +165,7 @@ CREATE TABLE `cloud`.`template_store_ref` (
`job_id` varchar(255),
`download_pct` int(10) unsigned,
`size` bigint unsigned,
- `store_role` varchar(255),
+ `store_role` varchar(255),
`physical_size` bigint unsigned DEFAULT 0,
`download_state` varchar(255),
`error_str` varchar(255),
@@ -177,7 +177,7 @@ CREATE TABLE `cloud`.`template_store_ref` (
`is_copy` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'indicates whether this was
copied ',
`update_count` bigint unsigned,
`ref_cnt` bigint unsigned DEFAULT 0,
- `updated` datetime,
+ `updated` datetime,
PRIMARY KEY (`id`),
-- CONSTRAINT `fk_template_store_ref__store_id` FOREIGN KEY
`fk_template_store_ref__store_id` (`store_id`) REFERENCES `image_store` (`id`)
ON DELETE CASCADE,
INDEX `i_template_store_ref__store_id`(`store_id`),
@@ -193,7 +193,7 @@ CREATE TABLE `cloud`.`template_store_ref` (
-- ALTER TABLE `cloud`.`snapshots` DROP COLUMN `sechost_id`;
-- change upload host_id FK to point to image_store table
-ALTER TABLE `cloud`.`upload` DROP FOREIGN KEY `fk_upload__host_id`;
+ALTER TABLE `cloud`.`upload` DROP FOREIGN KEY `fk_upload__host_id`;
ALTER TABLE `cloud`.`upload` ADD CONSTRAINT `fk_upload__store_id` FOREIGN
KEY(`host_id`) REFERENCES `image_store` (`id`) ON DELETE CASCADE;
CREATE TABLE `cloud`.`snapshot_store_ref` (
@@ -208,11 +208,11 @@ CREATE TABLE `cloud`.`snapshot_store_ref` (
`physical_size` bigint unsigned DEFAULT 0,
`parent_snapshot_id` bigint unsigned DEFAULT 0,
`install_path` varchar(255),
- `state` varchar(255) NOT NULL,
- -- `removed` datetime COMMENT 'date removed if not null',
+ `state` varchar(255) NOT NULL,
+ -- `removed` datetime COMMENT 'date removed if not null',
`update_count` bigint unsigned,
`ref_cnt` bigint unsigned,
- `updated` datetime,
+ `updated` datetime,
`volume_id` bigint unsigned,
PRIMARY KEY (`id`),
INDEX `i_snapshot_store_ref__store_id`(`store_id`),
@@ -238,11 +238,11 @@ CREATE TABLE `cloud`.`volume_store_ref` (
`install_path` varchar(255),
`url` varchar(255),
`download_url` varchar(255),
- `state` varchar(255) NOT NULL,
+ `state` varchar(255) NOT NULL,
`destroyed` tinyint(1) COMMENT 'indicates whether the volume_host entry was
destroyed by the user or not',
`update_count` bigint unsigned,
`ref_cnt` bigint unsigned,
- `updated` datetime,
+ `updated` datetime,
PRIMARY KEY (`id`),
CONSTRAINT `fk_volume_store_ref__store_id` FOREIGN KEY
`fk_volume_store_ref__store_id` (`store_id`) REFERENCES `image_store` (`id`) ON
DELETE CASCADE,
INDEX `i_volume_store_ref__store_id`(`store_id`),
@@ -662,12 +662,12 @@ ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `id`
bigint unsigned NOT NULL
ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `uuid` varchar(40) UNIQUE;
-- START: support for LXC
-
+
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type,
hypervisor_version, max_guests_limit, security_group_enabled) VALUES (UUID(),
'LXC', 'default', 50, 1);
ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN
`lxc_network_label` varchar(255) DEFAULT 'cloudbr0' COMMENT 'The network name
label of the physical device dedicated to this traffic on a LXC host';
-
+
UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC' WHERE
name='hypervisor.list';
-
+
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public,
created, type, hvm, bits, account_id, url, checksum, enable_password,
display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
VALUES (10, UUID(), 'routing-10', 'SystemVM Template (LXC)', 0, now(),
'SYSTEM', 0, 64, 1,
'http://download.cloudstack.org/templates/acton/acton-systemvm-02062012.qcow2.bz2',
'2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (LXC)', 'QCOW2', 15,
0, 1, 'LXC');
@@ -717,10 +717,10 @@ CREATE TABLE `cloud`.`service_offering_details` (
CONSTRAINT `fk_service_offering_details__service_offering_id` FOREIGN KEY
(`service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE,
CONSTRAINT UNIQUE KEY `uk_service_offering_id_name` (`service_offering_id`,
`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
+
DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
CREATE VIEW `cloud`.`user_vm_view` AS
- select
+ select
vm_instance.id id,
vm_instance.name name,
user_vm.display_name display_name,
@@ -898,7 +898,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
DROP VIEW IF EXISTS `cloud`.`affinity_group_view`;
CREATE VIEW `cloud`.`affinity_group_view` AS
- select
+ select
affinity_group.id id,
affinity_group.name name,
affinity_group.type type,
@@ -933,7 +933,7 @@ CREATE VIEW `cloud`.`affinity_group_view` AS
DROP VIEW IF EXISTS `cloud`.`host_view`;
CREATE VIEW `cloud`.`host_view` AS
- select
+ select
host.id,
host.uuid,
host.name,
@@ -1001,10 +1001,10 @@ CREATE VIEW `cloud`.`host_view` AS
`cloud`.`async_job` ON async_job.instance_id = host.id
and async_job.instance_type = 'Host'
and async_job.job_status = 0;
-
+
DROP VIEW IF EXISTS `cloud`.`storage_pool_view`;
CREATE VIEW `cloud`.`storage_pool_view` AS
- select
+ select
storage_pool.id,
storage_pool.uuid,
storage_pool.name,
@@ -1024,7 +1024,7 @@ CREATE VIEW `cloud`.`storage_pool_view` AS
cluster.cluster_type,
data_center.id data_center_id,
data_center.uuid data_center_uuid,
- data_center.name data_center_name,
+ data_center.name data_center_name,
data_center.networktype data_center_type,
host_pod_ref.id pod_id,
host_pod_ref.uuid pod_uuid,
@@ -1054,11 +1054,11 @@ CREATE VIEW `cloud`.`storage_pool_view` AS
`cloud`.`async_job` ON async_job.instance_id = storage_pool.id
and async_job.instance_type = 'StoragePool'
and async_job.job_status = 0;
-
+
DROP VIEW IF EXISTS `cloud`.`domain_router_view`;
CREATE VIEW `cloud`.`domain_router_view` AS
- select
+ select
vm_instance.id id,
vm_instance.name name,
account.id account_id,
@@ -1157,7 +1157,7 @@ CREATE VIEW `cloud`.`domain_router_view` AS
`cloud`.`async_job` ON async_job.instance_id = vm_instance.id
and async_job.instance_type = 'DomainRouter'
and async_job.job_status = 0;
-
+
CREATE TABLE `cloud`.`external_cisco_vnmc_devices` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
`uuid` varchar(255) UNIQUE,
@@ -1242,7 +1242,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES
('Advanced', 'DEFAULT', 'manag
DROP VIEW IF EXISTS `cloud`.`service_offering_view`;
CREATE VIEW `cloud`.`service_offering_view` AS
- select
+ select
service_offering.id,
disk_offering.uuid,
disk_offering.name,
@@ -1289,7 +1289,7 @@ UPDATE `cloud_usage`.`account` SET `default`=1 WHERE id
IN (1,2);
UPDATE `cloud`.`user` SET `cloud`.`user`.`default`=1 WHERE id IN (1,2);
CREATE OR REPLACE VIEW `cloud`.`user_view` AS
- select
+ select
user.id,
user.uuid,
user.username,
@@ -1329,7 +1329,7 @@ CREATE OR REPLACE VIEW `cloud`.`user_view` AS
`cloud`.`async_job` ON async_job.instance_id = user.id
and async_job.instance_type = 'User'
and async_job.job_status = 0;
-
+
DROP VIEW IF EXISTS `cloud`.`account_view`;
CREATE VIEW `cloud`.`account_view` AS
@@ -1879,7 +1879,7 @@ ALTER TABLE `cloud`.`account_details` MODIFY value
varchar(255);
DROP VIEW IF EXISTS `cloud`.`template_view`;
CREATE VIEW `cloud`.`template_view` AS
- select
+ select
vm_template.id,
vm_template.uuid,
vm_template.unique_name,
@@ -1920,7 +1920,7 @@ CREATE VIEW `cloud`.`template_view` AS
domain.path domain_path,
projects.id project_id,
projects.uuid project_uuid,
- projects.name project_name,
+ projects.name project_name,
data_center.id data_center_id,
data_center.uuid data_center_uuid,
data_center.name data_center_name,
@@ -1950,23 +1950,23 @@ CREATE VIEW `cloud`.`template_view` AS
from
`cloud`.`vm_template`
inner join
- `cloud`.`guest_os` ON guest_os.id = vm_template.guest_os_id
+ `cloud`.`guest_os` ON guest_os.id = vm_template.guest_os_id
inner join
`cloud`.`account` ON account.id = vm_template.account_id
inner join
`cloud`.`domain` ON domain.id = account.domain_id
left join
- `cloud`.`projects` ON projects.project_account_id = account.id
+ `cloud`.`projects` ON projects.project_account_id = account.id
left join
- `cloud`.`vm_template_details` ON vm_template_details.template_id =
vm_template.id
+ `cloud`.`vm_template_details` ON vm_template_details.template_id =
vm_template.id
left join
- `cloud`.`vm_template` source_template ON source_template.id =
vm_template.source_template_id
+ `cloud`.`vm_template` source_template ON source_template.id =
vm_template.source_template_id
left join
`cloud`.`template_store_ref` ON template_store_ref.template_id =
vm_template.id and template_store_ref.store_role = 'Image'
left join
- `cloud`.`image_store` ON image_store.removed is NULL AND
template_store_ref.store_id is not NULL AND image_store.id =
template_store_ref.store_id
+ `cloud`.`image_store` ON image_store.removed is NULL AND
template_store_ref.store_id is not NULL AND image_store.id =
template_store_ref.store_id
left join
- `cloud`.`template_zone_ref` ON template_zone_ref.template_id =
vm_template.id AND template_store_ref.store_id is NULL AND
template_zone_ref.removed is null
+ `cloud`.`template_zone_ref` ON template_zone_ref.template_id =
vm_template.id AND template_store_ref.store_id is NULL AND
template_zone_ref.removed is null
left join
`cloud`.`data_center` ON (image_store.data_center_id = data_center.id
OR template_zone_ref.zone_id = data_center.id)
left join
@@ -1974,7 +1974,7 @@ CREATE VIEW `cloud`.`template_view` AS
left join
`cloud`.`resource_tags` ON resource_tags.resource_id = vm_template.id
and (resource_tags.resource_type = 'Template' or
resource_tags.resource_type='ISO');
-
+
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'midonet.apiserver.address', 'http://localhost:8081',
'Specify the address at which the Midonet API server can be contacted (if using
Midonet)');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'midonet.providerrouter.id',
'd7c5e6a3-e2f4-426b-b728-b7ce6a0448e5', 'Specifies the UUID of the Midonet
provider router (if using Midonet)');
@@ -1996,7 +1996,7 @@ CREATE TABLE `cloud`.`account_vnet_map` (
ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD COLUMN account_vnet_map_id bigint
unsigned;
ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD CONSTRAINT
`fk_op_dc_vnet_alloc__account_vnet_map_id` FOREIGN KEY
`fk_op_dc_vnet_alloc__account_vnet_map_id` (`account_vnet_map_id`) REFERENCES
`account_vnet_map` (`id`);
-
+
update `cloud`.`vm_template` set state='Allocated' where state is NULL;
update `cloud`.`vm_template` set update_count=0 where update_count is NULL;
@@ -2100,7 +2100,7 @@ CREATE TABLE `cloud`.`vm_disk_statistics` (
CONSTRAINT `fk_vm_disk_statistics__account_id` FOREIGN KEY (`account_id`)
REFERENCES `account` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
-insert into
`cloud`.`vm_disk_statistics`(data_center_id,account_id,vm_id,volume_id)
+insert into
`cloud`.`vm_disk_statistics`(data_center_id,account_id,vm_id,volume_id)
select volumes.data_center_id, volumes.account_id, vm_instance.id, volumes.id
from volumes,vm_instance where vm_instance.vm_type="User" and
vm_instance.state<>"Expunging" and volumes.instance_id=vm_instance.id order by
vm_instance.id;
DROP TABLE IF EXISTS `cloud`.`ovs_providers`;
@@ -2166,7 +2166,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES
('Advanced', 'DEFAULT', 'manag
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'vm.disk.throttling.bytes_write_rate', 0, 'Default disk
I/O write rate in bytes per second allowed in User vm\'s disk. ');
-- Re-enable foreign key checking, at the end of the upgrade path
-SET foreign_key_checks = 1;
+SET foreign_key_checks = 1;
UPDATE `cloud`.`snapshot_policy` set uuid=id WHERE uuid is NULL;
#update shared sg enabled network with not null name in Advance Security Group
enabled network
@@ -2220,7 +2220,7 @@ CREATE TABLE
`cloud`.`external_stratosphere_ssp_credentials` (
DROP VIEW IF EXISTS `cloud`.`project_view`;
CREATE VIEW `cloud`.`project_view` AS
- select
+ select
projects.id,
projects.uuid,
projects.name,
@@ -2264,7 +2264,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES
('Network', 'DEFAULT', 'manage
ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections`
int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent
connections(global max)';
-
+
ALTER TABLE `cloud`.`sync_queue` MODIFY `queue_size` smallint(6) NOT NULL
DEFAULT '0' COMMENT 'number of items being processed by the queue';
ALTER TABLE `cloud`.`sync_queue` MODIFY `queue_size_limit` smallint(6) NOT
NULL DEFAULT '1' COMMENT 'max number of items the queue can process
concurrently';
@@ -2280,7 +2280,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES
('Advanced', 'DEFAULT', 'manag
#update the account_vmstats_view - count only user vms
DROP VIEW IF EXISTS `cloud`.`account_vmstats_view`;
CREATE VIEW `cloud`.`account_vmstats_view` AS
- SELECT
+ SELECT
account_id, state, count(*) as vmcount
from
`cloud`.`vm_instance`
@@ -2329,7 +2329,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES
("Advanced", 'DEFAULT', 'manag
DROP VIEW IF EXISTS `cloud`.`data_center_view`;
CREATE VIEW `cloud`.`data_center_view` AS
- select
+ select
data_center.id,
data_center.uuid,
data_center.name,
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
index fbbf0a2aef8..603e7712ebc 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
@@ -19,7 +19,7 @@
-- Schema upgrade from 4.13.1.0 to 4.14.0.0
--;
--- Update the description to indicate this only works with KVM + Ceph
+-- Update the description to indicate this only works with KVM + Ceph
-- (not implemented properly atm for KVM+NFS/local, and it accidentally works
with XS + NFS. Not applicable for VMware)
UPDATE `cloud`.`configuration` SET `description`='Indicates whether to always
backup primary storage snapshot to secondary storage. Keeping snapshots only on
Primary storage is applicable for KVM + Ceph only.' WHERE
`name`='snapshot.backup.to.secondary';
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql
b/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql
index b99af287bc5..25c025c5651 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-420to421.sql
@@ -20,10 +20,10 @@
--;
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 's3.singleupload.max.size', '5',
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 's3.singleupload.max.size', '5',
'The maximum size limit for S3 single part upload API(in GB). If it is set
to 0, then it means always use multi-part upload to upload object to S3. If it
is set to -1, then it means always use single-part upload to upload object to
S3.');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Storage", 'DEFAULT',
'management-server', "enable.ha.storage.migration", "true", "Enable/disable
storage migration across primary storage during HA");
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Storage", 'DEFAULT',
'management-server', "enable.ha.storage.migration", "true", "Enable/disable
storage migration across primary storage during HA");
UPDATE `cloud`.`configuration` SET description="Specify whether or not to
reserve CPU based on CPU overprovisioning factor" where
name="vmware.reserve.cpu";
UPDATE `cloud`.`configuration` SET description="Specify whether or not to
reserve memory based on memory overprovisioning factor" where
name="vmware.reserve.mem";
-- Remove Windows Server 8 from guest_os_type dropdown to use Windows Server
2012
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-442to450.sql
b/engine/schema/src/main/resources/META-INF/db/schema-442to450.sql
index 90a52bd4273..d2ba408241e 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-442to450.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-442to450.sql
@@ -671,7 +671,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
resource_tags.resource_id tag_resource_id,
resource_tags.resource_uuid tag_resource_uuid,
resource_tags.resource_type tag_resource_type,
- resource_tags.customer tag_customer,
+ resource_tags.customer tag_customer,
async_job.id job_id,
async_job.uuid job_uuid,
async_job.job_status job_status,
@@ -752,7 +752,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
left join
`cloud`.`user_vm_details` `custom_speed` ON (((`custom_speed`.`vm_id`
= `cloud`.`vm_instance`.`id`) and (`custom_speed`.`name` = 'CpuSpeed')))
left join
- `cloud`.`user_vm_details` `custom_ram_size` ON
(((`custom_ram_size`.`vm_id` = `cloud`.`vm_instance`.`id`) and
(`custom_ram_size`.`name` = 'memory')));
+ `cloud`.`user_vm_details` `custom_ram_size` ON
(((`custom_ram_size`.`vm_id` = `cloud`.`vm_instance`.`id`) and
(`custom_ram_size`.`name` = 'memory')));
INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name,
created) VALUES (231, UUID(), 1, 'CentOS 5 (32-bit)', utc_timestamp());
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql
b/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql
index 1868a090800..b8dd0477db9 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql
@@ -22,7 +22,7 @@
-- Added in CLOUDSTACK-9340: General DB optimization, 4 cases:
----- 1) Incorrect PRIMARY key
-ALTER TABLE `cloud`.`ovs_tunnel_network`
+ALTER TABLE `cloud`.`ovs_tunnel_network`
DROP PRIMARY KEY,
ADD PRIMARY KEY (`id`),
DROP INDEX `id` ,
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-481to490.sql
b/engine/schema/src/main/resources/META-INF/db/schema-481to490.sql
index 49cfc8346c5..bac3b1e6fab 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-481to490.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-481to490.sql
@@ -23,9 +23,9 @@ ALTER TABLE `event` ADD INDEX `archived` (`archived`);
ALTER TABLE `event` ADD INDEX `state` (`state`);
DROP VIEW IF EXISTS `cloud`.`template_view`;
-CREATE
+CREATE
VIEW `template_view` AS
- SELECT
+ SELECT
`vm_template`.`id` AS `id`,
`vm_template`.`uuid` AS `uuid`,
`vm_template`.`unique_name` AS `unique_name`,
@@ -124,9 +124,9 @@ VIEW `template_view` AS
OR (`resource_tags`.`resource_type` = 'ISO')))));
DROP VIEW IF EXISTS `cloud`.`volume_view`;
-CREATE
+CREATE
VIEW `volume_view` AS
- SELECT
+ SELECT
`volumes`.`id` AS `id`,
`volumes`.`uuid` AS `uuid`,
`volumes`.`name` AS `name`,
@@ -234,9 +234,9 @@ VIEW `volume_view` AS
AND (`async_job`.`job_status` = 0))));
DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
-CREATE
+CREATE
VIEW `user_vm_view` AS
- SELECT
+ SELECT
`vm_instance`.`id` AS `id`,
`vm_instance`.`name` AS `name`,
`user_vm`.`display_name` AS `display_name`,
@@ -423,10 +423,10 @@ ALTER TABLE `cloud`.`ssh_keypairs` ADD INDEX
`i_public_key` (`public_key` (64) A
ALTER TABLE `cloud`.`user_vm_details` ADD INDEX `i_name_vm_id` (`vm_id` ASC,
`name` ASC);
ALTER TABLE `cloud`.`instance_group` ADD INDEX `i_name` (`name` ASC);
------ 4) Some views query (Change view to improve account retrieval speed)
+----- 4) Some views query (Change view to improve account retrieval speed)
CREATE OR REPLACE
VIEW `account_vmstats_view` AS
- SELECT
+ SELECT
`vm_instance`.`account_id` AS `account_id`,
`vm_instance`.`state` AS `state`,
COUNT(0) AS `vmcount`
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-4930to41000.sql
b/engine/schema/src/main/resources/META-INF/db/schema-4930to41000.sql
index dc0cd6d4d75..23670757247 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-4930to41000.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-4930to41000.sql
@@ -147,7 +147,7 @@ CREATE TABLE IF NOT EXISTS `cloud`.`storage_pool_tags` (
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-- Insert storage tags from storage_pool_details
-INSERT INTO `cloud`.`storage_pool_tags` (pool_id, tag) SELECT pool_id,
+INSERT INTO `cloud`.`storage_pool_tags` (pool_id, tag) SELECT pool_id,
name FROM `cloud`.`storage_pool_details` WHERE value = 'true';
-- Alter view storage_pool_view
@@ -227,7 +227,7 @@ ALTER TABLE `cloud`.`vm_snapshots` ADD CONSTRAINT
`fk_vm_snapshots_service_offer
INSERT INTO `cloud`.`vm_snapshot_details` (vm_snapshot_id, name, value)
SELECT s.id, d.name, d.value
FROM `cloud`.`user_vm_details` d JOIN `cloud`.`vm_instance` v ON (d.vm_id =
v.id)
-JOIN `cloud`.`service_offering` o ON (v.service_offering_id = o.id)
+JOIN `cloud`.`service_offering` o ON (v.service_offering_id = o.id)
JOIN `cloud`.`vm_snapshots` s ON (s.service_offering_id = o.id AND s.vm_id =
v.id)
WHERE (o.cpu is null AND o.speed IS NULL AND o.ram_size IS NULL) AND
(d.name = 'cpuNumber' OR d.name = 'cpuSpeed' OR d.name = 'memory');
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-level.sql
b/engine/schema/src/main/resources/META-INF/db/schema-level.sql
index 72aade4e501..fef961502fa 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-level.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-level.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-snapshot-217to224.sql
b/engine/schema/src/main/resources/META-INF/db/schema-snapshot-217to224.sql
index 7320bda5906..5e29435855d 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-snapshot-217to224.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-snapshot-217to224.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/engine/schema/src/main/resources/META-INF/db/schema-snapshot-223to224.sql
b/engine/schema/src/main/resources/META-INF/db/schema-snapshot-223to224.sql
index 668cbb692b9..5c27eed68f0 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-snapshot-223to224.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-snapshot-223to224.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/packaging/centos7/replace.properties
b/packaging/centos7/replace.properties
index 8c3560dd462..18b4a770a88 100644
--- a/packaging/centos7/replace.properties
+++ b/packaging/centos7/replace.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/packaging/centos8/replace.properties
b/packaging/centos8/replace.properties
index 8f1fb11f999..efeab01166e 100644
--- a/packaging/centos8/replace.properties
+++ b/packaging/centos8/replace.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/packaging/debian/replace.properties
b/packaging/debian/replace.properties
index 5007360a2b7..db88310d81c 100644
--- a/packaging/debian/replace.properties
+++ b/packaging/debian/replace.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/services/console-proxy/rdpconsole/README.txt
b/services/console-proxy/rdpconsole/README.txt
index d067ef9a559..4912d79d0f1 100644
--- a/services/console-proxy/rdpconsole/README.txt
+++ b/services/console-proxy/rdpconsole/README.txt
@@ -16,7 +16,7 @@
// under the License.
This project contains code for basic VNC, RDP, and HyperV (RDP) clients.
-Usage:
+Usage:
java common.Client vnc|rdp|hyperv OPTIONS
Common options:
diff --git a/setup/db/22beta4to22GA.sql b/setup/db/22beta4to22GA.sql
index 913afb19780..189ff1bb72c 100644
--- a/setup/db/22beta4to22GA.sql
+++ b/setup/db/22beta4to22GA.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,7 @@
--step 1
-- drop all constraints for user_ip_address
ALTER TABLE firewall_rules DROP foreign key fk_firewall_rules__ip_address ;
-ALTER TABLE remote_access_vpn DROP foreign key
fk_remote_access_vpn__server_addr ;
+ALTER TABLE remote_access_vpn DROP foreign key
fk_remote_access_vpn__server_addr ;
ALTER TABLE user_ip_address DROP primary key;
@@ -56,7 +56,7 @@ ALTER TABLE `cloud`.`remote_access_vpn` DROP COLUMN
vpn_server_addr;
--step 2C
DROP VIEW if exists user_ip_address_view;
ALTER TABLE `cloud`.`user_ip_address` ADD COLUMN `public_ip_address1` char(40)
NOT NULL COMMENT 'the public ip address';
-UPDATE user_ip_address SET public_ip_address1 = INET_NTOA(public_ip_address);
+UPDATE user_ip_address SET public_ip_address1 = INET_NTOA(public_ip_address);
ALTER TABLE `cloud`.`user_ip_address` DROP COLUMN public_ip_address;
ALTER TABLE `cloud`.`user_ip_address` CHANGE public_ip_address1
public_ip_address char(40) NOT NULL COMMENT 'the public ip address';
diff --git a/setup/db/create-database-premium.sql
b/setup/db/create-database-premium.sql
index 18af181a56d..d062bb5f932 100644
--- a/setup/db/create-database-premium.sql
+++ b/setup/db/create-database-premium.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/create-database-simulator.sql
b/setup/db/create-database-simulator.sql
index b61ce1b8d40..15b02fd98c0 100644
--- a/setup/db/create-database-simulator.sql
+++ b/setup/db/create-database-simulator.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/create-database.sql b/setup/db/create-database.sql
index 81e13f9fe22..d0f62ee8b8e 100644
--- a/setup/db/create-database.sql
+++ b/setup/db/create-database.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,17 +28,17 @@ BEGIN
INTO foo
FROM `mysql`.`user`
WHERE `User` = 'cloud' and host = 'localhost';
-
- IF foo > 0 THEN
+
+ IF foo > 0 THEN
DROP USER 'cloud'@'localhost' ;
END IF;
-
+
SELECT COUNT(*)
INTO foo
FROM `mysql`.`user`
WHERE `User` = 'cloud' and host = '%';
-
- IF foo > 0 THEN
+
+ IF foo > 0 THEN
DROP USER 'cloud'@'%' ;
END IF;
END $$
diff --git a/setup/db/create-schema-premium.sql
b/setup/db/create-schema-premium.sql
index d8d60ff012e..ae4eddf1bd3 100644
--- a/setup/db/create-schema-premium.sql
+++ b/setup/db/create-schema-premium.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -220,7 +220,7 @@ CREATE TABLE `cloud_usage`.`usage_event` (
`offering_id` bigint unsigned,
`template_id` bigint unsigned,
`size` bigint unsigned,
- `resource_type` varchar(32),
+ `resource_type` varchar(32),
`processed` tinyint NOT NULL default '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -248,7 +248,7 @@ CREATE TABLE `cloud_usage`.`usage_network_offering` (
`network_offering_id` bigint unsigned NOT NULL,
`is_default` smallint(1) NOT NULL,
`created` DATETIME NOT NULL,
- `deleted` DATETIME NULL
+ `deleted` DATETIME NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX
`i_usage_network_offering__account_id`(`account_id`);
@@ -276,7 +276,7 @@ CREATE TABLE `cloud_usage`.`usage_security_group` (
`vm_instance_id` bigint unsigned NOT NULL,
`security_group_id` bigint unsigned NOT NULL,
`created` DATETIME NOT NULL,
- `deleted` DATETIME NULL
+ `deleted` DATETIME NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX
`i_usage_security_group__account_id`(`account_id`);
diff --git a/setup/db/create-schema-simulator.sql
b/setup/db/create-schema-simulator.sql
index 4bab391b279..73896af1f12 100644
--- a/setup/db/create-schema-simulator.sql
+++ b/setup/db/create-schema-simulator.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/data-20to21.sql b/setup/db/data-20to21.sql
index d59b4833561..3b8306b5249 100644
--- a/setup/db/data-20to21.sql
+++ b/setup/db/data-20to21.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,11 +27,11 @@ START TRANSACTION;
UPDATE service_offering SET guest_ip_type='VirtualNetwork';
UPDATE vlan SET vlan_type='VirtualNetwork';
-INSERT INTO configuration (`category`, `instance`, `component`, `name`,
`value`, `description`) VALUES ('Advanced', 'DEFAULT', 'management-server',
'linkLocalIp.nums', '10', 'The number of link local ip that needed by domR(in
power of 2)');
+INSERT INTO configuration (`category`, `instance`, `component`, `name`,
`value`, `description`) VALUES ('Advanced', 'DEFAULT', 'management-server',
'linkLocalIp.nums', '10', 'The number of link local ip that needed by domR(in
power of 2)');
UPDATE host SET
resource='com.cloud.hypervisor.xen.resource.XenServer56Resource' WHERE
resource='com.cloud.resource.xen.XenServer56Resource';
--
--- Delete orphan records to deal with DELETE ON CASCADE missing in following
two tables
+-- Delete orphan records to deal with DELETE ON CASCADE missing in following
two tables
--
DELETE FROM console_proxy where id NOT IN (SELECT id FROM vm_instance WHERE
type='ConsoleProxy');
DELETE FROM secondary_storage_vm where id NOT IN (SELECT id FROM vm_instance
WHERE type='SecondaryStorageVm');
diff --git a/setup/db/data-22beta1to22beta2.sql
b/setup/db/data-22beta1to22beta2.sql
index eb922989e33..31712abf45c 100644
--- a/setup/db/data-22beta1to22beta2.sql
+++ b/setup/db/data-22beta1to22beta2.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/index-20to21.sql b/setup/db/index-20to21.sql
index 43210e576aa..195705bc99e 100644
--- a/setup/db/index-20to21.sql
+++ b/setup/db/index-20to21.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/index-212to213.sql b/setup/db/index-212to213.sql
index 348c5131cb5..8951f4eff3a 100644
--- a/setup/db/index-212to213.sql
+++ b/setup/db/index-212to213.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/postprocess-20to21.sql b/setup/db/postprocess-20to21.sql
index 9ad0b0c0473..a77c48647ad 100644
--- a/setup/db/postprocess-20to21.sql
+++ b/setup/db/postprocess-20to21.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/server-setup.sql b/setup/db/server-setup.sql
index 1c4635c72ca..e2cc297d782 100644
--- a/setup/db/server-setup.sql
+++ b/setup/db/server-setup.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/templates.simulator.sql b/setup/db/templates.simulator.sql
index ac09c05937f..1f8f51ef7b5 100755
--- a/setup/db/templates.simulator.sql
+++ b/setup/db/templates.simulator.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 3f154acc797..8e8f7b7f804 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/test/conf/deploy.properties b/test/conf/deploy.properties
index 640ccfce844..321f970cae1 100644
--- a/test/conf/deploy.properties
+++ b/test/conf/deploy.properties
@@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/test/conf/log4j-stdout.properties
b/test/conf/log4j-stdout.properties
index 51c90854fb3..a5a16af9dcb 100644
--- a/test/conf/log4j-stdout.properties
+++ b/test/conf/log4j-stdout.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/test/conf/log4j.properties b/test/conf/log4j.properties
index 2c8eae6d6b7..4bc91563394 100644
--- a/test/conf/log4j.properties
+++ b/test/conf/log4j.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/test/conf/tool.properties b/test/conf/tool.properties
index 942d92af400..c23550c925a 100644
--- a/test/conf/tool.properties
+++ b/test/conf/tool.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/test/metadata/func/error_events.properties
b/test/metadata/func/error_events.properties
index 4d440e6981c..e6909b42ec5 100644
--- a/test/metadata/func/error_events.properties
+++ b/test/metadata/func/error_events.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/test/metadata/func/regression_events.properties
b/test/metadata/func/regression_events.properties
index 331536370d4..800248fb99f 100644
--- a/test/metadata/func/regression_events.properties
+++ b/test/metadata/func/regression_events.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/test/scripts/usercloud.properties
b/test/scripts/usercloud.properties
index 514e98058a6..e2b647e5de2 100644
--- a/test/scripts/usercloud.properties
+++ b/test/scripts/usercloud.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/devcloud-kvm/devcloud-kvm.sql
b/tools/devcloud-kvm/devcloud-kvm.sql
index 4759ddb4d1f..9ddb4a78071 100644
--- a/tools/devcloud-kvm/devcloud-kvm.sql
+++ b/tools/devcloud-kvm/devcloud-kvm.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/devcloud-kvm/kvm.properties
b/tools/devcloud-kvm/kvm.properties
index 79afcd4a8ea..a393a138f34 100644
--- a/tools/devcloud-kvm/kvm.properties
+++ b/tools/devcloud-kvm/kvm.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/devcloud4/prefill.sql b/tools/devcloud4/prefill.sql
index 4213cd9d68b..00dc69620f8 100644
--- a/tools/devcloud4/prefill.sql
+++ b/tools/devcloud4/prefill.sql
@@ -5,9 +5,9 @@
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/marvin/CHANGES.txt b/tools/marvin/CHANGES.txt
index 262c8845f72..9dd23677135 100644
--- a/tools/marvin/CHANGES.txt
+++ b/tools/marvin/CHANGES.txt
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/marvin/DISCLAIMER.txt b/tools/marvin/DISCLAIMER.txt
index fa1e9261a36..d3b58164b7c 100644
--- a/tools/marvin/DISCLAIMER.txt
+++ b/tools/marvin/DISCLAIMER.txt
@@ -1,7 +1,7 @@
-Apache CloudStack is an effort undergoing incubation at The Apache Software
Foundation (ASF),
-sponsored by the Apache Incubator. Incubation is required of all newly
accepted
-projects until a further review indicates that the infrastructure,
communications, and
-decision making process have stabilized in a manner consistent with other
successful ASF
-projects. While incubation status is not necessarily a reflection of the
completeness or
-stability of the code, it does indicate that the project has yet to be fully
endorsed by
+Apache CloudStack is an effort undergoing incubation at The Apache Software
Foundation (ASF),
+sponsored by the Apache Incubator. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure,
communications, and
+decision making process have stabilized in a manner consistent with other
successful ASF
+projects. While incubation status is not necessarily a reflection of the
completeness or
+stability of the code, it does indicate that the project has yet to be fully
endorsed by
the ASF.
diff --git a/tools/marvin/marvin/misc/build/kvm.properties
b/tools/marvin/marvin/misc/build/kvm.properties
index 1f372c6b424..28178c880cc 100644
--- a/tools/marvin/marvin/misc/build/kvm.properties
+++ b/tools/marvin/marvin/misc/build/kvm.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/marvin/marvin/misc/build/xen.properties
b/tools/marvin/marvin/misc/build/xen.properties
index cffa28c55b9..ca76c38f53c 100644
--- a/tools/marvin/marvin/misc/build/xen.properties
+++ b/tools/marvin/marvin/misc/build/xen.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/marvin/marvin/sandbox/advanced/setup.properties
b/tools/marvin/marvin/sandbox/advanced/setup.properties
index 73eacc938d4..89aa4616aa8 100644
--- a/tools/marvin/marvin/sandbox/advanced/setup.properties
+++ b/tools/marvin/marvin/sandbox/advanced/setup.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/marvin/marvin/sandbox/advancedsg/setup.properties
b/tools/marvin/marvin/sandbox/advancedsg/setup.properties
index ee07ce23938..26f7e478913 100644
--- a/tools/marvin/marvin/sandbox/advancedsg/setup.properties
+++ b/tools/marvin/marvin/sandbox/advancedsg/setup.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/marvin/marvin/sandbox/basic/setup.properties
b/tools/marvin/marvin/sandbox/basic/setup.properties
index 8833b507252..5b1aa90c8ae 100644
--- a/tools/marvin/marvin/sandbox/basic/setup.properties
+++ b/tools/marvin/marvin/sandbox/basic/setup.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git
a/tools/marvin/marvin/sandbox/demo/simulator/simulatordemo.properties
b/tools/marvin/marvin/sandbox/demo/simulator/simulatordemo.properties
index 9d9f14b70a4..353ce044d12 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/simulatordemo.properties
+++ b/tools/marvin/marvin/sandbox/demo/simulator/simulatordemo.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/tools/transifex/README-transifex.txt
b/tools/transifex/README-transifex.txt
index 7079331f848..ca02f88eb99 100644
--- a/tools/transifex/README-transifex.txt
+++ b/tools/transifex/README-transifex.txt
@@ -45,13 +45,13 @@ with the translatons from traductors.
=====
The sync-transifex-ui provide too the ability to :
-* Download from Transifex the source language resource files. Be carrefully,
+* Download from Transifex the source language resource files. Be carrefully,
with this, you can remove some transaction on Transifex if some keys has
been removed inside the source language resource files.
./sync-transifex-ui.sh download-source-language CloudStack_UI.410_messagesjson
-* Upload the L10N resource files on Transifex.
+* Upload the L10N resource files on Transifex.
./sync-transifex-ui.sh upload-l10n-languages CloudStack_UI.410_messagesjson
