Skip to content

Commit 2bc09a5

Browse files
DaanHooglandDaanHoogland
committed
cleanup
1 parent aa151c2 commit 2bc09a5

File tree

12 files changed

+71
-61
lines changed

12 files changed

+71
-61
lines changed

‎api/src/main/java/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,11 +438,12 @@ public class ApiConstants {
438438
public static final String STATE = "state";
439439
public static final String STATS = "stats";
440440
public static final String STATUS = "status";
441-
public static final String STORAGE_TYPE = "storagetype";
442-
public static final String STORAGE_POLICY = "storagepolicy";
443-
public static final String STORAGE_MOTION_ENABLED = "storagemotionenabled";
444441
public static final String STORAGE_CAPABILITIES = "storagecapabilities";
445442
public static final String STORAGE_CUSTOM_STATS = "storagecustomstats";
443+
public static final String STORAGE_MOTION_ENABLED = "storagemotionenabled";
444+
public static final String STORAGE_POLICY = "storagepolicy";
445+
public static final String STORAGE_POOL = "storagepool";
446+
public static final String STORAGE_TYPE = "storagetype";
446447
public static final String SUBNET = "subnet";
447448
public static final String OWNER = "owner";
448449
public static final String SWAP_OWNER = "swapowner";
@@ -1107,6 +1108,7 @@ public class ApiConstants {
11071108
public static final String PARAMETER_DESCRIPTION_IS_TAG_A_RULE = "Whether the informed tag is a JS interpretable rule or not.";
11081109

11091110
public static final String NFS_MOUNT_OPTIONS = "nfsmountopts";
1111+
public static final String VMWARE_DC = "vmwaredc";
11101112

11111113
/**
11121114
* This enum specifies IO Drivers, each option controls specific policies on I/O.

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import com.cloud.user.Account;
3838
import com.cloud.utils.exception.CloudRuntimeException;
3939

40-
@APICommand(name = "addVmwareDc", description = "Adds a VMware datacenter to specified zone", responseObject = VmwareDatacenterResponse.class,
41-
requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
40+
@APICommand(name = "addVmwareDc", description = "Adds a Vmware datacenter to specified zone",
41+
responseObject = VmwareDatacenterResponse.class, responseHasSensitiveInfo = false)
4242
public class AddVmwareDcCmd extends BaseCmd {
4343

4444
@Inject
@@ -47,7 +47,7 @@ public class AddVmwareDcCmd extends BaseCmd {
4747
public static final Logger s_logger = Logger.getLogger(AddVmwareDcCmd.class.getName());
4848

4949

50-
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of VMware datacenter to be added to specified zone.")
50+
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of Vmware datacenter to be added to specified zone.")
5151
private String name;
5252

5353
@Parameter(name = ApiConstants.VCENTER,
@@ -56,10 +56,10 @@ public class AddVmwareDcCmd extends BaseCmd {
5656
description = "The name/ip of vCenter. Make sure it is IP address or full qualified domain name for host running vCenter server.")
5757
private String vCenter;
5858

59-
@Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, required = false, description = "The Username required to connect to resource.")
59+
@Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, description = "The Username required to connect to resource.")
6060
private String username;
6161

62-
@Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, required = false, description = "The password for specified username.")
62+
@Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "The password for specified username.")
6363
private String password;
6464

6565
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "The Zone ID.")
@@ -101,7 +101,7 @@ public void execute() {
101101
response.setResponseName(getCommandName());
102102
response.setObjectName("vmwaredc");
103103
} else {
104-
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add VMware Datacenter to zone.");
104+
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Vmware Datacenter to zone.");
105105
}
106106
this.setResponseObject(response);
107107
} catch (DiscoveryException ex) {

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.apache.cloudstack.api.response.ListResponse;
3838
import org.apache.cloudstack.api.response.ZoneResponse;
3939
import org.apache.cloudstack.context.CallContext;
40-
import org.apache.log4j.Logger;
4140

4241
import javax.inject.Inject;
4342
import java.util.ArrayList;
@@ -49,9 +48,6 @@
4948
authorized = {RoleType.Admin})
5049
public class ImportVsphereStoragePoliciesCmd extends BaseCmd {
5150

52-
public static final Logger LOGGER = Logger.getLogger(ImportVsphereStoragePoliciesCmd.class.getName());
53-
54-
5551
@Inject
5652
public VmwareDatacenterService _vmwareDatacenterService;
5753

@@ -76,6 +72,13 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
7672

7773
List<? extends VsphereStoragePolicy> storagePolicies = _vmwareDatacenterService.importVsphereStoragePolicies(this);
7874
final ListResponse<VsphereStoragePoliciesResponse> responseList = new ListResponse<>();
75+
final List<VsphereStoragePoliciesResponse> storagePoliciesResponseList = getVsphereStoragePoliciesResponses(storagePolicies, dataCenter);
76+
responseList.setResponses(storagePoliciesResponseList);
77+
responseList.setResponseName(getCommandName());
78+
setResponseObject(responseList);
79+
}
80+
81+
private static List<VsphereStoragePoliciesResponse> getVsphereStoragePoliciesResponses(List<? extends VsphereStoragePolicy> storagePolicies, DataCenter dataCenter) {
7982
final List<VsphereStoragePoliciesResponse> storagePoliciesResponseList = new ArrayList<>();
8083
for (VsphereStoragePolicy storagePolicy : storagePolicies) {
8184
final VsphereStoragePoliciesResponse storagePoliciesResponse = new VsphereStoragePoliciesResponse();
@@ -88,9 +91,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
8891

8992
storagePoliciesResponseList.add(storagePoliciesResponse);
9093
}
91-
responseList.setResponses(storagePoliciesResponseList);
92-
responseList.setResponseName(getCommandName());
93-
setResponseObject(responseList);
94+
return storagePoliciesResponseList;
9495
}
9596

9697
@Override

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
import java.util.ArrayList;
4848
import java.util.List;
4949

50-
@APICommand(name = "listVmwareDcHosts", responseObject = VmwareRequestReponse.class,
51-
description = "Lists the VMs in a VMware Datacenter",
50+
@APICommand(name = "listVmwareDcHosts", responseObject = VmwareRequestResponse.class,
51+
description = "Lists the VMs in a Vmware Datacenter",
5252
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
5353
public class ListVmwareDcHostsCmd extends BaseCmd implements ListVmwareDcItems {
5454

@@ -66,7 +66,7 @@ public class ListVmwareDcHostsCmd extends BaseCmd implements ListVmwareDcItems {
6666
description = "The name/ip of vCenter. Make sure it is IP address or full qualified domain name for host running vCenter server.")
6767
private String vcenter;
6868

69-
@Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of VMware datacenter.")
69+
@Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of Vmware datacenter.")
7070
private String datacenterName;
7171

7272
@Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, description = "The Username required to connect to resource.")
@@ -107,13 +107,13 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
107107
baseResponseList.add(resp);
108108
}
109109
}
110-
VmwareRequestReponse<BaseResponse> response = new VmwareRequestReponse<>();
110+
VmwareRequestResponse<BaseResponse> response = new VmwareRequestResponse<>();
111111
response.setResponses(baseResponseList, baseResponseList.size());
112112
response.setResponseName(getCommandName());
113113
setResponseObject(response);
114114
} catch (CloudRuntimeException | InvalidPropertyFaultMsg | RuntimeFaultFaultMsg | InvocationTargetException |
115115
NoSuchMethodException | IllegalAccessException e) {
116-
String errorMsg = String.format("Error retrieving VMs from VMware VC: %s", e.getMessage());
116+
String errorMsg = String.format("Error retrieving VMs from Vmware VC: %s", e.getMessage());
117117
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, errorMsg);
118118
}
119119
}

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import java.util.ArrayList;
4343
import java.util.List;
4444

45-
@APICommand(name = "listVmwareDcVms", responseObject = VmwareRequestReponse.class,
46-
description = "Lists the VMs in a VMware Datacenter",
45+
@APICommand(name = "listVmwareDcVms", responseObject = VmwareRequestResponse.class,
46+
description = "Lists the VMs in a Vmware Datacenter",
4747
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
4848
public class ListVmwareDcVmsCmd extends BaseCmd implements ListVmwareDcItems {
4949

@@ -61,7 +61,7 @@ public class ListVmwareDcVmsCmd extends BaseCmd implements ListVmwareDcItems {
6161
description = "The name/ip of vCenter. Make sure it is IP address or full qualified domain name for host running vCenter server.")
6262
private String vcenter;
6363

64-
@Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of VMware datacenter.")
64+
@Parameter(name = ApiConstants.DATACENTER_NAME, type = CommandType.STRING, description = "Name of Vmware datacenter.")
6565
private String datacenterName;
6666

6767
@Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, description = "The Username required to connect to resource.")
@@ -127,13 +127,13 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
127127
baseResponseList.add(resp);
128128
}
129129
}
130-
VmwareRequestReponse<BaseResponse> response = new VmwareRequestReponse<>();
130+
VmwareRequestResponse<BaseResponse> response = new VmwareRequestResponse<>();
131131
response.setResponses(baseResponseList, baseResponseList.size());
132132
response.setResponseName(getCommandName());
133133
response.setToken(results.first());
134134
setResponseObject(response);
135135
} catch (CloudRuntimeException e) {
136-
String errorMsg = String.format("Error retrieving VMs from VMware VC: %s", e.getMessage());
136+
String errorMsg = String.format("Error retrieving VMs from Vmware VC: %s", e.getMessage());
137137
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, errorMsg);
138138
}
139139
}
@@ -153,4 +153,9 @@ private void checkParameters() {
153153
public long getEntityOwnerId() {
154154
return Account.ACCOUNT_ID_SYSTEM;
155155
}
156+
157+
@Override
158+
public String getCommandName() {
159+
return "listVmwareDcVmsResponse".toLowerCase();
160+
}
156161
}

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import com.cloud.hypervisor.vmware.VmwareDatacenterService;
4444
import com.cloud.user.Account;
4545

46-
@APICommand(name = "listVmwareDcs", responseObject = VmwareDatacenterResponse.class, description = "Retrieves VMware DC(s) associated with a zone.",
46+
@APICommand(name = "listVmwareDcs", responseObject = VmwareDatacenterResponse.class, description = "Retrieves Vmware DC(s) associated with a zone.",
4747
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
4848
public class ListVmwareDcsCmd extends BaseListCmd {
4949

@@ -52,7 +52,6 @@ public class ListVmwareDcsCmd extends BaseListCmd {
5252

5353
public static final Logger s_logger = Logger.getLogger(ListVmwareDcsCmd.class.getName());
5454

55-
5655
/////////////////////////////////////////////////////
5756
//////////////// API parameters /////////////////////
5857
/////////////////////////////////////////////////////
@@ -75,35 +74,40 @@ public Long getZoneId() {
7574
@Override
7675
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
7776
ResourceAllocationException {
78-
List<? extends VmwareDatacenter> vmwareDcList = null;
77+
List<? extends VmwareDatacenter> vmwareDcList;
7978

8079
try {
8180
vmwareDcList = _vmwareDatacenterService.listVmwareDatacenters(this);
8281
} catch (InvalidParameterValueException ie) {
8382
throw new InvalidParameterValueException("Invalid zone id " + getZoneId());
8483
} catch (Exception e) {
85-
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to find associated VMware DCs associated with zone " + getZoneId());
84+
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to find associated Vmware DCs associated with zone " + getZoneId());
8685
}
8786

88-
ListResponse<VmwareDatacenterResponse> response = new ListResponse<VmwareDatacenterResponse>();
89-
List<VmwareDatacenterResponse> vmwareDcResponses = new ArrayList<VmwareDatacenterResponse>();
87+
ListResponse<VmwareDatacenterResponse> response = new ListResponse<>();
88+
List<VmwareDatacenterResponse> vmwareDcResponses = getVmwareDatacenterResponses(vmwareDcList);
89+
response.setResponses(vmwareDcResponses);
90+
response.setResponseName(getCommandName());
91+
setResponseObject(response);
92+
}
9093

91-
if (vmwareDcList != null && vmwareDcList.size() > 0) {
94+
private List<VmwareDatacenterResponse> getVmwareDatacenterResponses(List<? extends VmwareDatacenter> vmwareDcList) {
95+
List<VmwareDatacenterResponse> vmwareDcResponses = new ArrayList<>();
96+
97+
if (vmwareDcList != null && !vmwareDcList.isEmpty()) {
9298
for (VmwareDatacenter vmwareDc : vmwareDcList) {
9399
VmwareDatacenterResponse vmwareDcResponse = new VmwareDatacenterResponse();
94100

95101
vmwareDcResponse.setId(vmwareDc.getUuid());
96102
vmwareDcResponse.setVcenter(vmwareDc.getVcenterHost());
97103
vmwareDcResponse.setName(vmwareDc.getVmwareDatacenterName());
98104
vmwareDcResponse.setZoneId(getZoneId());
99-
vmwareDcResponse.setObjectName("VMwareDC");
105+
vmwareDcResponse.setObjectName("VmwareDC");
100106

101107
vmwareDcResponses.add(vmwareDcResponse);
102108
}
103109
}
104-
response.setResponses(vmwareDcResponses);
105-
response.setResponseName(getCommandName());
106-
setResponseObject(response);
110+
return vmwareDcResponses;
107111
}
108112

109113
@Override

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.cloudstack.api.response.VsphereStoragePoliciesResponse;
3737
import org.apache.cloudstack.api.response.ZoneResponse;
3838
import org.apache.cloudstack.context.CallContext;
39-
import org.apache.log4j.Logger;
4039

4140
import javax.inject.Inject;
4241
import java.util.ArrayList;
@@ -48,9 +47,6 @@
4847
authorized = {RoleType.Admin})
4948
public class ListVsphereStoragePoliciesCmd extends BaseCmd {
5049

51-
public static final Logger LOGGER = Logger.getLogger(ListVsphereStoragePoliciesCmd.class.getName());
52-
53-
5450
@Inject
5551
public VmwareDatacenterService _vmwareDatacenterService;
5652

@@ -75,6 +71,13 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
7571

7672
List<? extends VsphereStoragePolicy> storagePolicies = _vmwareDatacenterService.listVsphereStoragePolicies(this);
7773
final ListResponse<VsphereStoragePoliciesResponse> responseList = new ListResponse<>();
74+
final List<VsphereStoragePoliciesResponse> storagePoliciesResponseList = getVsphereStoragePoliciesResponses(storagePolicies, dataCenter);
75+
responseList.setResponses(storagePoliciesResponseList);
76+
responseList.setResponseName(getCommandName());
77+
setResponseObject(responseList);
78+
}
79+
80+
private static List<VsphereStoragePoliciesResponse> getVsphereStoragePoliciesResponses(List<? extends VsphereStoragePolicy> storagePolicies, DataCenter dataCenter) {
7881
final List<VsphereStoragePoliciesResponse> storagePoliciesResponseList = new ArrayList<>();
7982
for (VsphereStoragePolicy storagePolicy : storagePolicies) {
8083
final VsphereStoragePoliciesResponse storagePoliciesResponse = new VsphereStoragePoliciesResponse();
@@ -83,13 +86,11 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
8386
storagePoliciesResponse.setName(storagePolicy.getName());
8487
storagePoliciesResponse.setPolicyId(storagePolicy.getPolicyId());
8588
storagePoliciesResponse.setDescription(storagePolicy.getDescription());
86-
storagePoliciesResponse.setObjectName("StoragePolicy");
89+
storagePoliciesResponse.setObjectName(ApiConstants.STORAGE_POLICY);
8790

8891
storagePoliciesResponseList.add(storagePoliciesResponse);
8992
}
90-
responseList.setResponses(storagePoliciesResponseList);
91-
responseList.setResponseName(getCommandName());
92-
setResponseObject(responseList);
93+
return storagePoliciesResponseList;
9394
}
9495

9596
@Override

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePolicyCompatiblePoolsCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void execute() throws ServerApiException, ConcurrentOperationException {
6868
List<StoragePoolResponse> poolResponses = new ArrayList<>();
6969
for (StoragePool pool : pools) {
7070
StoragePoolResponse poolResponse = _responseGenerator.createStoragePoolForMigrationResponse(pool);
71-
poolResponse.setObjectName("storagepool");
71+
poolResponse.setObjectName(ApiConstants.STORAGE_POOL);
7272
poolResponses.add(poolResponse);
7373
}
7474
response.setResponses(poolResponses);

‎plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.cloud.user.Account;
3636
import com.cloud.utils.exception.CloudRuntimeException;
3737

38-
@APICommand(name = "removeVmwareDc", responseObject = SuccessResponse.class, description = "Remove a VMware datacenter from a zone.",
38+
@APICommand(name = "removeVmwareDc", responseObject = SuccessResponse.class, description = "Remove a Vmware datacenter from a zone.",
3939
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
4040
public class RemoveVmwareDcCmd extends BaseCmd {
4141

@@ -49,7 +49,7 @@ public class RemoveVmwareDcCmd extends BaseCmd {
4949
type = CommandType.UUID,
5050
entityType = ZoneResponse.class,
5151
required = true,
52-
description = "The id of Zone from which VMware datacenter has to be removed.")
52+
description = "The id of Zone from which Vmware datacenter has to be removed.")
5353
private Long zoneId;
5454

5555
public Long getZoneId() {
@@ -65,10 +65,10 @@ public void execute() {
6565
response.setResponseName(getCommandName());
6666
setResponseObject(response);
6767
} else {
68-
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to remove VMware datacenter from zone");
68+
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to remove Vmware datacenter from zone");
6969
}
7070
} catch (ResourceInUseException ex) {
71-
s_logger.warn("The zone has one or more resources (like cluster), hence not able to remove VMware datacenter from zone."
71+
s_logger.warn("The zone has one or more resources (like cluster), hence not able to remove Vmware datacenter from zone."
7272
+ " Please remove all resource from zone, and retry. Exception: ", ex);
7373
ServerApiException e = new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
7474
for (String proxyObj : ex.getIdProxyList()) {

0 commit comments

Comments
 (0)