You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/06/06 11:06:29 UTC
[1/2] git commit: updated refs/heads/master to 89fa121
Updated Branches:
refs/heads/master 4c397da8f -> 89fa121a0
CLOUDSTACK-2867 Cannot add multiple vmware zones in vCenter
Checking guid in database, if association of DC to zone exists already.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ec7f8b9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ec7f8b9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ec7f8b9
Branch: refs/heads/master
Commit: 3ec7f8b99ebe9c02a6b6ed69efdb72dfb9543b3b
Parents: 1696e8c
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Thu Jun 6 14:33:05 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Thu Jun 6 14:33:05 2013 +0530
----------------------------------------------------------------------
.../vmware/manager/VmwareManagerImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ec7f8b9/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 78b7582..664651e 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -947,8 +947,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
// Check if DC is already part of zone
// In that case vmware_data_center table should have the DC
String vCenterHost = uri.getHost();
- List<VmwareDatacenterVO> vmwareDcs = _vmwareDcDao.getVmwareDatacenterByNameAndVcenter(vmwareDcName, vCenterHost);
- if (vmwareDcs != null && vmwareDcs.size() != 0) {
+ vmwareDc = _vmwareDcDao.getVmwareDatacenterByGuid(vmwareDcName + "@" + vCenterHost);
+ if (vmwareDc != null) {
throw new ResourceInUseException("This DC is already part of other CloudStack zone(s). Cannot add this DC to more zones.");
}
[2/2] git commit: updated refs/heads/master to 89fa121
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89fa121a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89fa121a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89fa121a
Branch: refs/heads/master
Commit: 89fa121a0cfb2bca978d4c72a91c1ba33326af68
Parents: 3ec7f8b 4c397da
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Thu Jun 6 14:34:50 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Thu Jun 6 14:34:50 2013 +0530
----------------------------------------------------------------------
docs/en-US/CloudStack_GSoC_Guide.ent | 22 ++
docs/en-US/CloudStack_GSoC_Guide.xml | 52 ++++
docs/en-US/gsoc-tuna.xml | 28 ++
docs/en-US/multiple-ip-range.xml | 3 +-
docs/en-US/pvlan.xml | 57 ++++
docs/publican-gsoc-2013.cfg | 27 ++
engine/schema/src/com/cloud/vm/dao/UserVmDao.java | 3 +-
.../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 3 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 5 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
test/integration/smoke/test_internal_lb.py | 4 +-
test/integration/smoke/test_iso.py | 2 +-
test/integration/smoke/test_network_acl.py | 224 +++++++++------
test/integration/smoke/test_service_offerings.py | 9 +
test/integration/smoke/test_templates.py | 2 +-
.../definitions/systemvmtemplate/postinstall.sh | 2 +-
.../definitions/systemvmtemplate64/postinstall.sh | 2 +-
tools/devcloud-kvm/devcloud-kvm.cfg | 2 +-
tools/devcloud/devcloud.cfg | 2 +-
tools/devcloud/devcloud_internal-mgt.cfg | 2 +-
tools/devcloud/quickcloud.cfg | 2 +-
tools/marvin/marvin/configGenerator.py | 8 +-
tools/marvin/marvin/integration/lib/base.py | 96 ++++++-
tools/marvin/marvin/jsonHelper.py | 4 +-
ui/modules/vpc/vpc.css | 11 +
ui/modules/vpc/vpc.js | 8 +
ui/scripts/ui/widgets/listView.js | 27 ++-
ui/scripts/vpc.js | 209 ++++++++++++--
28 files changed, 680 insertions(+), 138 deletions(-)
----------------------------------------------------------------------