Updated Branches: refs/heads/vmsync 5bd65daa0 -> 0061f2c5c
Fixed all the asserts Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0061f2c5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0061f2c5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0061f2c5 Branch: refs/heads/vmsync Commit: 0061f2c5cc163279b7172693dcc4006b2f2dafe8 Parents: 5bd65da Author: Alex Huang <alex.hu...@gmail.com> Authored: Tue Jun 25 13:47:54 2013 -0700 Committer: Alex Huang <alex.hu...@gmail.com> Committed: Tue Jun 25 13:47:54 2013 -0700 ---------------------------------------------------------------------- .../vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java | 2 +- .../src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java | 4 ++-- .../src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java | 2 +- .../com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java | 4 ++-- .../com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0061f2c5/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 6d6d2eb..44c4d72 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java @@ -26,7 +26,7 @@ public interface VmwareDatacenter extends Identity, InternalIdentity { String getGuid(); - String getVcenterHost(); + String getVCenterHost(); long getId(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0061f2c5/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 5fca8ea..82b302a 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java @@ -92,7 +92,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { } @Override - public String getVcenterHost() { + public String getVCenterHost() { return vCenterHost; } @@ -108,7 +108,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter { vmwareDatacenterName = name; } - public void setVcenterHost(String vCenterHost) { + public void setVCenterHost(String vCenterHost) { this.vCenterHost = vCenterHost; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0061f2c5/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java index 6f4be05..257160c 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java @@ -434,7 +434,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements vmwareDcId = vmwareDcZone.getVmwareDcId(); vmwareDc = _vmwareDcDao.findById(vmwareDcId); vmwareDcNameFromApi = vmwareDcNameFromDb = vmwareDc.getVmwareDatacenterName(); - vCenterHost = vmwareDc.getVcenterHost(); + vCenterHost = vmwareDc.getVCenterHost(); String inventoryPath = url.getPath(); assert (inventoryPath != null); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0061f2c5/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java index 9f5796a..0a876e2 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java @@ -51,11 +51,11 @@ public class VmwareDatacenterDaoImpl extends GenericDaoBase<VmwareDatacenterVO, nameVcSearch = createSearchBuilder(); nameVcSearch.and("name", nameVcSearch.entity().getVmwareDatacenterName(), Op.EQ); - nameVcSearch.and("vCenterHost", nameVcSearch.entity().getVcenterHost(), Op.EQ); + nameVcSearch.and("vCenterHost", nameVcSearch.entity().getVCenterHost(), Op.EQ); nameVcSearch.done(); vcSearch = createSearchBuilder(); - vcSearch.and("vCenterHost", vcSearch.entity().getVcenterHost(), Op.EQ); + vcSearch.and("vCenterHost", vcSearch.entity().getVCenterHost(), Op.EQ); vcSearch.done(); guidSearch = createSearchBuilder(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0061f2c5/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 68acd9e..e2f0c6d 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 @@ -1053,7 +1053,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw vmwareDcId = vmwareDcZoneMap.getVmwareDcId(); vmwareDatacenter = _vmwareDcDao.findById(vmwareDcId); vmwareDcName = vmwareDatacenter.getVmwareDatacenterName(); - vCenterHost = vmwareDatacenter.getVcenterHost(); + vCenterHost = vmwareDatacenter.getVCenterHost(); userName = vmwareDatacenter.getUser(); password = vmwareDatacenter.getPassword(); txn = Transaction.currentTxn();
