CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter Upgrade changes with legacy zone support
CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter Plugin, API & DB changes CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter Upgrade changes with legacy zone support CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter Upgrade changes with legacy zone support DC-Zone mapping constraints should allow multiple hypervisors per zone. Such zones would just be ignored. Looking for only VMware clusters in the zone while associating a VMware DC with a zone. Fixed upgrade path for zones with 1 cluster from 1 DC/vCenter. Auto-associating in this case. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/037627e0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/037627e0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/037627e0 Branch: refs/heads/vmware-datamodel Commit: 037627e02991e73b9d34934c718f6fa9376f5996 Parents: 2abe5e9 Author: Sateesh Chodapuneedi <sate...@apache.org> Authored: Mon May 6 15:59:24 2013 +0530 Committer: Sateesh Chodapuneedi <sate...@apache.org> Committed: Thu May 23 06:37:26 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 1 - .../cloud/hypervisor/vmware/VmwareDatacenter.java | 2 -- .../hypervisor/vmware/VmwareDatacenterVO.java | 4 ---- setup/db/db/schema-410to420.sql | 1 - 4 files changed, 0 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/037627e0/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index 0d630a0..352e54a 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -423,7 +423,6 @@ public class Upgrade410to420 implements DbUpgrade { } } ->>>>>>> CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter private void createPlaceHolderNics(Connection conn) { PreparedStatement pstmt = null; ResultSet rs = null; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/037627e0/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java index c5d35b1..b978cd9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java @@ -3,8 +3,6 @@ package com.cloud.hypervisor.vmware; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; -import com.vmware.vim25.ManagedObjectReference; - public interface VmwareDatacenter extends Identity, InternalIdentity { String getVmwareDatacenterName(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/037627e0/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java index 4b08d9e..9d8fb7d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java @@ -140,8 +140,4 @@ public class VmwareDatacenterVO implements VmwareDatacenter { this.uuid = UUID.randomUUID().toString(); } -<<<<<<< HEAD } -======= -} ->>>>>>> CLOUDSTACK-1963 New mapping model for CloudStack zone and Vmware datacenter http://git-wip-us.apache.org/repos/asf/cloudstack/blob/037627e0/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 7199fd3..e4baacd 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -1117,7 +1117,6 @@ CREATE VIEW `cloud`.`account_view` AS select account.id, account.uuid, - account.uuid, account.account_name, account.type, account.state,
