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/07/11 12:33:25 UTC
git commit: updated refs/heads/4.2 to b1f7056
Updated Branches:
refs/heads/4.2 0898a264a -> b1f705656
Updated logger initalization in classes ListVmwareDcsCmd, RemoveVmwareDcCmd & minor cleanup of comments.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b1f70565
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b1f70565
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b1f70565
Branch: refs/heads/4.2
Commit: b1f70565657bb4ff6ff11d5ead3a2cd1510e3444
Parents: 0898a26
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Thu Jul 11 15:59:25 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Thu Jul 11 16:02:34 2013 +0530
----------------------------------------------------------------------
.../cloud/hypervisor/vmware/dao/LegacyZoneDao.java | 4 ++--
.../api/command/admin/zone/ListVmwareDcsCmd.java | 2 +-
.../api/command/admin/zone/RemoveVmwareDcCmd.java | 15 ++++-----------
3 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1f70565/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
index 4a858f8..290f1af 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
@@ -24,8 +24,8 @@ import com.cloud.utils.db.GenericDao;
public interface LegacyZoneDao extends GenericDao<LegacyZoneVO, Long> {
/**
- * @param id of zone
- * @return zone id of legacy zone
+ * @param zoneId - id of zone
+ * @return Object of legacy zone (LegacyZoneVO) identified by zoneId
*/
LegacyZoneVO findByZoneId(String zoneId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1f70565/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
index 15c23fa..b7b0f9e 100644
--- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
+++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
@@ -48,7 +48,7 @@ public class ListVmwareDcsCmd extends BaseListCmd {
@Inject public VmwareDatacenterService _vmwareDatacenterService;
- public static final Logger s_logger = Logger.getLogger(AddVmwareDcCmd.class.getName());
+ public static final Logger s_logger = Logger.getLogger(ListVmwareDcsCmd.class.getName());
private static final String s_name = "listvmwaredcsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1f70565/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 a74c91b..6fde15c 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
@@ -19,26 +19,19 @@ package org.apache.cloudstack.api.command.admin.zone;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.DiscoveryException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.NetworkRuleConflictException;
-import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceInUseException;
-import com.cloud.exception.ResourceUnavailableException;
import com.cloud.hypervisor.vmware.VmwareDatacenterService;
-import com.cloud.network.element.CiscoNexusVSMElementService;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
@@ -47,7 +40,7 @@ public class RemoveVmwareDcCmd extends BaseCmd {
@Inject public VmwareDatacenterService _vmwareDatacenterService;
- public static final Logger s_logger = Logger.getLogger(AddVmwareDcCmd.class.getName());
+ public static final Logger s_logger = Logger.getLogger(RemoveVmwareDcCmd.class.getName());
private static final String s_name = "removevmwaredcresponse";
@@ -67,7 +60,7 @@ public class RemoveVmwareDcCmd extends BaseCmd {
boolean result = _vmwareDatacenterService.removeVmwareDatacenter(this);
if (result) {
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to remove VMware datacenter from zone");
}