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 2013/06/19 23:13:05 UTC
git commit: updated refs/heads/master to 5cd6d69
Updated Branches:
refs/heads/master 11b9d5ff6 -> 5cd6d6944
CLOUDSTACK-3015: VPC virtual router lists deleted nics
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cd6d694
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cd6d694
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cd6d694
Branch: refs/heads/master
Commit: 5cd6d6944a5b80aa401587c90fb0f69863ec4a96
Parents: 11b9d5f
Author: Min Chen <mi...@citrix.com>
Authored: Wed Jun 19 14:12:19 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Wed Jun 19 14:12:39 2013 -0700
----------------------------------------------------------------------
setup/db/db/schema-410to420.sql | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cd6d694/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 3c5b1bc..c782234 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -974,15 +974,11 @@ CREATE VIEW `cloud`.`domain_router_view` AS
left join
`cloud`.`disk_offering` ON vm_instance.service_offering_id = disk_offering.id
left join
- `cloud`.`volumes` ON vm_instance.id = volumes.instance_id
- left join
- `cloud`.`storage_pool` ON volumes.pool_id = storage_pool.id
- left join
- `cloud`.`nics` ON vm_instance.id = nics.instance_id
+ `cloud`.`nics` ON vm_instance.id = nics.instance_id and nics.removed is null
left join
`cloud`.`networks` ON nics.network_id = networks.id
left join
- `cloud`.`vpc` ON domain_router.vpc_id = vpc.id
+ `cloud`.`vpc` ON domain_router.vpc_id = vpc.id and vpc.removed is null
left join
`cloud`.`async_job` ON async_job.instance_id = vm_instance.id
and async_job.instance_type = 'DomainRouter'
@@ -1452,7 +1448,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
data_center.uuid data_center_uuid,
data_center.name data_center_name,
data_center.is_security_group_enabled security_group_enabled,
- data_center.networktype data_center_type,
+ data_center.networktype data_center_type,
host.id host_id,
host.uuid host_uuid,
host.name host_name,
@@ -1564,11 +1560,11 @@ CREATE VIEW `cloud`.`user_vm_view` AS
left join
`cloud`.`security_group` ON security_group_vm_map.security_group_id = security_group.id
left join
- `cloud`.`nics` ON vm_instance.id = nics.instance_id
+ `cloud`.`nics` ON vm_instance.id = nics.instance_id and nics.removed is null
left join
`cloud`.`networks` ON nics.network_id = networks.id
left join
- `cloud`.`vpc` ON networks.vpc_id = vpc.id
+ `cloud`.`vpc` ON networks.vpc_id = vpc.id and vpc.removed is null
left join
`cloud`.`user_ip_address` ON user_ip_address.vm_id = vm_instance.id
left join