Fix trailing white spaces. Minor fixes, removed duplicate entry for a column in schema-410-420. Renamed a method.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36feef96 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36feef96 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36feef96 Branch: refs/heads/vmware-datamodel Commit: 36feef9697879eda6cdb6ead51c0b3a44f4e50c3 Parents: 037627e Author: Sateesh Chodapuneedi <[email protected]> Authored: Sun May 19 17:22:34 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Thu May 23 06:37:45 2013 +0530 ---------------------------------------------------------------------- .../vmware/VmwareDatacenterZoneMapVO.java | 6 +++--- .../hypervisor/vmware/dao/VmwareDatacenterDao.java | 8 ++++---- .../api/command/admin/zone/AddVmwareDcCmd.java | 2 +- .../api/command/admin/zone/RemoveVmwareDcCmd.java | 4 ++-- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36feef96/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java index e20386d..4e2cbe9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java @@ -56,7 +56,7 @@ public class VmwareDatacenterZoneMapVO implements VmwareDatacenterZoneMap { public long getId() { return id; } - + @Override public long getZoneId() { return zoneId; @@ -71,7 +71,7 @@ public class VmwareDatacenterZoneMapVO implements VmwareDatacenterZoneMap { this.zoneId = zoneId; } - public void setVsmId(long vmwareDcId) { + public void setVmwareDcId(long vmwareDcId) { this.vmwareDcId = vmwareDcId; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36feef96/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java index e339604..c3f92ae 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java @@ -8,14 +8,14 @@ import com.cloud.utils.db.GenericDao; public interface VmwareDatacenterDao extends GenericDao<VmwareDatacenterVO, Long> { /** - * Return a VMware Datacenter given guid + * Return a VMware Datacenter given guid * @param guid of VMware datacenter * @return VmwareDatacenterVO for the VMware datacenter having the specified guid. */ VmwareDatacenterVO getVmwareDatacenterByGuid(String guid); /** - * Return a VMware Datacenter given name and vCenter host. + * Return a VMware Datacenter given name and vCenter host. * For legacy zones multiple records will be present in the table. * @param name of VMware datacenter * @param vCenter host @@ -34,14 +34,14 @@ public interface VmwareDatacenterDao extends GenericDao<VmwareDatacenterVO, Long /** * Return a list of VMware Datacenters belonging to specified vCenter * @param vCenter Host - * @return list of VmwareDatacenterVO for all VMware datacenters belonging to + * @return list of VmwareDatacenterVO for all VMware datacenters belonging to * specified vCenter */ List<VmwareDatacenterVO> listVmwareDatacenterByVcenter(String vCenterHost); /** * Lists all associated VMware datacenter on the management server. - * @return list of VmwareDatacenterVO for all associated VMware datacenters + * @return list of VmwareDatacenterVO for all associated VMware datacenters */ List<VmwareDatacenterVO> listAllVmwareDatacenters(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36feef96/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java index 3d9101b..0d9057e 100644 --- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java +++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java @@ -75,7 +75,7 @@ public class AddVmwareDcCmd extends BaseCmd { @Override public void execute() { try { - VmwareDatacenterResponse response = new VmwareDatacenterResponse(); + VmwareDatacenterResponse response = new VmwareDatacenterResponse(); VmwareDatacenterVO result = _vmwareDatacenterService.addVmwareDatacenter(this); if (result != null){ response.setId(result.getUuid()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36feef96/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java index cf54698..7de9056 100644 --- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java +++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java @@ -28,9 +28,9 @@ import com.cloud.user.Account; public class RemoveVmwareDcCmd extends BaseCmd { @Inject public VmwareDatacenterService _vmwareDatacenterService; - + public static final Logger s_logger = Logger.getLogger(AddVmwareDcCmd.class.getName()); - + private static final String s_name = "removevmwaredcresponse"; @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, required=true, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36feef96/server/src/com/cloud/upgrade/dao/Upgrade410to420.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/upgrade/dao/Upgrade410to420.java b/server/src/com/cloud/upgrade/dao/Upgrade410to420.java index c3e37de..0c53280 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -71,7 +71,7 @@ public class Upgrade410to420 implements DbUpgrade { addEgressFwRulesForSRXGuestNw(conn); upgradeEIPNetworkOfferings(conn); } - + private void updateSystemVmTemplates(Connection conn) { PreparedStatement sql = null; try {
