Skip to content

Commit a0fe6ec

Browse files
spark404spark404
committed
Formatting changes using the settings from Alex
1 parent 5bdbd72 commit a0fe6ec

2 files changed

Lines changed: 27 additions & 81 deletions

File tree

‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,13 @@
3636
import javax.inject.Inject;
3737
import javax.naming.ConfigurationException;
3838

39-
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
40-
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
4139
import org.apache.log4j.Logger;
4240

4341
import com.google.gson.Gson;
4442
import com.vmware.vim25.AboutInfo;
4543
import com.vmware.vim25.HostConnectSpec;
4644
import com.vmware.vim25.ManagedObjectReference;
4745

48-
import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
49-
import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd;
50-
import org.apache.cloudstack.api.command.admin.zone.RemoveVmwareDcCmd;
51-
5246
import com.cloud.agent.AgentManager;
5347
import com.cloud.agent.Listener;
5448
import com.cloud.agent.api.AgentControlAnswer;
@@ -68,10 +62,10 @@
6862
import com.cloud.dc.dao.ClusterVSMMapDao;
6963
import com.cloud.dc.dao.DataCenterDao;
7064
import com.cloud.exception.DiscoveredWithErrorException;
71-
import com.cloud.host.Host;
7265
import com.cloud.exception.DiscoveryException;
7366
import com.cloud.exception.InvalidParameterValueException;
7467
import com.cloud.exception.ResourceInUseException;
68+
import com.cloud.host.Host;
7569
import com.cloud.host.Status;
7670
import com.cloud.host.dao.HostDao;
7771
import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -122,6 +116,12 @@
122116
import com.cloud.utils.ssh.SshHelper;
123117
import com.cloud.vm.DomainRouterVO;
124118

119+
import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
120+
import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd;
121+
import org.apache.cloudstack.api.command.admin.zone.RemoveVmwareDcCmd;
122+
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
123+
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
124+
125125

