You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2012/12/22 00:12:24 UTC
[2/2] git commit: Update DB version during DB deploy 1. Modified
create-schema.sql to add version as 4.1.0 instead of 4.0.0 2. Removed
schema-40to41.sql amd moved the content to schema-40to410.sql 3. Added to
schema-40to410.sql Upgrade40to41.java
Update DB version during DB deploy
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
3. Added to schema-40to410.sql Upgrade40to41.java
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade40to41.java
setup/db/create-schema.sql
setup/db/db/schema-40to41.sql
setup/db/db/schema-40to410.sql
Signed-off-by: Min Chen <mi...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3ae5986b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3ae5986b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3ae5986b
Branch: refs/heads/api_refactoring
Commit: 3ae5986b87852c094f2412b22345bc4d10cb3ade
Parents: c7e1cb6
Author: Kishan Kavala <ki...@cloud.com>
Authored: Fri Dec 21 15:27:00 2012 +0530
Committer: Min Chen <mi...@citrix.com>
Committed: Fri Dec 21 15:11:05 2012 -0800
----------------------------------------------------------------------
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 6 +-
setup/db/create-schema.sql | 8 +-
setup/db/db/schema-40to41.sql | 541 -------------
setup/db/db/schema-40to410.sql | 585 +++++++++++++++
4 files changed, 593 insertions(+), 547 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ae5986b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
index a3fb2ea..3ba0ed8 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
@@ -27,7 +27,7 @@ import com.cloud.utils.script.Script;
* @author htrippaers
*
*/
-public class Upgrade40to41 extends Upgrade30xBase implements DbUpgrade {
+public class Upgrade40to41 implements DbUpgrade {
/**
*
@@ -65,9 +65,9 @@ public class Upgrade40to41 extends Upgrade30xBase implements DbUpgrade {
*/
@Override
public File[] getPrepareScripts() {
- String script = Script.findScript("", "db/schema-40to41.sql");
+ String script = Script.findScript("", "db/schema-40to410.sql");
if (script == null) {
- throw new CloudRuntimeException("Unable to find db/schema-40to41.sql");
+ throw new CloudRuntimeException("Unable to find db/schema-40to410.sql");
}
return new File[] { new File(script) };
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ae5986b/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index c01a5cd..365ff96 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -164,7 +164,8 @@ CREATE TABLE `cloud`.`version` (
INDEX `i_version__version`(`version`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-INSERT INTO `version` (`version`, `updated`, `step`) VALUES('@VERSION@', now(), 'Complete');
+
+INSERT INTO `version` (`version`, `updated`, `step`) VALUES('4.1.0', now(), 'Complete');
CREATE TABLE `cloud`.`op_it_work` (
`id` char(40) COMMENT 'reservation id',
@@ -1115,6 +1116,7 @@ CREATE TABLE `cloud`.`upload` (
`id` bigint unsigned NOT NULL auto_increment,
`host_id` bigint unsigned NOT NULL,
`type_id` bigint unsigned NOT NULL,
+ `uuid` varchar(40),
`type` varchar(255),
`mode` varchar(255),
`created` DATETIME NOT NULL,
@@ -1337,7 +1339,7 @@ CREATE TABLE `cloud`.`async_job` (
`session_key` varchar(64) COMMENT 'all async-job manage to apply session based security enforcement',
`instance_type` varchar(64) COMMENT 'instance_type and instance_id work together to allow attaching an instance object to a job',
`instance_id` bigint unsigned,
- `job_cmd` varchar(64) NOT NULL COMMENT 'command name',
+ `job_cmd` varchar(255) NOT NULL COMMENT 'command name',
`job_cmd_originator` varchar(64) COMMENT 'command originator',
`job_cmd_info` text COMMENT 'command parameter info',
`job_cmd_ver` int(1) COMMENT 'command version',
@@ -2511,7 +2513,7 @@ INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (100,'net
SET foreign_key_checks = 1;
-ALTER TABLE upload ADD uuid VARCHAR(40);
+
--- DB views for list api ---
DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ae5986b/setup/db/db/schema-40to41.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to41.sql b/setup/db/db/schema-40to41.sql
deleted file mode 100755
index d94aed8..0000000
--- a/setup/db/db/schema-40to41.sql
+++ /dev/null
@@ -1,541 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- 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
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- Schema upgrade from 4.0 to 4.1;
-
-ALTER TABLE upload ADD uuid VARCHAR(40);
-
--- populate uuid column with db id if uuid is null
-UPDATE `cloud`.`account` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`alert` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`async_job` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`cluster` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`data_center` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`disk_offering` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`domain` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`event` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`external_firewall_devices` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`external_load_balancer_devices` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`external_nicira_nvp_devices` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`firewall_rules` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`guest_os` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`guest_os_category` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`host` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`host_pod_ref` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`hypervisor_capabilities` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`instance_group` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`load_balancer_stickiness_policies` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`network_external_firewall_device_map` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`network_external_lb_device_map` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`network_offerings` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`networks` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`nics` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`physical_network` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`physical_network_service_providers` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`physical_network_traffic_types` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`port_profile` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`project_invitations` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`projects` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`resource_tags` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`s2s_customer_gateway` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`s2s_vpn_connection` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`s2s_vpn_gateway` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`security_group` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`security_group_rule` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`snapshot_schedule` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`snapshots` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`static_routes` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`storage_pool` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`swift` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`upload` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`user` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`user_ip_address` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`user_vm_temp` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`virtual_router_providers` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`virtual_supervisor_module` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`vlan` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`vm_instance` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`vm_template` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`vpc` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`vpc_gateways` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`vpc_offerings` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`vpn_users` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`volumes` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`autoscale_vmgroups` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`autoscale_vmprofiles` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`autoscale_policies` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`counter` set uuid=id WHERE uuid is NULL;
-UPDATE `cloud`.`conditions` set uuid=id WHERE uuid is NULL;
-
-
---- DB views for list api ---
-DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
-CREATE VIEW `cloud`.`user_vm_view` AS
-select
-vm_instance.id id,
-vm_instance.name name,
-user_vm.display_name display_name,
-user_vm.user_data user_data,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name,
-instance_group.id instance_group_id,
-instance_group.uuid instance_group_uuid,
-instance_group.name instance_group_name,
-vm_instance.uuid uuid,
-vm_instance.last_host_id last_host_id,
-vm_instance.vm_type type,
-vm_instance.vnc_password vnc_password,
-vm_instance.limit_cpu_use limit_cpu_use,
-vm_instance.created created,
-vm_instance.state state,
-vm_instance.removed removed,
-vm_instance.ha_enabled ha_enabled,
-vm_instance.hypervisor_type hypervisor_type,
-vm_instance.instance_name instance_name,
-vm_instance.guest_os_id guest_os_id,
-guest_os.uuid guest_os_uuid,
-vm_instance.pod_id pod_id,
-host_pod_ref.uuid pod_uuid,
-vm_instance.private_ip_address private_ip_address,
-vm_instance.private_mac_address private_mac_address,
-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.is_security_group_enabled security_group_enabled,
-host.id host_id,
-host.uuid host_uuid,
-host.name host_name,
-vm_template.id template_id,
-vm_template.uuid template_uuid,
-vm_template.name template_name,
-vm_template.display_text template_display_text,
-vm_template.enable_password password_enabled,
-iso.id iso_id,
-iso.uuid iso_uuid,
-iso.name iso_name,
-iso.display_text iso_display_text,
-service_offering.id service_offering_id,
-disk_offering.uuid service_offering_uuid,
-service_offering.cpu cpu,
-service_offering.speed speed,
-service_offering.ram_size ram_size,
-disk_offering.name service_offering_name,
-storage_pool.id pool_id,
-storage_pool.uuid pool_uuid,
-storage_pool.pool_type pool_type,
-volumes.id volume_id,
-volumes.uuid volume_uuid,
-volumes.device_id volume_device_id,
-volumes.volume_type volume_type,
-security_group.id security_group_id,
-security_group.uuid security_group_uuid,
-security_group.name security_group_name,
-security_group.description security_group_description,
-nics.id nic_id,
-nics.uuid nic_uuid,
-nics.network_id network_id,
-nics.ip4_address ip_address,
-nics.default_nic is_default_nic,
-nics.gateway gateway,
-nics.netmask netmask,
-nics.mac_address mac_address,
-nics.broadcast_uri broadcast_uri,
-nics.isolation_uri isolation_uri,
-vpc.id vpc_id,
-vpc.uuid vpc_uuid,
-networks.uuid network_uuid,
-networks.traffic_type traffic_type,
-networks.guest_type guest_type,
-user_ip_address.id public_ip_id,
-user_ip_address.uuid public_ip_uuid,
-user_ip_address.public_ip_address public_ip_address,
-ssh_keypairs.keypair_name keypair_name,
-resource_tags.id tag_id,
-resource_tags.uuid tag_uuid,
-resource_tags.key tag_key,
-resource_tags.value tag_value,
-resource_tags.domain_id tag_domain_id,
-resource_tags.account_id tag_account_id,
-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,
-async_job.id job_id,
-async_job.uuid job_uuid,
-async_job.job_status job_status,
-async_job.account_id job_account_id
-from user_vm
-inner join vm_instance on vm_instance.id = user_vm.id and vm_instance.removed is NULL
-inner join account on vm_instance.account_id=account.id
-inner join domain on vm_instance.domain_id=domain.id
-left join guest_os on vm_instance.guest_os_id = guest_os.id
-left join host_pod_ref on vm_instance.pod_id = host_pod_ref.id
-left join projects on projects.project_account_id = account.id
-left join instance_group_vm_map on vm_instance.id=instance_group_vm_map.instance_id
-left join instance_group on instance_group_vm_map.group_id=instance_group.id
-left join data_center on vm_instance.data_center_id=data_center.id
-left join host on vm_instance.host_id=host.id
-left join vm_template on vm_instance.vm_template_id=vm_template.id
-left join vm_template iso on iso.id=user_vm.iso_id
-left join service_offering on vm_instance.service_offering_id=service_offering.id
-left join disk_offering on vm_instance.service_offering_id=disk_offering.id
-left join volumes on vm_instance.id=volumes.instance_id
-left join storage_pool on volumes.pool_id=storage_pool.id
-left join security_group_vm_map on vm_instance.id=security_group_vm_map.instance_id
-left join security_group on security_group_vm_map.security_group_id=security_group.id
-left join nics on vm_instance.id=nics.instance_id
-left join networks on nics.network_id=networks.id
-left join vpc on networks.vpc_id = vpc.id
-left join user_ip_address on user_ip_address.vm_id=vm_instance.id
-left join user_vm_details on user_vm_details.vm_id=vm_instance.id and user_vm_details.name = "SSH.PublicKey"
-left join ssh_keypairs on ssh_keypairs.public_key = user_vm_details.value
-left join resource_tags on resource_tags.resource_id = vm_instance.id and resource_tags.resource_type = "UserVm"
-left join async_job on async_job.instance_id = vm_instance.id and async_job.instance_type = "VirtualMachine" and async_job.job_status = 0;
-
-DROP VIEW IF EXISTS `cloud`.`domain_router_view`;
-CREATE VIEW domain_router_view AS
-select
-vm_instance.id id,
-vm_instance.name name,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name,
-vm_instance.uuid uuid,
-vm_instance.created created,
-vm_instance.state state,
-vm_instance.removed removed,
-vm_instance.pod_id pod_id,
-vm_instance.instance_name instance_name,
-host_pod_ref.uuid pod_uuid,
-data_center.id data_center_id,
-data_center.uuid data_center_uuid,
-data_center.name data_center_name,
-data_center.dns1 dns1,
-data_center.dns2 dns2,
-host.id host_id,
-host.uuid host_uuid,
-host.name host_name,
-vm_template.id template_id,
-vm_template.uuid template_uuid,
-service_offering.id service_offering_id,
-disk_offering.uuid service_offering_uuid,
-disk_offering.name service_offering_name,
-nics.id nic_id,
-nics.uuid nic_uuid,
-nics.network_id network_id,
-nics.ip4_address ip_address,
-nics.default_nic is_default_nic,
-nics.gateway gateway,
-nics.netmask netmask,
-nics.mac_address mac_address,
-nics.broadcast_uri broadcast_uri,
-nics.isolation_uri isolation_uri,
-vpc.id vpc_id,
-vpc.uuid vpc_uuid,
-networks.uuid network_uuid,
-networks.name network_name,
-networks.network_domain network_domain,
-networks.traffic_type traffic_type,
-networks.guest_type guest_type,
-async_job.id job_id,
-async_job.uuid job_uuid,
-async_job.job_status job_status,
-async_job.account_id job_account_id,
-domain_router.template_version template_version,
-domain_router.scripts_version scripts_version,
-domain_router.is_redundant_router is_redundant_router,
-domain_router.redundant_state redundant_state,
-domain_router.stop_pending stop_pending
-from domain_router
-inner join vm_instance on vm_instance.id = domain_router.id
-inner join account on vm_instance.account_id=account.id
-inner join domain on vm_instance.domain_id=domain.id
-left join host_pod_ref on vm_instance.pod_id = host_pod_ref.id
-left join projects on projects.project_account_id = account.id
-left join data_center on vm_instance.data_center_id=data_center.id
-left join host on vm_instance.host_id=host.id
-left join vm_template on vm_instance.vm_template_id=vm_template.id
-left join service_offering on vm_instance.service_offering_id=service_offering.id
-left join disk_offering on vm_instance.service_offering_id=disk_offering.id
-left join volumes on vm_instance.id=volumes.instance_id
-left join storage_pool on volumes.pool_id=storage_pool.id
-left join nics on vm_instance.id=nics.instance_id
-left join networks on nics.network_id=networks.id
-left join vpc on networks.vpc_id = vpc.id
-left join async_job on async_job.instance_id = vm_instance.id and async_job.instance_type = "DomainRouter" and async_job.job_status = 0;
-
-DROP VIEW IF EXISTS `cloud`.`security_group_view`;
-CREATE VIEW security_group_view AS
-select
-security_group.id id,
-security_group.name name,
-security_group.description description,
-security_group.uuid uuid,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name,
-security_group_rule.id rule_id,
-security_group_rule.uuid rule_uuid,
-security_group_rule.type rule_type,
-security_group_rule.start_port rule_start_port,
-security_group_rule.end_port rule_end_port,
-security_group_rule.protocol rule_protocol,
-security_group_rule.allowed_network_id rule_allowed_network_id,
-security_group_rule.allowed_ip_cidr rule_allowed_ip_cidr,
-security_group_rule.create_status rule_create_status,
-resource_tags.id tag_id,
-resource_tags.uuid tag_uuid,
-resource_tags.key tag_key,
-resource_tags.value tag_value,
-resource_tags.domain_id tag_domain_id,
-resource_tags.account_id tag_account_id,
-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,
-async_job.id job_id,
-async_job.uuid job_uuid,
-async_job.job_status job_status,
-async_job.account_id job_account_id
-from security_group
-left join security_group_rule on security_group.id = security_group_rule.security_group_id
-inner join account on security_group.account_id=account.id
-inner join domain on security_group.domain_id=domain.id
-left join projects on projects.project_account_id = security_group.account_id
-left join resource_tags on resource_tags.resource_id = security_group.id and resource_tags.resource_type = "SecurityGroup"
-left join async_job on async_job.instance_id = security_group.id and async_job.instance_type = "SecurityGroup" and async_job.job_status = 0;
-
-DROP VIEW IF EXISTS `cloud`.`resource_tag_view`;
-CREATE VIEW resource_tag_view AS
-select
-resource_tags.id,
-resource_tags.uuid,
-resource_tags.key,
-resource_tags.value,
-resource_tags.resource_id,
-resource_tags.resource_uuid,
-resource_tags.resource_type,
-resource_tags.customer,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name
-from resource_tags
-inner join account on resource_tags.account_id=account.id
-inner join domain on resource_tags.domain_id=domain.id
-left join projects on projects.project_account_id = resource_tags.account_id;
-
-
-DROP VIEW IF EXISTS `cloud`.`event_view`;
-CREATE VIEW event_view AS
-select
-event.id,
-event.uuid,
-event.type,
-event.state,
-event.description,
-event.created,
-event.level,
-event.parameters,
-event.start_id,
-eve.uuid start_uuid,
-event.user_id,
-user.username user_name,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name
-from event
-inner join account on event.account_id=account.id
-inner join domain on event.domain_id=domain.id
-inner join user on event.user_id = user.id
-left join projects on projects.project_account_id = event.account_id
-left join event eve on event.start_id = eve.id;
-
-DROP VIEW IF EXISTS `cloud`.`instance_group_view`;
-CREATE VIEW instance_group_view AS
-select
-instance_group.id,
-instance_group.uuid,
-instance_group.name,
-instance_group.removed,
-instance_group.created,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name
-from instance_group
-inner join account on instance_group.account_id=account.id
-inner join domain on account.domain_id=domain.id
-left join projects on projects.project_account_id = instance_group.account_id;
-
-DROP VIEW IF EXISTS `cloud`.`user_view`;
-CREATE VIEW user_view AS
-select
-user.id,
-user.uuid,
-user.username,
-user.password,
-user.firstname,
-user.lastname,
-user.email,
-user.state,
-user.api_key,
-user.secret_key,
-user.created,
-user.removed,
-user.timezone,
-user.registration_token,
-user.is_registered,
-user.incorrect_login_attempts,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path
-from user
-inner join account on user.account_id = account.id
-inner join domain on account.domain_id=domain.id;
-
-DROP VIEW IF EXISTS `cloud`.`project_view`;
-CREATE VIEW project_view AS
-select
-projects.id,
-projects.uuid,
-projects.name,
-projects.display_text,
-projects.state,
-projects.removed,
-projects.created,
-account.account_name owner,
-pacct.account_id,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path,
-resource_tags.id tag_id,
-resource_tags.uuid tag_uuid,
-resource_tags.key tag_key,
-resource_tags.value tag_value,
-resource_tags.domain_id tag_domain_id,
-resource_tags.account_id tag_account_id,
-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
-from projects
-inner join domain on projects.domain_id=domain.id
-inner join project_account on projects.id = project_account.project_id and project_account.account_role = "Admin"
-inner join account on account.id = project_account.account_id
-left join resource_tags on resource_tags.resource_id = projects.id and resource_tags.resource_type = "Project"
-left join project_account pacct on projects.id = pacct.project_id;
-
-DROP VIEW IF EXISTS `cloud`.`project_account_view`;
-CREATE VIEW project_account_view AS
-select
-project_account.id,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name,
-account.type account_type,
-project_account.account_role,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path
-from project_account
-inner join account on project_account.account_id = account.id
-inner join domain on account.domain_id=domain.id
-inner join projects on projects.id = project_account.project_id;
-
-DROP VIEW IF EXISTS `cloud`.`project_invitation_view`;
-CREATE VIEW project_invitation_view AS
-select
-project_invitations.id,
-project_invitations.uuid,
-project_invitations.email,
-project_invitations.created,
-project_invitations.state,
-projects.id project_id,
-projects.uuid project_uuid,
-projects.name project_name,
-account.id account_id,
-account.uuid account_uuid,
-account.account_name,
-account.type account_type,
-domain.id domain_id,
-domain.uuid domain_uuid,
-domain.name domain_name,
-domain.path domain_path
-from project_invitations
-left join account on project_invitations.account_id = account.id
-left join domain on project_invitations.domain_id=domain.id
-left join projects on projects.id = project_invitations.project_id;
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ae5986b/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
new file mode 100644
index 0000000..2ebea02
--- /dev/null
+++ b/setup/db/db/schema-40to410.sql
@@ -0,0 +1,585 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- 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
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+--;
+-- Schema upgrade from 4.0.0 to 4.1.0;
+--;
+
+CREATE TABLE `cloud`.`s3` (
+ `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `uuid` varchar(40),
+ `access_key` varchar(20) NOT NULL COMMENT ' The S3 access key',
+ `secret_key` varchar(40) NOT NULL COMMENT ' The S3 secret key',
+ `end_point` varchar(1024) COMMENT ' The S3 host',
+ `bucket` varchar(63) NOT NULL COMMENT ' The S3 host',
+ `https` tinyint unsigned DEFAULT NULL COMMENT ' Flag indicating whether or not to connect over HTTPS',
+ `connection_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) when initially establishing a connection before giving up and timing out.',
+ `max_error_retry` integer COMMENT ' The maximum number of retry attempts for failed retryable requests (ex: 5xx error responses from services).',
+ `socket_timeout` integer COMMENT ' The amount of time to wait (in milliseconds) for data to be transfered over an established, open connection before the connection times out and is closed.',
+ `created` datetime COMMENT 'date the s3 first signed on',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `uc_s3__uuid` UNIQUE (`uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `cloud`.`template_s3_ref` (
+ `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `s3_id` bigint unsigned NOT NULL COMMENT ' Associated S3 instance id',
+ `template_id` bigint unsigned NOT NULL COMMENT ' Associated template id',
+ `created` DATETIME NOT NULL COMMENT ' The creation timestamp',
+ `size` bigint unsigned COMMENT ' The size of the object',
+ `physical_size` bigint unsigned DEFAULT 0 COMMENT ' The physical size of the object',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `uc_template_s3_ref__template_id` UNIQUE (`template_id`),
+ CONSTRAINT `fk_template_s3_ref__s3_id` FOREIGN KEY `fk_template_s3_ref__s3_id` (`s3_id`) REFERENCES `s3` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_template_s3_ref__template_id` FOREIGN KEY `fk_template_s3_ref__template_id` (`template_id`) REFERENCES `vm_template` (`id`),
+ INDEX `i_template_s3_ref__swift_id`(`s3_id`),
+ INDEX `i_template_s3_ref__template_id`(`template_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 's3.enable', 'false', 'enable s3');
+
+ALTER TABLE `cloud`.`snapshots` ADD COLUMN `s3_id` bigint unsigned COMMENT 'S3 to which this snapshot will be stored';
+
+ALTER TABLE `cloud`.`snapshots` ADD CONSTRAINT `fk_snapshots__s3_id` FOREIGN KEY `fk_snapshots__s3_id` (`s3_id`) REFERENCES `s3` (`id`);
+
+ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `eip_associate_public_ip` int(1) unsigned NOT NULL DEFAULT 0 COMMENT 'true if public IP is associated with user VM creation by default when EIP service is enabled.' AFTER `elastic_ip_service`;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network','DEFAULT','NetworkManager','network.dhcp.nondefaultnetwork.setgateway.guestos','Windows','The guest OS\'s name start with this fields would result in DHCP server response gateway information even when the network it\'s on is not default network. Names are separated by comma.');
+
+ALTER TABLE upload ADD uuid VARCHAR(40);
+ALTER TABLE async_job modify job_cmd VARCHAR(255);
+
+-- populate uuid column with db id if uuid is null
+UPDATE `cloud`.`account` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`alert` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`async_job` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`cluster` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`data_center` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`disk_offering` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`domain` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`event` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`external_firewall_devices` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`external_load_balancer_devices` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`external_nicira_nvp_devices` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`firewall_rules` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`guest_os` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`guest_os_category` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`host` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`host_pod_ref` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`hypervisor_capabilities` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`instance_group` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`load_balancer_stickiness_policies` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`network_external_firewall_device_map` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`network_external_lb_device_map` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`network_offerings` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`networks` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`nics` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`physical_network` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`physical_network_service_providers` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`physical_network_traffic_types` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`port_profile` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`project_invitations` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`projects` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`resource_tags` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`s2s_customer_gateway` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`s2s_vpn_connection` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`s2s_vpn_gateway` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`security_group` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`security_group_rule` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`snapshot_schedule` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`snapshots` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`static_routes` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`storage_pool` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`swift` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`upload` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`user` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`user_ip_address` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`user_vm_temp` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`virtual_router_providers` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`virtual_supervisor_module` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`vlan` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`vm_instance` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`vm_template` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`vpc` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`vpc_gateways` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`vpc_offerings` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`vpn_users` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`volumes` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`autoscale_vmgroups` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`autoscale_vmprofiles` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`autoscale_policies` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`counter` set uuid=id WHERE uuid is NULL;
+UPDATE `cloud`.`conditions` set uuid=id WHERE uuid is NULL;
+
+
+--- DB views for list api ---
+DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
+CREATE VIEW `cloud`.`user_vm_view` AS
+select
+vm_instance.id id,
+vm_instance.name name,
+user_vm.display_name display_name,
+user_vm.user_data user_data,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name,
+instance_group.id instance_group_id,
+instance_group.uuid instance_group_uuid,
+instance_group.name instance_group_name,
+vm_instance.uuid uuid,
+vm_instance.last_host_id last_host_id,
+vm_instance.vm_type type,
+vm_instance.vnc_password vnc_password,
+vm_instance.limit_cpu_use limit_cpu_use,
+vm_instance.created created,
+vm_instance.state state,
+vm_instance.removed removed,
+vm_instance.ha_enabled ha_enabled,
+vm_instance.hypervisor_type hypervisor_type,
+vm_instance.instance_name instance_name,
+vm_instance.guest_os_id guest_os_id,
+guest_os.uuid guest_os_uuid,
+vm_instance.pod_id pod_id,
+host_pod_ref.uuid pod_uuid,
+vm_instance.private_ip_address private_ip_address,
+vm_instance.private_mac_address private_mac_address,
+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.is_security_group_enabled security_group_enabled,
+host.id host_id,
+host.uuid host_uuid,
+host.name host_name,
+vm_template.id template_id,
+vm_template.uuid template_uuid,
+vm_template.name template_name,
+vm_template.display_text template_display_text,
+vm_template.enable_password password_enabled,
+iso.id iso_id,
+iso.uuid iso_uuid,
+iso.name iso_name,
+iso.display_text iso_display_text,
+service_offering.id service_offering_id,
+disk_offering.uuid service_offering_uuid,
+service_offering.cpu cpu,
+service_offering.speed speed,
+service_offering.ram_size ram_size,
+disk_offering.name service_offering_name,
+storage_pool.id pool_id,
+storage_pool.uuid pool_uuid,
+storage_pool.pool_type pool_type,
+volumes.id volume_id,
+volumes.uuid volume_uuid,
+volumes.device_id volume_device_id,
+volumes.volume_type volume_type,
+security_group.id security_group_id,
+security_group.uuid security_group_uuid,
+security_group.name security_group_name,
+security_group.description security_group_description,
+nics.id nic_id,
+nics.uuid nic_uuid,
+nics.network_id network_id,
+nics.ip4_address ip_address,
+nics.default_nic is_default_nic,
+nics.gateway gateway,
+nics.netmask netmask,
+nics.mac_address mac_address,
+nics.broadcast_uri broadcast_uri,
+nics.isolation_uri isolation_uri,
+vpc.id vpc_id,
+vpc.uuid vpc_uuid,
+networks.uuid network_uuid,
+networks.traffic_type traffic_type,
+networks.guest_type guest_type,
+user_ip_address.id public_ip_id,
+user_ip_address.uuid public_ip_uuid,
+user_ip_address.public_ip_address public_ip_address,
+ssh_keypairs.keypair_name keypair_name,
+resource_tags.id tag_id,
+resource_tags.uuid tag_uuid,
+resource_tags.key tag_key,
+resource_tags.value tag_value,
+resource_tags.domain_id tag_domain_id,
+resource_tags.account_id tag_account_id,
+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,
+async_job.id job_id,
+async_job.uuid job_uuid,
+async_job.job_status job_status,
+async_job.account_id job_account_id
+from user_vm
+inner join vm_instance on vm_instance.id = user_vm.id and vm_instance.removed is NULL
+inner join account on vm_instance.account_id=account.id
+inner join domain on vm_instance.domain_id=domain.id
+left join guest_os on vm_instance.guest_os_id = guest_os.id
+left join host_pod_ref on vm_instance.pod_id = host_pod_ref.id
+left join projects on projects.project_account_id = account.id
+left join instance_group_vm_map on vm_instance.id=instance_group_vm_map.instance_id
+left join instance_group on instance_group_vm_map.group_id=instance_group.id
+left join data_center on vm_instance.data_center_id=data_center.id
+left join host on vm_instance.host_id=host.id
+left join vm_template on vm_instance.vm_template_id=vm_template.id
+left join vm_template iso on iso.id=user_vm.iso_id
+left join service_offering on vm_instance.service_offering_id=service_offering.id
+left join disk_offering on vm_instance.service_offering_id=disk_offering.id
+left join volumes on vm_instance.id=volumes.instance_id
+left join storage_pool on volumes.pool_id=storage_pool.id
+left join security_group_vm_map on vm_instance.id=security_group_vm_map.instance_id
+left join security_group on security_group_vm_map.security_group_id=security_group.id
+left join nics on vm_instance.id=nics.instance_id
+left join networks on nics.network_id=networks.id
+left join vpc on networks.vpc_id = vpc.id
+left join user_ip_address on user_ip_address.vm_id=vm_instance.id
+left join user_vm_details on user_vm_details.vm_id=vm_instance.id and user_vm_details.name = "SSH.PublicKey"
+left join ssh_keypairs on ssh_keypairs.public_key = user_vm_details.value
+left join resource_tags on resource_tags.resource_id = vm_instance.id and resource_tags.resource_type = "UserVm"
+left join async_job on async_job.instance_id = vm_instance.id and async_job.instance_type = "VirtualMachine" and async_job.job_status = 0;
+
+DROP VIEW IF EXISTS `cloud`.`domain_router_view`;
+CREATE VIEW domain_router_view AS
+select
+vm_instance.id id,
+vm_instance.name name,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name,
+vm_instance.uuid uuid,
+vm_instance.created created,
+vm_instance.state state,
+vm_instance.removed removed,
+vm_instance.pod_id pod_id,
+vm_instance.instance_name instance_name,
+host_pod_ref.uuid pod_uuid,
+data_center.id data_center_id,
+data_center.uuid data_center_uuid,
+data_center.name data_center_name,
+data_center.dns1 dns1,
+data_center.dns2 dns2,
+host.id host_id,
+host.uuid host_uuid,
+host.name host_name,
+vm_template.id template_id,
+vm_template.uuid template_uuid,
+service_offering.id service_offering_id,
+disk_offering.uuid service_offering_uuid,
+disk_offering.name service_offering_name,
+nics.id nic_id,
+nics.uuid nic_uuid,
+nics.network_id network_id,
+nics.ip4_address ip_address,
+nics.default_nic is_default_nic,
+nics.gateway gateway,
+nics.netmask netmask,
+nics.mac_address mac_address,
+nics.broadcast_uri broadcast_uri,
+nics.isolation_uri isolation_uri,
+vpc.id vpc_id,
+vpc.uuid vpc_uuid,
+networks.uuid network_uuid,
+networks.name network_name,
+networks.network_domain network_domain,
+networks.traffic_type traffic_type,
+networks.guest_type guest_type,
+async_job.id job_id,
+async_job.uuid job_uuid,
+async_job.job_status job_status,
+async_job.account_id job_account_id,
+domain_router.template_version template_version,
+domain_router.scripts_version scripts_version,
+domain_router.is_redundant_router is_redundant_router,
+domain_router.redundant_state redundant_state,
+domain_router.stop_pending stop_pending
+from domain_router
+inner join vm_instance on vm_instance.id = domain_router.id
+inner join account on vm_instance.account_id=account.id
+inner join domain on vm_instance.domain_id=domain.id
+left join host_pod_ref on vm_instance.pod_id = host_pod_ref.id
+left join projects on projects.project_account_id = account.id
+left join data_center on vm_instance.data_center_id=data_center.id
+left join host on vm_instance.host_id=host.id
+left join vm_template on vm_instance.vm_template_id=vm_template.id
+left join service_offering on vm_instance.service_offering_id=service_offering.id
+left join disk_offering on vm_instance.service_offering_id=disk_offering.id
+left join volumes on vm_instance.id=volumes.instance_id
+left join storage_pool on volumes.pool_id=storage_pool.id
+left join nics on vm_instance.id=nics.instance_id
+left join networks on nics.network_id=networks.id
+left join vpc on networks.vpc_id = vpc.id
+left join async_job on async_job.instance_id = vm_instance.id and async_job.instance_type = "DomainRouter" and async_job.job_status = 0;
+
+DROP VIEW IF EXISTS `cloud`.`security_group_view`;
+CREATE VIEW security_group_view AS
+select
+security_group.id id,
+security_group.name name,
+security_group.description description,
+security_group.uuid uuid,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name,
+security_group_rule.id rule_id,
+security_group_rule.uuid rule_uuid,
+security_group_rule.type rule_type,
+security_group_rule.start_port rule_start_port,
+security_group_rule.end_port rule_end_port,
+security_group_rule.protocol rule_protocol,
+security_group_rule.allowed_network_id rule_allowed_network_id,
+security_group_rule.allowed_ip_cidr rule_allowed_ip_cidr,
+security_group_rule.create_status rule_create_status,
+resource_tags.id tag_id,
+resource_tags.uuid tag_uuid,
+resource_tags.key tag_key,
+resource_tags.value tag_value,
+resource_tags.domain_id tag_domain_id,
+resource_tags.account_id tag_account_id,
+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,
+async_job.id job_id,
+async_job.uuid job_uuid,
+async_job.job_status job_status,
+async_job.account_id job_account_id
+from security_group
+left join security_group_rule on security_group.id = security_group_rule.security_group_id
+inner join account on security_group.account_id=account.id
+inner join domain on security_group.domain_id=domain.id
+left join projects on projects.project_account_id = security_group.account_id
+left join resource_tags on resource_tags.resource_id = security_group.id and resource_tags.resource_type = "SecurityGroup"
+left join async_job on async_job.instance_id = security_group.id and async_job.instance_type = "SecurityGroup" and async_job.job_status = 0;
+
+DROP VIEW IF EXISTS `cloud`.`resource_tag_view`;
+CREATE VIEW resource_tag_view AS
+select
+resource_tags.id,
+resource_tags.uuid,
+resource_tags.key,
+resource_tags.value,
+resource_tags.resource_id,
+resource_tags.resource_uuid,
+resource_tags.resource_type,
+resource_tags.customer,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name
+from resource_tags
+inner join account on resource_tags.account_id=account.id
+inner join domain on resource_tags.domain_id=domain.id
+left join projects on projects.project_account_id = resource_tags.account_id;
+
+
+DROP VIEW IF EXISTS `cloud`.`event_view`;
+CREATE VIEW event_view AS
+select
+event.id,
+event.uuid,
+event.type,
+event.state,
+event.description,
+event.created,
+event.level,
+event.parameters,
+event.start_id,
+eve.uuid start_uuid,
+event.user_id,
+user.username user_name,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name
+from event
+inner join account on event.account_id=account.id
+inner join domain on event.domain_id=domain.id
+inner join user on event.user_id = user.id
+left join projects on projects.project_account_id = event.account_id
+left join event eve on event.start_id = eve.id;
+
+DROP VIEW IF EXISTS `cloud`.`instance_group_view`;
+CREATE VIEW instance_group_view AS
+select
+instance_group.id,
+instance_group.uuid,
+instance_group.name,
+instance_group.removed,
+instance_group.created,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name
+from instance_group
+inner join account on instance_group.account_id=account.id
+inner join domain on account.domain_id=domain.id
+left join projects on projects.project_account_id = instance_group.account_id;
+
+DROP VIEW IF EXISTS `cloud`.`user_view`;
+CREATE VIEW user_view AS
+select
+user.id,
+user.uuid,
+user.username,
+user.password,
+user.firstname,
+user.lastname,
+user.email,
+user.state,
+user.api_key,
+user.secret_key,
+user.created,
+user.removed,
+user.timezone,
+user.registration_token,
+user.is_registered,
+user.incorrect_login_attempts,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path
+from user
+inner join account on user.account_id = account.id
+inner join domain on account.domain_id=domain.id;
+
+DROP VIEW IF EXISTS `cloud`.`project_view`;
+CREATE VIEW project_view AS
+select
+projects.id,
+projects.uuid,
+projects.name,
+projects.display_text,
+projects.state,
+projects.removed,
+projects.created,
+account.account_name owner,
+pacct.account_id,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path,
+resource_tags.id tag_id,
+resource_tags.uuid tag_uuid,
+resource_tags.key tag_key,
+resource_tags.value tag_value,
+resource_tags.domain_id tag_domain_id,
+resource_tags.account_id tag_account_id,
+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
+from projects
+inner join domain on projects.domain_id=domain.id
+inner join project_account on projects.id = project_account.project_id and project_account.account_role = "Admin"
+inner join account on account.id = project_account.account_id
+left join resource_tags on resource_tags.resource_id = projects.id and resource_tags.resource_type = "Project"
+left join project_account pacct on projects.id = pacct.project_id;
+
+DROP VIEW IF EXISTS `cloud`.`project_account_view`;
+CREATE VIEW project_account_view AS
+select
+project_account.id,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name,
+account.type account_type,
+project_account.account_role,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path
+from project_account
+inner join account on project_account.account_id = account.id
+inner join domain on account.domain_id=domain.id
+inner join projects on projects.id = project_account.project_id;
+
+DROP VIEW IF EXISTS `cloud`.`project_invitation_view`;
+CREATE VIEW project_invitation_view AS
+select
+project_invitations.id,
+project_invitations.uuid,
+project_invitations.email,
+project_invitations.created,
+project_invitations.state,
+projects.id project_id,
+projects.uuid project_uuid,
+projects.name project_name,
+account.id account_id,
+account.uuid account_uuid,
+account.account_name,
+account.type account_type,
+domain.id domain_id,
+domain.uuid domain_uuid,
+domain.name domain_name,
+domain.path domain_path
+from project_invitations
+left join account on project_invitations.account_id = account.id
+left join domain on project_invitations.domain_id=domain.id
+left join projects on projects.id = project_invitations.project_id;
+