You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/21 17:10:11 UTC
[07/58] [abbrv] [partial] Reformatted all of the code.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
index 54488d5..fd9e057 100644
--- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
@@ -43,8 +43,8 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
* @param origTemplateInstallPath The install path of the original template VHD on the secondary
*/
- public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, String backedUpSnapshotUuid,
- String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, int wait) {
+ public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId,
+ String backedUpSnapshotUuid, String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, int wait) {
super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
this.origTemplateInstallPath = origTemplateInstallPath;
this.newTemplateId = newTemplateId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
index d81acd8..84f50af 100644
--- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java
@@ -33,8 +33,8 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
public CreatePrivateTemplateFromVolumeCommand() {
}
- public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName, String uniqueName,
- String volumePath, String vmName, int wait) {
+ public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName,
+ String uniqueName, String volumePath, String vmName, int wait) {
_secondaryStorageUrl = secondaryStorageUrl;
_templateId = templateId;
_accountId = accountId;
@@ -52,10 +52,12 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
return false;
}
+ @Override
public StorageFilerTO getPool() {
return _primaryPool;
}
+ @Override
public String getSecondaryStorageUrl() {
return _secondaryStorageUrl;
}
@@ -76,14 +78,17 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
return _vmName;
}
+ @Override
public void setVolumePath(String _volumePath) {
this._volumePath = _volumePath;
}
+ @Override
public String getVolumePath() {
return _volumePath;
}
+ @Override
public Long getAccountId() {
return _accountId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
index ef96911..ea0384e 100644
--- a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java
@@ -17,10 +17,10 @@
package com.cloud.agent.api;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
-
import java.util.List;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
public class CreateVMSnapshotAnswer extends Answer {
private List<VolumeObjectTO> volumeTOs;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
index 57d66a2..7f49155 100644
--- a/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java
@@ -18,11 +18,10 @@ package com.cloud.agent.api;
import java.util.List;
-import com.cloud.agent.api.to.DataTO;
-import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.vm.VirtualMachine;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import com.cloud.vm.VirtualMachine;
+
public class CreateVMSnapshotCommand extends VMSnapshotBaseCommand {
public CreateVMSnapshotCommand(String vmName, VMSnapshotTO snapshot, List<VolumeObjectTO> volumeTOs, String guestOSType, VirtualMachine.State vmState) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
index ff43322..f36ad3d 100644
--- a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java
@@ -52,7 +52,8 @@ public class CreateVolumeFromVMSnapshotCommand extends Command {
this.storagePoolUuid = storagePoolUuid;
}
- public CreateVolumeFromVMSnapshotCommand(String path, String name, Boolean fullClone, String storagePoolUuid, StorageFilerTO pool, DiskProfile diskProfile, Long volumeId) {
+ public CreateVolumeFromVMSnapshotCommand(String path, String name, Boolean fullClone, String storagePoolUuid, StorageFilerTO pool, DiskProfile diskProfile,
+ Long volumeId) {
this.path = path;
this.name = name;
this.fullClone = fullClone;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
index 1d26d0f..798cd54 100644
--- a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java
@@ -16,10 +16,10 @@
// under the License.
package com.cloud.agent.api;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
-
import java.util.List;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
public class DeleteVMSnapshotAnswer extends Answer {
private List<VolumeObjectTO> volumeTOs;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
index d9e4c6d..0d20050 100644
--- a/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java
@@ -18,7 +18,6 @@ package com.cloud.agent.api;
import java.util.List;
-import com.cloud.agent.api.to.VolumeTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
public class DeleteVMSnapshotCommand extends VMSnapshotBaseCommand {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/HostStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/HostStatsEntry.java b/core/src/com/cloud/agent/api/HostStatsEntry.java
index 02734fd..c9d25a0 100644
--- a/core/src/com/cloud/agent/api/HostStatsEntry.java
+++ b/core/src/com/cloud/agent/api/HostStatsEntry.java
@@ -31,8 +31,8 @@ public class HostStatsEntry implements HostStats {
public HostStatsEntry() {
}
- public HostStatsEntry(long hostId, double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType, double totalMemoryKBs, double freeMemoryKBs,
- double xapiMemoryUsageKBs, double averageLoad) {
+ public HostStatsEntry(long hostId, double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType, double totalMemoryKBs,
+ double freeMemoryKBs, double xapiMemoryUsageKBs, double averageLoad) {
this.hostId = hostId;
this.entityType = entityType;
this.cpuUtilization = cpuUtilization;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
index a108a2a..a94697a 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
@@ -17,9 +17,10 @@
package com.cloud.agent.api;
import java.util.Map;
+
+import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.agent.api.to.StorageFilerTO;
public class MigrateWithStorageCommand extends Command {
VirtualMachineTO vm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
index 76ceddd..ebb0db5 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java
@@ -17,8 +17,9 @@
package com.cloud.agent.api;
import java.util.Map;
-import com.cloud.agent.api.to.VolumeTO;
+
import com.cloud.agent.api.to.NicTO;
+import com.cloud.agent.api.to.VolumeTO;
public class MigrateWithStorageReceiveAnswer extends Answer {
@@ -33,7 +34,8 @@ public class MigrateWithStorageReceiveAnswer extends Answer {
token = null;
}
- public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map<VolumeTO, Object> volumeToSr, Map<NicTO, Object> nicToNetwork, Map<String, String> token) {
+ public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map<VolumeTO, Object> volumeToSr, Map<NicTO, Object> nicToNetwork,
+ Map<String, String> token) {
super(cmd, true, null);
this.volumeToSr = volumeToSr;
this.nicToNetwork = nicToNetwork;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
index df67405..0d1e7f6 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java
@@ -17,9 +17,10 @@
package com.cloud.agent.api;
import java.util.Map;
+
+import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.agent.api.to.StorageFilerTO;
public class MigrateWithStorageReceiveCommand extends Command {
VirtualMachineTO vm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
index 7cf641f..314c876 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java
@@ -17,6 +17,7 @@
package com.cloud.agent.api;
import java.util.Set;
+
import com.cloud.agent.api.to.VolumeTO;
public class MigrateWithStorageSendAnswer extends Answer {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
index 7ded645..6231b16b 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java
@@ -17,9 +17,10 @@
package com.cloud.agent.api;
import java.util.Map;
+
+import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.agent.api.to.NicTO;
public class MigrateWithStorageSendCommand extends Command {
VirtualMachineTO vm;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
index 5d6d236..5163c48 100644
--- a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
+++ b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
@@ -30,7 +30,8 @@ public class ModifyStoragePoolAnswer extends Answer {
public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map<String, TemplateProp> tInfo) {
super(cmd);
this.result = true;
- this.poolInfo = new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes);
+ this.poolInfo =
+ new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes);
this.templateInfo = tInfo;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
index e783d30..23cdcca 100644
--- a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
+++ b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
@@ -30,7 +30,8 @@ public class PingRoutingWithOvsCommand extends PingRoutingCommand {
super();
}
- public PingRoutingWithOvsCommand(Host.Type type, long id, Map<String, State> states, Map<String, HostVmStateReportEntry> hostVmStateReport, List<Pair<String, Long>> ovsStates) {
+ public PingRoutingWithOvsCommand(Host.Type type, long id, Map<String, State> states, Map<String, HostVmStateReportEntry> hostVmStateReport,
+ List<Pair<String, Long>> ovsStates) {
super(type, id, states, hostVmStateReport);
this.states = ovsStates;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
index ec27c3d..f6e8804 100644
--- a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
+++ b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java
@@ -23,6 +23,7 @@ public class RecurringNetworkUsageCommand extends Command implements CronCommand
this.interval = interval;
}
+ @Override
public int getInterval() {
return interval;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
index 4cdc47d..7168b89 100644
--- a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java
@@ -17,10 +17,11 @@
package com.cloud.agent.api;
-import com.cloud.vm.VirtualMachine;
+import java.util.List;
+
import org.apache.cloudstack.storage.to.VolumeObjectTO;
-import java.util.List;
+import com.cloud.vm.VirtualMachine;
public class RevertToVMSnapshotAnswer extends Answer {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
index b231441..853a068 100644
--- a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
@@ -57,7 +57,8 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand {
protected SetupGuestNetworkCommand() {
}
- public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority, String defaultDns1, String defaultDns2, boolean add, NicTO nic) {
+ public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority, String defaultDns1, String defaultDns2, boolean add,
+ NicTO nic) {
this.dhcpRange = dhcpRange;
this.networkDomain = networkDomain;
this.defaultDns1 = defaultDns1;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
index 6ff9288..626c87f 100755
--- a/core/src/com/cloud/agent/api/StartupRoutingCommand.java
+++ b/core/src/com/cloud/agent/api/StartupRoutingCommand.java
@@ -78,14 +78,22 @@ public class StartupRoutingCommand extends StartupCommand {
}
- public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, RouterPrivateIpStrategy privIpStrategy,
- Map<String, VmState> vms, Map<String, HostVmStateReportEntry> hostVmStateReport) {
+ public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType,
+ RouterPrivateIpStrategy privIpStrategy, Map<String, VmState> vms, Map<String, HostVmStateReportEntry> hostVmStateReport) {
this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, vms, hostVmStateReport);
getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString());
}
public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, RouterPrivateIpStrategy privIpStrategy) {
- this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, new HashMap<String, String>(), new HashMap<String, VmState>(), new HashMap<String, HostVmStateReportEntry>());
+ this(cpus,
+ speed,
+ memory,
+ dom0MinMemory,
+ caps,
+ hypervisorType,
+ new HashMap<String, String>(),
+ new HashMap<String, VmState>(),
+ new HashMap<String, HostVmStateReportEntry>());
getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
index 0dda6dd..2911d2e 100644
--- a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
+++ b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
import com.cloud.host.Host;
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
index 6b880d5..d2abd54 100644
--- a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
+++ b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java
@@ -19,8 +19,6 @@ package com.cloud.agent.api;
import java.util.List;
-import com.cloud.agent.api.to.DataTO;
-import com.cloud.agent.api.to.VolumeTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
public class VMSnapshotBaseCommand extends Command {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
index 765f4e4..e5d7841 100644
--- a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
+++ b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java
@@ -59,6 +59,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.bytesRead = bytesRead;
}
+ @Override
public long getBytesRead() {
return bytesRead;
}
@@ -67,6 +68,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.bytesWrite = bytesWrite;
}
+ @Override
public long getBytesWrite() {
return bytesWrite;
}
@@ -75,6 +77,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.ioRead = ioRead;
}
+ @Override
public long getIORead() {
return ioRead;
}
@@ -83,6 +86,7 @@ public class VmDiskStatsEntry implements VmDiskStats {
this.ioWrite = ioWrite;
}
+ @Override
public long getIOWrite() {
return ioWrite;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/VmStatsEntry.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/VmStatsEntry.java b/core/src/com/cloud/agent/api/VmStatsEntry.java
index a8238bc..a7a1968 100755
--- a/core/src/com/cloud/agent/api/VmStatsEntry.java
+++ b/core/src/com/cloud/agent/api/VmStatsEntry.java
@@ -51,6 +51,7 @@ public class VmStatsEntry implements VmStats {
this.entityType = entityType;
}
+ @Override
public double getCPUUtilization() {
return cpuUtilization;
}
@@ -59,6 +60,7 @@ public class VmStatsEntry implements VmStats {
this.cpuUtilization = cpuUtilization;
}
+ @Override
public double getNetworkReadKBs() {
return networkReadKBs;
}
@@ -67,6 +69,7 @@ public class VmStatsEntry implements VmStats {
this.networkReadKBs = networkReadKBs;
}
+ @Override
public double getNetworkWriteKBs() {
return networkWriteKBs;
}
@@ -75,6 +78,7 @@ public class VmStatsEntry implements VmStats {
this.networkWriteKBs = networkWriteKBs;
}
+ @Override
public double getDiskReadIOs() {
return diskReadIOs;
}
@@ -83,6 +87,7 @@ public class VmStatsEntry implements VmStats {
this.diskReadIOs = diskReadIOs;
}
+ @Override
public double getDiskWriteIOs() {
return diskWriteIOs;
}
@@ -91,6 +96,7 @@ public class VmStatsEntry implements VmStats {
this.diskWriteIOs = diskWriteIOs;
}
+ @Override
public double getDiskReadKBs() {
return diskReadKBs;
}
@@ -99,6 +105,7 @@ public class VmStatsEntry implements VmStats {
this.diskReadKBs = diskReadKBs;
}
+ @Override
public double getDiskWriteKBs() {
return diskWriteKBs;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
index a1b61f0..267ed8b 100644
--- a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
+++ b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
@@ -53,6 +53,7 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCo
return proxyCmdPort;
}
+ @Override
public int getInterval() {
return interval;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
index 4155013..49adc9e 100644
--- a/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/DnsMasqConfigCommand.java
@@ -16,10 +16,10 @@
// under the License.
package com.cloud.agent.api.routing;
-import com.cloud.agent.api.to.DhcpTO;
-
import java.util.List;
+import com.cloud.agent.api.to.DhcpTO;
+
public class DnsMasqConfigCommand extends NetworkElementCommand {
List<DhcpTO> dhcpTOs;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
index 108bcce..9c5244a 100644
--- a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
+++ b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
@@ -17,10 +17,10 @@
package com.cloud.agent.api.routing;
-import com.cloud.agent.api.Command;
-
import java.util.List;
+import com.cloud.agent.api.Command;
+
/**
* GlobalLoadBalancerConfigCommand used for sending the GSLB configuration to GSLB service provider
*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
index 08ef20c..12f57dc 100644
--- a/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
@@ -16,9 +16,8 @@
// under the License.
package com.cloud.agent.api.routing;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
+
import com.cloud.agent.api.to.MonitorServiceTO;
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
index e23e792..7f1916c 100644
--- a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
@@ -33,7 +33,8 @@ public class CopyVolumeCommand extends Command {
public CopyVolumeCommand() {
}
- public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait, boolean executeInSequence) {
+ public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait,
+ boolean executeInSequence) {
this.volumeId = volumeId;
this.volumePath = volumePath;
this.pool = new StorageFilerTO(pool);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
index d42fee2..56d9c30 100644
--- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
+++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
@@ -31,7 +31,8 @@ public class CreatePrivateTemplateAnswer extends Answer {
super();
}
- public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, long physicalSize, String uniqueName, ImageFormat format) {
+ public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, long physicalSize, String uniqueName,
+ ImageFormat format) {
super(cmd, success, result);
_path = path;
_virtualSize = virtualSize;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
index 4bd9f96..315ad25 100755
--- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java
+++ b/core/src/com/cloud/agent/api/storage/DestroyCommand.java
@@ -35,8 +35,9 @@ public class DestroyCommand extends StorageCommand {
}
public DestroyCommand(StoragePool pool, VMTemplateStorageResourceAssoc templatePoolRef) {
- volume = new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(), null, pool.getPath(), templatePoolRef.getInstallPath(),
- templatePoolRef.getTemplateSize(), null);
+ volume =
+ new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(), null, pool.getPath(), templatePoolRef.getInstallPath(),
+ templatePoolRef.getTemplateSize(), null);
}
public VolumeTO getVolume() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index d23fcce..34450fe 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -446,8 +446,9 @@ public class VirtualRoutingResource implements Manager {
cfgFilePath = tmpCfgFile.getAbsolutePath();
}
- final String result = setLoadBalancerConfig(cfgFilePath, rules[LoadBalancerConfigurator.ADD], rules[LoadBalancerConfigurator.REMOVE],
- rules[LoadBalancerConfigurator.STATS], routerIp);
+ final String result =
+ setLoadBalancerConfig(cfgFilePath, rules[LoadBalancerConfigurator.ADD], rules[LoadBalancerConfigurator.REMOVE], rules[LoadBalancerConfigurator.STATS],
+ routerIp);
return new Answer(cmd, result == null, result);
} catch (final IOException e) {
@@ -486,8 +487,9 @@ public class VirtualRoutingResource implements Manager {
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
for (IpAddressTO ip : ips) {
- result = assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(),
- ip.getVlanNetmask(), ip.getVifMacAddress(), 2, false);
+ result =
+ assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(),
+ ip.getVlanNetmask(), ip.getVifMacAddress(), 2, false);
if (result != null) {
results[i++] = IpAssocAnswer.errorResult;
} else {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
index 30e8319..1debdc8 100755
--- a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
+++ b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
@@ -33,6 +32,8 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.cloud.utils.exception.CloudRuntimeException;
+
public class ArrayTypeAdaptor<T> implements JsonDeserializer<T[]>, JsonSerializer<T[]> {
protected Gson _gson = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
index 7822ee8..8e25cc0 100644
--- a/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
+++ b/core/src/com/cloud/agent/transport/InterfaceTypeAdaptor.java
@@ -19,7 +19,6 @@ package com.cloud.agent.transport;
import java.lang.reflect.Type;
import java.util.Map;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.google.gson.Gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
@@ -29,6 +28,8 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.cloud.utils.exception.CloudRuntimeException;
+
public class InterfaceTypeAdaptor<T> implements JsonDeserializer<T>, JsonSerializer<T> {
protected Gson _gson = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
index 7c76fa0..ce3f21a 100644
--- a/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
+++ b/core/src/com/cloud/agent/transport/LoggingExclusionStrategy.java
@@ -18,11 +18,12 @@ package com.cloud.agent.transport;
import org.apache.log4j.Logger;
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+
import com.cloud.agent.api.Command;
import com.cloud.agent.api.LogLevel;
import com.cloud.agent.api.LogLevel.Log4jLevel;
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
public class LoggingExclusionStrategy implements ExclusionStrategy {
Logger _logger = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/network/HAProxyConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java
index b6e18e6..e5fa787 100644
--- a/core/src/com/cloud/network/HAProxyConfigurator.java
+++ b/core/src/com/cloud/network/HAProxyConfigurator.java
@@ -26,25 +26,24 @@ import java.util.Set;
import org.apache.log4j.Logger;
-import com.cloud.utils.Pair;
-
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.agent.api.to.PortForwardingRuleTO;
import com.cloud.agent.api.to.LoadBalancerTO.DestinationTO;
import com.cloud.agent.api.to.LoadBalancerTO.StickinessPolicyTO;
+import com.cloud.agent.api.to.PortForwardingRuleTO;
import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType;
+import com.cloud.utils.Pair;
import com.cloud.utils.net.NetUtils;
public class HAProxyConfigurator implements LoadBalancerConfigurator {
private static final Logger s_logger = Logger.getLogger(HAProxyConfigurator.class);
private static final String blankLine = "\t ";
- private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914 local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy", "\tuser haproxy",
- "\tgroup haproxy", "\tdaemon"};
+ private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914 local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy",
+ "\tuser haproxy", "\tgroup haproxy", "\tdaemon"};
private static String[] defaultsSection = {"defaults", "\tlog global", "\tmode tcp", "\toption dontlognull", "\tretries 3", "\toption redispatch",
- "\toption forwardfor", "\toption forceclose", "\ttimeout connect 5000", "\ttimeout client 50000", "\ttimeout server 50000"};
+ "\toption forwardfor", "\toption forceclose", "\ttimeout connect 5000", "\ttimeout client 50000", "\ttimeout server 50000"};
private static String[] defaultListen = {"listen vmops 0.0.0.0:9", "\toption transparent"};
@@ -527,7 +526,10 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
s_logger.info("Haproxy mode http enabled");
rule.append("\n\tmode http\n\toption httpclose");
}
- rule.append("\n\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri).append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ").append(lbCmd.lbStatsAuth);
+ rule.append("\n\tstats enable\n\tstats uri ")
+ .append(lbCmd.lbStatsUri)
+ .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ")
+ .append(lbCmd.lbStatsAuth);
rule.append("\n");
String result = rule.toString();
if (s_logger.isDebugEnabled()) {
@@ -587,9 +589,10 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
* stats will be available on the default http serving port, no
* special stats port
*/
- StringBuilder subRule = new StringBuilder("\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri)
- .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ")
- .append(lbCmd.lbStatsAuth);
+ StringBuilder subRule =
+ new StringBuilder("\tstats enable\n\tstats uri ").append(lbCmd.lbStatsUri)
+ .append("\n\tstats realm Haproxy\\ Statistics\n\tstats auth ")
+ .append(lbCmd.lbStatsAuth);
result.add(subRule.toString());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
index 437891b..ada5f5e 100644
--- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java
+++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
@@ -204,8 +204,9 @@ public class TrafficSentinelResource implements ServerResource {
try {
//Query traffic Sentinel
- trafficSentinel = new URL(_url + "/inmsf/Query?script=" + URLEncoder.encode(getScript(cmd.getPublicIps(), cmd.getStart(), cmd.getEnd()), "UTF-8") +
- "&authenticate=basic&resultFormat=txt");
+ trafficSentinel =
+ new URL(_url + "/inmsf/Query?script=" + URLEncoder.encode(getScript(cmd.getPublicIps(), cmd.getStart(), cmd.getEnd()), "UTF-8") +
+ "&authenticate=basic&resultFormat=txt");
BufferedReader in = new BufferedReader(new InputStreamReader(trafficSentinel.openStream()));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/resource/ResourceListener.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ResourceListener.java b/core/src/com/cloud/resource/ResourceListener.java
index e6e8482..a911bc5 100755
--- a/core/src/com/cloud/resource/ResourceListener.java
+++ b/core/src/com/cloud/resource/ResourceListener.java
@@ -31,8 +31,8 @@ public interface ResourceListener {
static final Integer EVENT_CANCEL_MAINTENANCE_AFTER = 0x1 << 5;
static final Integer EVENT_PREPARE_MAINTENANCE_BEFORE = 0x1 << 6;
static final Integer EVENT_PREPARE_MAINTENANCE_AFTER = 0x1 << 7;
- static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER | EVENT_CANCEL_MAINTENANCE_BEFORE |
- EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER);
+ static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER |
+ EVENT_CANCEL_MAINTENANCE_BEFORE | EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER);
/**
*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/resource/ServerResourceBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java
index 358ca90..4da9944 100755
--- a/core/src/com/cloud/resource/ServerResourceBase.java
+++ b/core/src/com/cloud/resource/ServerResourceBase.java
@@ -99,7 +99,7 @@ public abstract class ServerResourceBase implements ServerResource {
if (//!nic.isLoopback() &&
//nic.isUp() &&
!nic.isVirtual() && !nicName.startsWith("vnif") && !nicName.startsWith("vnbr") && !nicName.startsWith("peth") && !nicName.startsWith("vif") &&
- !nicName.startsWith("virbr") && !nicName.contains(":")) {
+ !nicName.startsWith("virbr") && !nicName.contains(":")) {
final String[] info = NetUtils.getNicParams(nicName);
if (info != null && info[0] != null) {
_privateNic = nic;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/serializer/GsonHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/serializer/GsonHelper.java b/core/src/com/cloud/serializer/GsonHelper.java
index ca22d1d..4349b4a 100644
--- a/core/src/com/cloud/serializer/GsonHelper.java
+++ b/core/src/com/cloud/serializer/GsonHelper.java
@@ -20,6 +20,10 @@ import java.util.List;
import org.apache.log4j.Logger;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
@@ -31,9 +35,6 @@ import com.cloud.agent.transport.LoggingExclusionStrategy;
import com.cloud.agent.transport.Request.NwGroupsCommandTypeAdaptor;
import com.cloud.agent.transport.Request.PortConfigListTypeAdaptor;
import com.cloud.utils.Pair;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
public class GsonHelper {
private static final Logger s_logger = Logger.getLogger(GsonHelper.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/serializer/SerializerHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/serializer/SerializerHelper.java b/core/src/com/cloud/serializer/SerializerHelper.java
index 42fbf07..1ba55fc 100644
--- a/core/src/com/cloud/serializer/SerializerHelper.java
+++ b/core/src/com/cloud/serializer/SerializerHelper.java
@@ -26,9 +26,10 @@ import java.util.List;
import org.apache.log4j.Logger;
+import com.google.gson.Gson;
+
import com.cloud.utils.DateUtil;
import com.cloud.utils.Pair;
-import com.google.gson.Gson;
/**
* Note: toPairList and appendPairList only support simple POJO objects currently
@@ -155,7 +156,7 @@ public class SerializerHelper {
} catch (NoSuchMethodException e1) {
if (s_logger.isTraceEnabled()) {
s_logger.trace("POJO " + o.getClass().getName() + " does not have " + methodName + "() method for property: " + propName +
- ", will check is-prefixed method to see if it is boolean property");
+ ", will check is-prefixed method to see if it is boolean property");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/resource/StorageProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageProcessor.java b/core/src/com/cloud/storage/resource/StorageProcessor.java
index 1136b08..d49a64b 100644
--- a/core/src/com/cloud/storage/resource/StorageProcessor.java
+++ b/core/src/com/cloud/storage/resource/StorageProcessor.java
@@ -27,8 +27,6 @@ import org.apache.cloudstack.storage.command.ForgetObjectCmd;
import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
import com.cloud.agent.api.Answer;
-import org.apache.cloudstack.storage.command.ForgetObjectCmd;
-import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
public interface StorageProcessor {
public Answer copyTemplateToPrimaryStorage(CopyCommand cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
index 88a7dd2..61af4d9 100644
--- a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
+++ b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
@@ -75,11 +75,12 @@ public class StorageSubsystemCommandHandlerBase implements StorageSubsystemComma
destData.getDataStore().getRole() == DataStoreRole.Primary) {
//copy template to primary storage
return processor.copyTemplateToPrimaryStorage(cmd);
- } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcDataStore.getRole() == DataStoreRole.Primary && destDataStore.getRole() == DataStoreRole.Primary) {
+ } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcDataStore.getRole() == DataStoreRole.Primary &&
+ destDataStore.getRole() == DataStoreRole.Primary) {
//clone template to a volume
return processor.cloneVolumeFromBaseTemplate(cmd);
} else if (srcData.getObjectType() == DataObjectType.VOLUME &&
- (srcData.getDataStore().getRole() == DataStoreRole.ImageCache || srcDataStore.getRole() == DataStoreRole.Image)) {
+ (srcData.getDataStore().getRole() == DataStoreRole.ImageCache || srcDataStore.getRole() == DataStoreRole.Image)) {
//copy volume from image cache to primary
return processor.copyVolumeFromImageCacheToPrimary(cmd);
} else if (srcData.getObjectType() == DataObjectType.VOLUME && srcData.getDataStore().getRole() == DataStoreRole.Primary) {
@@ -89,7 +90,7 @@ public class StorageSubsystemCommandHandlerBase implements StorageSubsystemComma
return processor.createTemplateFromVolume(cmd);
}
} else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.SNAPSHOT &&
- srcData.getDataStore().getRole() == DataStoreRole.Primary) {
+ srcData.getDataStore().getRole() == DataStoreRole.Primary) {
return processor.backupSnapshot(cmd);
} else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.VOLUME) {
return processor.createVolumeFromSnapshot(cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
index 2a6547a..f3d34b0 100644
--- a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
@@ -39,6 +39,7 @@ import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.log4j.Logger;
+
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
@@ -75,8 +76,8 @@ public class HttpTemplateDownloader extends ManagedContextRunnable implements Te
private ResourceType resourceType = ResourceType.TEMPLATE;
private final HttpMethodRetryHandler myretryhandler;
- public HttpTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, DownloadCompleteCallback callback, long maxTemplateSizeInBytes, String user,
- String password, Proxy proxy, ResourceType resourceType) {
+ public HttpTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, DownloadCompleteCallback callback, long maxTemplateSizeInBytes,
+ String user, String password, Proxy proxy, ResourceType resourceType) {
_storage = storageLayer;
this.downloadUrl = downloadUrl;
setToDir(toDir);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/IsoProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/com/cloud/storage/template/IsoProcessor.java
index ede21ce..2dbfb48 100644
--- a/core/src/com/cloud/storage/template/IsoProcessor.java
+++ b/core/src/com/cloud/storage/template/IsoProcessor.java
@@ -24,8 +24,8 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
-import com.cloud.storage.StorageLayer;
import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
@Local(value = Processor.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/Processor.java b/core/src/com/cloud/storage/template/Processor.java
index 3d137dc..4887e4e 100644
--- a/core/src/com/cloud/storage/template/Processor.java
+++ b/core/src/com/cloud/storage/template/Processor.java
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.storage.template;
+import java.io.File;
+
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.utils.component.Adapter;
-import java.io.File;
-
/**
* Generic interface to process different types of image formats
* for templates downloaded and for conversion from one format
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/QCOW2Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/com/cloud/storage/template/QCOW2Processor.java
index e5f232f..b3c0cc9 100644
--- a/core/src/com/cloud/storage/template/QCOW2Processor.java
+++ b/core/src/com/cloud/storage/template/QCOW2Processor.java
@@ -81,6 +81,7 @@ public class QCOW2Processor extends AdapterBase implements Processor {
return info;
}
+ @Override
public Long getVirtualSize(File file) {
FileInputStream strm = null;
byte[] b = new byte[8];
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/S3TemplateDownloader.java b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
index a111013..21b7a59 100644
--- a/core/src/com/cloud/storage/template/S3TemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/S3TemplateDownloader.java
@@ -215,7 +215,7 @@ public class S3TemplateDownloader extends ManagedContextRunnable implements Temp
InputStream in = !chunked ? new BufferedInputStream(request.getResponseBodyAsStream()) : new ChunkedInputStream(request.getResponseBodyAsStream());
s_logger.info("Starting download from " + getDownloadUrl() + " to s3 bucket " + s3.getBucketName() + " remoteSize=" + remoteSize + " , max size=" +
- maxTemplateSizeInByte);
+ maxTemplateSizeInByte);
Date start = new Date();
// compute s3 key
@@ -261,7 +261,7 @@ public class S3TemplateDownloader extends ManagedContextRunnable implements Temp
// single part upload, with 5GB limit in Amazon
S3Utils.putObject(s3, putObjectRequest);
while (status != TemplateDownloader.Status.DOWNLOAD_FINISHED && status != TemplateDownloader.Status.UNRECOVERABLE_ERROR &&
- status != TemplateDownloader.Status.ABORTED) {
+ status != TemplateDownloader.Status.ABORTED) {
// wait for completion
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
index 466958d..7eb0b5f 100644
--- a/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
+++ b/core/src/com/cloud/storage/template/TemplateDownloaderBase.java
@@ -18,9 +18,10 @@ package com.cloud.storage.template;
import java.io.File;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+
import com.cloud.storage.StorageLayer;
public abstract class TemplateDownloaderBase extends ManagedContextRunnable implements TemplateDownloader {
@@ -119,6 +120,7 @@ public abstract class TemplateDownloaderBase extends ManagedContextRunnable impl
return true;
}
+ @Override
public long getMaxTemplateSizeInBytes() {
return this.MAX_TEMPLATE_SIZE_IN_BYTES;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/TemplateLocation.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TemplateLocation.java b/core/src/com/cloud/storage/template/TemplateLocation.java
index b97ff76..48b040a 100644
--- a/core/src/com/cloud/storage/template/TemplateLocation.java
+++ b/core/src/com/cloud/storage/template/TemplateLocation.java
@@ -24,9 +24,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
+
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.template.Processor.FormatInfo;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/VhdProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/com/cloud/storage/template/VhdProcessor.java
index e0fdb35..308ea64 100644
--- a/core/src/com/cloud/storage/template/VhdProcessor.java
+++ b/core/src/com/cloud/storage/template/VhdProcessor.java
@@ -25,7 +25,6 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
-import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException;
@@ -33,6 +32,7 @@ import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
/**
* VhdProcessor processes the downloaded template for VHD. It
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/com/cloud/storage/template/VmdkProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
index 92c0ce6..be20143 100644
--- a/core/src/com/cloud/storage/template/VmdkProcessor.java
+++ b/core/src/com/cloud/storage/template/VmdkProcessor.java
@@ -22,9 +22,10 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
index 21fedf9..01c05f0 100644
--- a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java
@@ -17,7 +17,6 @@
package org.apache.cloudstack.storage.to;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.storage.DataStoreRole;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
index a46351b..03b4609 100644
--- a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
@@ -17,12 +17,12 @@
package org.apache.cloudstack.storage.to;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
public class SnapshotObjectTO implements DataTO {
private String path;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
index f25cc71..b201c38 100644
--- a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
@@ -16,12 +16,12 @@
// under the License.
package org.apache.cloudstack.storage.to;
-import com.cloud.hypervisor.Hypervisor;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
----------------------------------------------------------------------
diff --git a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
index b8c7faa..4499049 100644
--- a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
+++ b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java
@@ -16,12 +16,12 @@
// under the License.
package org.apache.cloudstack.storage.to;
-import com.cloud.hypervisor.Hypervisor;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage;
import com.cloud.storage.Volume;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/network/HAProxyConfiguratorTest.java b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
index 2e6cb45..33cf50b 100644
--- a/core/test/com/cloud/network/HAProxyConfiguratorTest.java
+++ b/core/test/com/cloud/network/HAProxyConfiguratorTest.java
@@ -16,14 +16,13 @@
// under the License.
package com.cloud.network;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.mockito.Mockito;
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.to.LoadBalancerTO;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
index 6aaa00b..4411c47 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java
@@ -36,8 +36,9 @@ public class BackupSnapshotAnswerTest {
StoragePool pool = Mockito.mock(StoragePool.class);
- bsc = new BackupSnapshotCommand("secondaryStoragePoolURL", 101L, 102L, 103L, 104L, 105L, "volumePath", pool, "snapshotUuid", "snapshotName", "prevSnapshotUuid",
- "prevBackupUuid", false, "vmName", 5);
+ bsc =
+ new BackupSnapshotCommand("secondaryStoragePoolURL", 101L, 102L, 103L, 104L, 105L, "volumePath", pool, "snapshotUuid", "snapshotName", "prevSnapshotUuid",
+ "prevBackupUuid", false, "vmName", 5);
bsa = new BackupSnapshotAnswer(bsc, true, "results", "bussname", false);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
index 3b66c67..eaa9b94 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java
@@ -148,11 +148,11 @@ public class BackupSnapshotCommandTest {
};
};
- BackupSnapshotCommand bsc = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, "420fa39c-4ef1-a83c-fd93-46dc1ff515ae",
- "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
+ BackupSnapshotCommand bsc = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool,
+ "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
- BackupSnapshotCommand bsc1 = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool, "420fa39c-4ef1-a83c-fd93-46dc1ff515ae",
- "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
+ BackupSnapshotCommand bsc1 = new BackupSnapshotCommand("http://secondary.Storage.Url", 101L, 102L, 103L, 104L, 105L, "vPath", pool,
+ "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName", "9012793e-0657-11e2-bebc-0050568b0057", "7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
@Test
public void testGetSecondaryStorageUrl() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
index ac9efb1..b0872bf 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java
@@ -20,21 +20,21 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import com.cloud.agent.api.storage.ResizeVolumeCommand;
-import com.cloud.agent.api.to.StorageFilerTO;
-import com.cloud.storage.Storage;
-import com.cloud.storage.StoragePool;
-import com.cloud.storage.StoragePoolStatus;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import com.cloud.agent.api.CheckNetworkAnswer;
import com.cloud.agent.api.CheckNetworkCommand;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.cloud.agent.api.storage.ResizeVolumeCommand;
+import com.cloud.agent.api.to.StorageFilerTO;
+import com.cloud.storage.Storage;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.StoragePoolStatus;
public class CheckNetworkAnswerTest {
CheckNetworkCommand cnc;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
index 1934210..d266eb3 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
@@ -35,10 +35,12 @@ import com.cloud.resource.ResourceState;
public class CheckOnHostCommandTest {
public Host host = new Host() {
+ @Override
public Status getState() {
return Status.Up;
};
+ @Override
public long getId() {
return 101L;
};
@@ -48,14 +50,17 @@ public class CheckOnHostCommandTest {
return "101";
}
+ @Override
public String getName() {
return "hostName";
};
+ @Override
public Type getType() {
return Host.Type.Storage;
};
+ @Override
public Date getCreated() {
Date date = null;
try {
@@ -66,62 +71,77 @@ public class CheckOnHostCommandTest {
return date;
}
+ @Override
public Status getStatus() {
return Status.Up;
};
+ @Override
public String getPrivateIpAddress() {
return "10.1.1.1";
};
+ @Override
public String getStorageIpAddress() {
return "10.1.1.2";
};
+ @Override
public String getGuid() {
return "bed9f83e-cac3-11e1-ac8a-0050568b007e";
};
+ @Override
public Long getTotalMemory() {
return 100000000000L;
}
+ @Override
public Integer getCpuSockets() {
return 1;
};
+ @Override
public Integer getCpus() {
return 16;
};
+ @Override
public Long getSpeed() {
return 2000000000L;
};
+ @Override
public Integer getProxyPort() {
return 22;
};
+ @Override
public Long getPodId() {
return 16L;
};
+ @Override
public long getDataCenterId() {
return 17L;
};
+ @Override
public String getParent() {
return "parent";
};
+ @Override
public String getStorageIpAddressDeux() {
return "10.1.1.3";
};
+ @Override
public HypervisorType getHypervisorType() {
return HypervisorType.XenServer;
};
+ @Override
public Date getDisconnectedOn() {
Date date = null;
try {
@@ -132,26 +152,32 @@ public class CheckOnHostCommandTest {
return date;
}
+ @Override
public String getVersion() {
return "4.0.1";
};
+ @Override
public long getTotalSize() {
return 100000000000L;
};
+ @Override
public String getCapabilities() {
return "capabilities";
};
+ @Override
public long getLastPinged() {
return 1L;
};
+ @Override
public Long getManagementServerId() {
return 2L;
};
+ @Override
public Date getRemoved() {
Date date = null;
try {
@@ -162,54 +188,67 @@ public class CheckOnHostCommandTest {
return date;
};
+ @Override
public Long getClusterId() {
return 3L;
};
+ @Override
public String getPublicIpAddress() {
return "10.1.1.4";
};
+ @Override
public String getPublicNetmask() {
return "255.255.255.8";
};
+ @Override
public String getPrivateNetmask() {
return "255.255.255.16";
};
+ @Override
public String getStorageNetmask() {
return "255.255.255.24";
};
+ @Override
public String getStorageMacAddress() {
return "01:f4:17:38:0e:26";
};
+ @Override
public String getPublicMacAddress() {
return "02:f4:17:38:0e:26";
};
+ @Override
public String getPrivateMacAddress() {
return "03:f4:17:38:0e:26";
};
+ @Override
public String getStorageNetmaskDeux() {
return "255.255.255.25";
};
+ @Override
public String getStorageMacAddressDeux() {
return "01:f4:17:38:0e:27";
};
+ @Override
public String getHypervisorVersion() {
return "1.2.3.0";
};
+ @Override
public boolean isInMaintenanceStates() {
return false;
};
+ @Override
public ResourceState getResourceState() {
return ResourceState.Enabled;
};
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
index c915229..8339a98 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java
@@ -35,22 +35,27 @@ import com.cloud.storage.StoragePoolStatus;
public class SnapshotCommandTest {
public StoragePool pool = new StoragePool() {
+ @Override
public long getId() {
return 1L;
};
+ @Override
public String getName() {
return "name";
};
+ @Override
public String getUuid() {
return "bed9f83e-cac3-11e1-ac8a-0050568b007e";
};
+ @Override
public StoragePoolType getPoolType() {
return StoragePoolType.Filesystem;
};
+ @Override
public Date getCreated() {
Date date = null;
try {
@@ -61,58 +66,72 @@ public class SnapshotCommandTest {
return date;
}
+ @Override
public Date getUpdateTime() {
return new Date();
};
+ @Override
public long getDataCenterId() {
return 0L;
};
+ @Override
public long getCapacityBytes() {
return 0L;
};
+ @Override
public long getUsedBytes() {
return 0L;
};
+ @Override
public Long getCapacityIops() {
return 0L;
};
+ @Override
public Long getClusterId() {
return 0L;
};
+ @Override
public String getHostAddress() {
return "hostAddress";
};
+ @Override
public String getPath() {
return "path";
};
+ @Override
public String getUserInfo() {
return "userInfo";
};
+ @Override
public boolean isShared() {
return false;
};
+ @Override
public boolean isLocal() {
return false;
};
+ @Override
public StoragePoolStatus getStatus() {
return StoragePoolStatus.Up;
};
+ @Override
public int getPort() {
return 25;
};
+ @Override
public Long getPodId() {
return 0L;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/com/cloud/vm/VirtualMachineManager.java
----------------------------------------------------------------------
diff --git a/engine/api/src/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/com/cloud/vm/VirtualMachineManager.java
index 18aaafe..6757870 100644
--- a/engine/api/src/com/cloud/vm/VirtualMachineManager.java
+++ b/engine/api/src/com/cloud/vm/VirtualMachineManager.java
@@ -50,7 +50,7 @@ import com.cloud.utils.fsm.NoTransitionException;
public interface VirtualMachineManager extends Manager {
static final ConfigKey<Boolean> ExecuteInSequence = new ConfigKey<Boolean>("Advanced", Boolean.class, "execute.in.sequence.hypervisor.commands", "false",
"If set to true, StartCommand, StopCommand, CopyCommand will be synchronized on the agent side."
- + " If set to false, these commands become asynchronous. Default value is false.", true);
+ + " If set to false, these commands become asynchronous. Default value is false.", true);
public interface Topics {
public static final String VM_POWER_STATE = "vm.powerstate";
@@ -78,8 +78,8 @@ public interface VirtualMachineManager extends Manager {
LinkedHashMap<? extends DiskOffering, Long> dataDiskOfferings, LinkedHashMap<? extends Network, ? extends NicProfile> auxiliaryNetworks, DeploymentPlan plan,
HypervisorType hyperType) throws InsufficientCapacityException;
- void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering, LinkedHashMap<? extends Network, ? extends NicProfile> networkProfiles,
- DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException;
+ void allocate(String vmInstanceName, VirtualMachineTemplate template, ServiceOffering serviceOffering,
+ LinkedHashMap<? extends Network, ? extends NicProfile> networkProfiles, DeploymentPlan plan, HypervisorType hyperType) throws InsufficientCapacityException;
void start(String vmUuid, Map<VirtualMachineProfile.Param, Object> params);
@@ -109,7 +109,8 @@ public interface VirtualMachineManager extends Manager {
void migrate(String vmUuid, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException;
- void migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException;
+ void migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException,
+ ConcurrentOperationException;
void reboot(String vmUuid, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
index e416503..773c683 100755
--- a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
@@ -90,7 +90,8 @@ public interface VirtualMachineEntity extends CloudStackEntity {
* @param exclude list of areas to exclude
* @return a reservation id
*/
- String reserve(String plannerToUse, @BeanParam DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException;
+ String reserve(String plannerToUse, @BeanParam DeploymentPlan plan, ExcludeList exclude, String caller) throws InsufficientCapacityException,
+ ResourceUnavailableException;
/**
* Migrate this VM to a certain destination.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
index efdb675..bc532c3 100755
--- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
@@ -19,7 +19,6 @@
package org.apache.cloudstack.engine.datacenter.entity.api;
import javax.ws.rs.GET;
-
import javax.ws.rs.POST;
import javax.ws.rs.Produces;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
index f5c9553..059b330 100755
--- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntity.java
@@ -20,7 +20,6 @@ package org.apache.cloudstack.engine.datacenter.entity.api;
import java.util.List;
-import com.cloud.dc.Pod;
import com.cloud.org.Cluster;
import com.cloud.org.Grouping.AllocationState;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
index d36cd79..7891b90 100755
--- a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
/**
* All entities returned by the Cloud Orchestration Platform must implement
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
index ee28f3c..fc196e2 100755
--- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
@@ -74,9 +74,11 @@ public interface NetworkOrchestrationService {
throws ConcurrentOperationException;
List<? extends Network> setupNetwork(Account owner, NetworkOffering offering, Network predefined, DeploymentPlan plan, String name, String displayText,
- boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException;
+ boolean errorIfAlreadySetup, Long domainId, ACLType aclType, Boolean subdomainAccess, Long vpcId, Boolean isDisplayNetworkEnabled)
+ throws ConcurrentOperationException;
- void allocate(VirtualMachineProfile vm, LinkedHashMap<? extends Network, ? extends NicProfile> networks) throws InsufficientCapacityException, ConcurrentOperationException;
+ void allocate(VirtualMachineProfile vm, LinkedHashMap<? extends Network, ? extends NicProfile> networks) throws InsufficientCapacityException,
+ ConcurrentOperationException;
void prepare(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException,
ResourceUnavailableException;
@@ -89,8 +91,8 @@ public interface NetworkOrchestrationService {
List<NicProfile> getNicProfiles(VirtualMachine vm);
- Pair<? extends NetworkGuru, ? extends Network> implementNetwork(long networkId, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
- ResourceUnavailableException, InsufficientCapacityException;
+ Pair<? extends NetworkGuru, ? extends Network> implementNetwork(long networkId, DeployDestination dest, ReservationContext context)
+ throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
/**
* prepares vm nic change for migration
@@ -191,8 +193,8 @@ public interface NetworkOrchestrationService {
boolean shutdownNetworkElementsAndResources(ReservationContext context, boolean b, Network network);
- void implementNetworkElementsAndResources(DeployDestination dest, ReservationContext context, Network network, NetworkOffering findById) throws ConcurrentOperationException,
- InsufficientAddressCapacityException, ResourceUnavailableException, InsufficientCapacityException;
+ void implementNetworkElementsAndResources(DeployDestination dest, ReservationContext context, Network network, NetworkOffering findById)
+ throws ConcurrentOperationException, InsufficientAddressCapacityException, ResourceUnavailableException, InsufficientCapacityException;
Map<String, String> finalizeServicesAndProvidersForNetwork(NetworkOffering offering, Long physicalNetworkId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
index a7df437..7379ed6 100644
--- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
@@ -52,8 +52,8 @@ import com.cloud.vm.VirtualMachineProfile;
* to provision volumes.
*/
public interface VolumeOrchestrationService {
- VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType) throws ConcurrentOperationException,
- StorageUnavailableException;
+ VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType)
+ throws ConcurrentOperationException, StorageUnavailableException;
Volume allocateDuplicateVolume(Volume oldVol, Long templateId);
@@ -87,7 +87,8 @@ public interface VolumeOrchestrationService {
boolean canVmRestartOnAnotherServer(long vmId);
- DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm, Account owner);
+ DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, VirtualMachineTemplate template, VirtualMachine vm,
+ Account owner);
String getVmNameFromVolumeId(long volumeId);