126126
@Local(value = {VmwareManager.class, VmwareDatacenterService.class})
127127
public class VmwareManagerImpl extends ManagerBase implements VmwareManager, VmwareStorageMount, Listener, VmwareDatacenterService {
@@ -459,7 +459,7 @@ private ManagedObjectReference addHostToVCenterCluster(VmwareContext serviceCont
459459
@Override
460460
public String getSecondaryStorageStoreUrl(long dcId) {
461461

462-
DataStore secStore = this._dataStoreMgr.getImageStore(dcId);
462+
DataStore secStore = _dataStoreMgr.getImageStore(dcId);
463463
if(secStore != null)
464464
return secStore.getUri();
465465

‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java‎

Lines changed: 19 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,15 @@
4848

4949
import com.google.gson.Gson;
5050
import com.vmware.vim25.AboutInfo;
51+
import com.vmware.vim25.BoolPolicy;
5152
import com.vmware.vim25.ClusterDasConfigInfo;
5253
import com.vmware.vim25.ComputeResourceSummary;
54+
import com.vmware.vim25.DVPortConfigInfo;
55+
import com.vmware.vim25.DVPortConfigSpec;
5356
import com.vmware.vim25.DatastoreSummary;
57+
import com.vmware.vim25.DistributedVirtualPort;
58+
import com.vmware.vim25.DistributedVirtualSwitchPortConnection;
59+
import com.vmware.vim25.DistributedVirtualSwitchPortCriteria;
5460
import com.vmware.vim25.DynamicProperty;
5561
import com.vmware.vim25.GuestInfo;
5662
import com.vmware.vim25.HostCapability;
@@ -79,12 +85,15 @@
7985
import com.vmware.vim25.PerfSampleInfo;
8086
import com.vmware.vim25.RuntimeFaultFaultMsg;
8187
import com.vmware.vim25.ToolsUnavailableFaultMsg;
88+
import com.vmware.vim25.VMwareDVSPortSetting;
8289
import com.vmware.vim25.VimPortType;
8390
import com.vmware.vim25.VirtualDevice;
91+
import com.vmware.vim25.VirtualDeviceBackingInfo;
8492
import com.vmware.vim25.VirtualDeviceConfigSpec;
8593
import com.vmware.vim25.VirtualDeviceConfigSpecOperation;
8694
import com.vmware.vim25.VirtualDisk;
8795
import com.vmware.vim25.VirtualEthernetCard;
96+
import com.vmware.vim25.VirtualEthernetCardDistributedVirtualPortBackingInfo;
8897
import com.vmware.vim25.VirtualEthernetCardNetworkBackingInfo;
8998
import com.vmware.vim25.VirtualLsiLogicController;
9099
import com.vmware.vim25.VirtualMachineConfigSpec;
@@ -95,12 +104,7 @@
95104
import com.vmware.vim25.VirtualMachineRelocateSpecDiskLocator;
96105
import com.vmware.vim25.VirtualMachineRuntimeInfo;
97106
import com.vmware.vim25.VirtualSCSISharing;
98-
99-
import org.apache.cloudstack.storage.command.DeleteCommand;
100-
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
101-
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
102-
import org.apache.cloudstack.storage.to.TemplateObjectTO;
103-
import org.apache.cloudstack.storage.to.VolumeObjectTO;
107+
import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanIdSpec;
104108

105109
import com.cloud.agent.IAgentControl;
106110
import com.cloud.agent.api.Answer;
@@ -265,7 +269,6 @@
265269
import com.cloud.hypervisor.vmware.mo.DatacenterMO;
266270
import com.cloud.hypervisor.vmware.mo.DatastoreMO;
267271
import com.cloud.hypervisor.vmware.mo.DiskControllerType;
268-
import com.cloud.hypervisor.vmware.mo.DistributedVirtualSwitchMO;
269272
import com.cloud.hypervisor.vmware.mo.FeatureKeyConstants;
270273
import com.cloud.hypervisor.vmware.mo.HostDatastoreSystemMO;
271274
import com.cloud.hypervisor.vmware.mo.HostFirewallSystemMO;
@@ -320,68 +323,11 @@
320323
import com.cloud.vm.VirtualMachineName;
321324
import com.cloud.vm.VmDetailConstants;
322325

323-
import com.google.gson.Gson;
324-
import com.vmware.vim25.AboutInfo;
325-
import com.vmware.vim25.BoolPolicy;
326-
import com.vmware.vim25.ClusterDasConfigInfo;
327-
import com.vmware.vim25.ComputeResourceSummary;
328-
import com.vmware.vim25.DVPortConfigInfo;
329-
import com.vmware.vim25.DVPortConfigSpec;
330-
import com.vmware.vim25.DVPortSetting;
331-
import com.vmware.vim25.DatastoreSummary;
332-
import com.vmware.vim25.DistributedVirtualPort;
333-
import com.vmware.vim25.DistributedVirtualSwitchPortConnection;
334-
import com.vmware.vim25.DistributedVirtualSwitchPortCriteria;
335-
import com.vmware.vim25.DynamicProperty;
336-
import com.vmware.vim25.GuestInfo;
337-
import com.vmware.vim25.GuestOsDescriptor;
338-
import com.vmware.vim25.HostCapability;
339-
import com.vmware.vim25.HostFirewallInfo;
340-
import com.vmware.vim25.HostFirewallRuleset;
341-
import com.vmware.vim25.HostHostBusAdapter;
342-
import com.vmware.vim25.HostInternetScsiTargetTransport;
343-
import com.vmware.vim25.HostScsiTopology;
344-
import com.vmware.vim25.HostInternetScsiHba;
345-
import com.vmware.vim25.HostInternetScsiHbaAuthenticationProperties;
346-
import com.vmware.vim25.HostInternetScsiHbaStaticTarget;
347-
import com.vmware.vim25.HostScsiDisk;
348-
import com.vmware.vim25.HostScsiTopologyInterface;
349-
import com.vmware.vim25.HostScsiTopologyLun;
350-
import com.vmware.vim25.HostScsiTopologyTarget;
351-
import com.vmware.vim25.ManagedObjectReference;
352-
import com.vmware.vim25.ObjectContent;
353-
import com.vmware.vim25.OptionValue;
354-
import com.vmware.vim25.PerfCounterInfo;
355-
import com.vmware.vim25.PerfEntityMetric;
356-
import com.vmware.vim25.PerfEntityMetricBase;
357-
import com.vmware.vim25.PerfMetricId;
358-
import com.vmware.vim25.PerfMetricIntSeries;
359-
import com.vmware.vim25.PerfMetricSeries;
360-
import com.vmware.vim25.PerfQuerySpec;
361-
import com.vmware.vim25.PerfSampleInfo;
362-
import com.vmware.vim25.RuntimeFaultFaultMsg;
363-
import com.vmware.vim25.ToolsUnavailableFaultMsg;
364-
import com.vmware.vim25.VMwareDVSPortSetting;
365-
import com.vmware.vim25.VimPortType;
366-
import com.vmware.vim25.VirtualDevice;
367-
import com.vmware.vim25.VirtualDeviceBackingInfo;
368-
import com.vmware.vim25.VirtualDeviceConfigSpec;
369-
import com.vmware.vim25.VirtualDeviceConfigSpecOperation;
370-
import com.vmware.vim25.VirtualDisk;
371-
import com.vmware.vim25.VirtualEthernetCard;
372-
import com.vmware.vim25.VirtualEthernetCardDistributedVirtualPortBackingInfo;
373-
import com.vmware.vim25.VirtualEthernetCardNetworkBackingInfo;
374-
import com.vmware.vim25.VirtualLsiLogicController;
375-
import com.vmware.vim25.VirtualMachineConfigOption;
376-
import com.vmware.vim25.VirtualMachineConfigSpec;
377-
import com.vmware.vim25.VirtualMachineFileInfo;
378-
import com.vmware.vim25.VirtualMachineGuestOsIdentifier;
379-
import com.vmware.vim25.VirtualMachinePowerState;
380-
import com.vmware.vim25.VirtualMachineRelocateSpec;
381-
import com.vmware.vim25.VirtualMachineRelocateSpecDiskLocator;
382-
import com.vmware.vim25.VirtualMachineRuntimeInfo;
383-
import com.vmware.vim25.VirtualSCSISharing;
384-
import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanIdSpec;
326+
import org.apache.cloudstack.storage.command.DeleteCommand;
327+
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
328+
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
329+
import org.apache.cloudstack.storage.to.TemplateObjectTO;
330+
import org.apache.cloudstack.storage.to.VolumeObjectTO;
385331

386332

387333
public class VmwareResource implements StoragePoolResource, ServerResource, VmwareHostService {
@@ -1559,7 +1505,7 @@ private PlugNicAnswer execute(PlugNicCommand cmd) {
15591505
s_logger.info("Executing resource PlugNicCommand " + _gson.toJson(cmd));
15601506
}
15611507

1562-
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
1508+
getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
15631509
VmwareContext context = getServiceContext();
15641510
try {
15651511
VmwareHypervisorHost hyperHost = getHyperHost(context);
@@ -2094,7 +2040,7 @@ protected Answer execute(final CreateIpAliasCommand cmd) {
20942040
if (s_logger.isInfoEnabled()) {
20952041
s_logger.info("Executing createipAlias command: " + _gson.toJson(cmd));
20962042
}
2097-
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
2043+
cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
20982044
List<IpAliasTO> ipAliasTOs = cmd.getIpAliasList();
20992045
String args=routerIp+" ";
21002046
for (IpAliasTO ipaliasto : ipAliasTOs) {
@@ -2130,7 +2076,7 @@ protected Answer execute(final CreateIpAliasCommand cmd) {
21302076
}
21312077

21322078
protected Answer execute(final DeleteIpAliasCommand cmd) {
2133-
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
2079+
cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
21342080
List<IpAliasTO> revokedIpAliasTOs = cmd.getDeleteIpAliasTos();
21352081
List<IpAliasTO> activeIpAliasTOs = cmd.getCreateIpAliasTos();
21362082
if (s_logger.isInfoEnabled()) {
@@ -6262,7 +6208,7 @@ public String getWorkerName(VmwareContext context, Command cmd, int workerSequen
62626208
String vmName = mgr.composeWorkerName();
62636209

62646210
assert(cmd != null);
6265-
VmwareManager vmwareMgr = context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
6211+
context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
62666212
// TODO: Fix this? long checkPointId = vmwareMgr.pushCleanupCheckpoint(this._guid, vmName);
62676213
// TODO: Fix this? cmd.setContextParam("checkpoint", String.valueOf(checkPointId));
62686214
return vmName;

0 commit comments

Comments
 (0)