You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/04 11:02:56 UTC
[26/55] [abbrv] api_refactor: refactor project apis
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
index f006329..955c81a 100644
--- a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java
@@ -17,14 +17,14 @@
package com.cloud.agent.api;
/**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.
+ * This currently assumes that both primary and secondary storage are mounted on the XenServer.
*/
public class CreateVolumeFromSnapshotCommand extends SnapshotCommand {
-
+
protected CreateVolumeFromSnapshotCommand() {
-
+
}
-
+
/**
* Given the UUID of a backed up snapshot VHD file on the secondary storage, the execute of this command does
* 1) Get the parent chain of this VHD all the way up to the root, say VHDList
@@ -33,11 +33,11 @@ public class CreateVolumeFromSnapshotCommand extends SnapshotCommand {
* 4) Rename the UUID of this VHD
* 5) Move this VHD to primary storage
* @param primaryStoragePoolNameLabel The primary storage Pool
- * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
+ * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
* In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
* If you have better ideas on how to get it, you are welcome.
* It may not be the UUID of the base copy of the snapshot, if no data was written since last snapshot.
- * @param templatePath The install path of the template VHD on the secondary, if this a root volume
+ * @param templatePath The install path of the template VHD on the secondary, if this a root volume
*/
public CreateVolumeFromSnapshotCommand(String primaryStoragePoolNameLabel,
String secondaryStoragePoolURL,
@@ -51,4 +51,4 @@ public class CreateVolumeFromSnapshotCommand extends SnapshotCommand {
super(primaryStoragePoolNameLabel, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
setWait(wait);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java b/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java
index 01de891..3d62c50 100644
--- a/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java
+++ b/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java
@@ -20,8 +20,8 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.agent.api.to.SwiftTO;
/**
- *
- *
+ *
+ *
*/
public class DeleteObjectFromSwiftCommand extends Command {
@@ -31,9 +31,9 @@ public class DeleteObjectFromSwiftCommand extends Command {
private String object;
protected DeleteObjectFromSwiftCommand() {
-
+
}
-
+
public DeleteObjectFromSwiftCommand(SwiftTO swift, String container, String object) {
this.swift = swift;
this.container = container;
@@ -58,4 +58,4 @@ public class DeleteObjectFromSwiftCommand extends Command {
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java b/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java
index b458aa0..9a895d8 100644
--- a/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java
+++ b/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java
@@ -18,15 +18,15 @@ package com.cloud.agent.api;
public class DeleteSnapshotBackupAnswer extends Answer {
-
+
protected DeleteSnapshotBackupAnswer() {
-
+
}
public DeleteSnapshotBackupAnswer(DeleteSnapshotBackupCommand cmd, boolean success, String details) {
super(cmd, success, details);
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java b/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java
index 3fa8c2b..6ea1945 100644
--- a/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java
+++ b/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java
@@ -21,7 +21,7 @@ import com.cloud.agent.api.to.SwiftTO;
/**
* This command encapsulates a primitive operation which enables coalescing the backed up VHD snapshots on the secondary server
- * This currently assumes that the secondary storage are mounted on the XenServer.
+ * This currently assumes that the secondary storage are mounted on the XenServer.
*/
public class DeleteSnapshotBackupCommand extends SnapshotCommand {
@LogLevel(Log4jLevel.Off)
@@ -46,31 +46,31 @@ public class DeleteSnapshotBackupCommand extends SnapshotCommand {
protected DeleteSnapshotBackupCommand() {
}
-
+
/**
* Given 2 VHD files on the secondary storage which are linked in a parent chain as follows:
* backupUUID = parent(childUUID)
- * It gets another VHD
+ * It gets another VHD
* previousBackupVHD = parent(backupUUID)
- *
+ *
* And
* 1) it coalesces backupUuid into its parent.
* 2) It deletes the VHD file corresponding to backupUuid
* 3) It sets the parent VHD of childUUID to that of previousBackupUuid
- *
+ *
* It takes care of the cases when
* 1) childUUID is null. - Step 3 is not done.
- * 2) previousBackupUUID is null
+ * 2) previousBackupUUID is null
* - Merge childUUID into its parent backupUUID
* - Set the UUID of the resultant VHD to childUUID
- * - Essentially we are deleting the oldest VHD file and setting the current oldest VHD to childUUID
- *
- * @param volumeName The name of the volume whose snapshot was taken (something like i-3-SV-ROOT)
- * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
+ * - Essentially we are deleting the oldest VHD file and setting the current oldest VHD to childUUID
+ *
+ * @param volumeName The name of the volume whose snapshot was taken (something like i-3-SV-ROOT)
+ * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
* In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
- * If you have better ideas on how to get it, you are welcome.
- * @param backupUUID The VHD which has to be deleted
- * @param childUUID The child VHD file of the backup whose parent is reset to its grandparent.
+ * If you have better ideas on how to get it, you are welcome.
+ * @param backupUUID The VHD which has to be deleted
+ * @param childUUID The child VHD file of the backup whose parent is reset to its grandparent.
*/
public DeleteSnapshotBackupCommand(SwiftTO swift,
String secondaryStoragePoolURL,
@@ -83,4 +83,4 @@ public class DeleteSnapshotBackupCommand extends SnapshotCommand {
setSwift(swift);
setAll(all);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java b/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
index 6879d23..e2071d7 100644
--- a/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
+++ b/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java
@@ -18,18 +18,18 @@ package com.cloud.agent.api;
/**
* This command encapsulates a primitive operation which enables coalescing the backed up VHD snapshots on the secondary server
- * This currently assumes that the secondary storage are mounted on the XenServer.
+ * This currently assumes that the secondary storage are mounted on the XenServer.
*/
public class DeleteSnapshotsDirCommand extends Command {
String secondaryStorageUrl;
Long dcId;
Long accountId;
Long volumeId;
-
+
protected DeleteSnapshotsDirCommand() {
-
+
}
-
+
public DeleteSnapshotsDirCommand(String secondaryStorageUrl,
Long dcId, Long accountId, Long volumeId)
{
@@ -60,4 +60,4 @@ public class DeleteSnapshotsDirCommand extends Command {
return volumeId;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
index 7fa60ad..4618d59 100644
--- a/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
+++ b/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
@@ -23,20 +23,20 @@ import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
public class DeleteStoragePoolCommand extends Command {
-
+
StorageFilerTO pool;
public static final String LOCAL_PATH_PREFIX="/mnt/";
String localPath;
-
+
public DeleteStoragePoolCommand() {
-
+
}
-
+
public DeleteStoragePoolCommand(StoragePool pool, String localPath) {
this.pool = new StorageFilerTO(pool);
this.localPath = localPath;
}
-
+
public DeleteStoragePoolCommand(StoragePool pool) {
this(pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
}
@@ -48,7 +48,7 @@ public class DeleteStoragePoolCommand extends Command {
public void setPool(StoragePool pool) {
this.pool = new StorageFilerTO(pool);
}
-
+
@Override
public boolean executeInSequence() {
return false;
@@ -57,5 +57,5 @@ public class DeleteStoragePoolCommand extends Command {
public String getLocalPath() {
return localPath;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/FenceAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/FenceAnswer.java b/api/src/com/cloud/agent/api/FenceAnswer.java
index 13ee301..7af18f5 100644
--- a/api/src/com/cloud/agent/api/FenceAnswer.java
+++ b/api/src/com/cloud/agent/api/FenceAnswer.java
@@ -20,15 +20,15 @@ public class FenceAnswer extends Answer {
public FenceAnswer() {
super();
}
-
+
public FenceAnswer(FenceCommand cmd) {
super(cmd, true, null);
}
-
+
public FenceAnswer(FenceCommand cmd, String details) {
super(cmd, true, details);
}
-
+
public FenceAnswer(FenceCommand cmd, boolean result, String details) {
super(cmd, result, details);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/FenceCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/FenceCommand.java b/api/src/com/cloud/agent/api/FenceCommand.java
index 5ba293a..a891944 100644
--- a/api/src/com/cloud/agent/api/FenceCommand.java
+++ b/api/src/com/cloud/agent/api/FenceCommand.java
@@ -20,16 +20,16 @@ import com.cloud.host.Host;
import com.cloud.vm.VirtualMachine;
public class FenceCommand extends Command {
-
+
public FenceCommand() {
super();
}
-
+
String vmName;
String hostGuid;
String hostIp;
boolean inSeq;
-
+
public FenceCommand(VirtualMachine vm, Host host) {
super();
vmName = vm.getInstanceName();
@@ -37,19 +37,19 @@ public class FenceCommand extends Command {
hostIp = host.getPrivateIpAddress();
inSeq = false;
}
-
+
public void setSeq(boolean inseq) {
inSeq = inseq;
}
-
+
public String getVmName() {
return vmName;
}
-
+
public String getHostGuid() {
return hostGuid;
}
-
+
public String getHostIp() {
return hostIp;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java b/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java
index 992b507..7487b57 100644
--- a/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java
+++ b/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java
@@ -21,24 +21,24 @@ public class GetDomRVersionAnswer extends Answer {
public static final String ROUTER_IP = "router.ip";
String templateVersion;
String scriptsVersion;
-
+
protected GetDomRVersionAnswer() {
}
-
+
public GetDomRVersionAnswer(GetDomRVersionCmd cmd, String details, String templateVersion, String scriptsVersion) {
super(cmd, true, details);
this.templateVersion = templateVersion;
this.scriptsVersion = scriptsVersion;
}
-
+
public GetDomRVersionAnswer(GetDomRVersionCmd cmd, String details) {
super(cmd, false, details);
}
-
+
public String getTemplateVersion() {
return this.templateVersion;
}
-
+
public String getScriptsVersion() {
return this.scriptsVersion;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/GetVncPortAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/GetVncPortAnswer.java b/api/src/com/cloud/agent/api/GetVncPortAnswer.java
index da46426..5e94a18 100644
--- a/api/src/com/cloud/agent/api/GetVncPortAnswer.java
+++ b/api/src/com/cloud/agent/api/GetVncPortAnswer.java
@@ -19,29 +19,29 @@ package com.cloud.agent.api;
public class GetVncPortAnswer extends Answer {
String address;
int port;
-
+
protected GetVncPortAnswer() {
}
-
+
public GetVncPortAnswer(GetVncPortCommand cmd, int port) {
super(cmd, true, null);
this.port = port;
}
-
+
public GetVncPortAnswer(GetVncPortCommand cmd, String address, int port) {
super(cmd, true, null);
this.address = address;
this.port = port;
}
-
+
public GetVncPortAnswer(GetVncPortCommand cmd, String details) {
super(cmd, false, details);
}
-
+
public String getAddress() {
return address;
}
-
+
public int getPort() {
return port;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/GetVncPortCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/GetVncPortCommand.java b/api/src/com/cloud/agent/api/GetVncPortCommand.java
index cff787e..06165dc 100644
--- a/api/src/com/cloud/agent/api/GetVncPortCommand.java
+++ b/api/src/com/cloud/agent/api/GetVncPortCommand.java
@@ -22,21 +22,21 @@ public class GetVncPortCommand extends Command {
public GetVncPortCommand() {
}
-
+
public GetVncPortCommand(long id, String name) {
this.id = id;
this.name = name;
}
-
+
@Override
public boolean executeInSequence() {
return false;
}
-
+
public String getName() {
return name;
}
-
+
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/HostStatsEntry.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/HostStatsEntry.java b/api/src/com/cloud/agent/api/HostStatsEntry.java
index d34e0d7..0d8cfb2 100644
--- a/api/src/com/cloud/agent/api/HostStatsEntry.java
+++ b/api/src/com/cloud/agent/api/HostStatsEntry.java
@@ -19,7 +19,7 @@ package com.cloud.agent.api;
import com.cloud.host.HostStats;
public class HostStatsEntry implements HostStats {
-
+
long hostId;
String entityType;
double cpuUtilization;
@@ -27,12 +27,12 @@ public class HostStatsEntry implements HostStats {
double networkWriteKBs;
double totalMemoryKBs;
double freeMemoryKBs;
-
+
public HostStatsEntry() {
}
-
+
public HostStatsEntry(long hostId,double cpuUtilization, double networkReadKBs, double networkWriteKBs, String entityType,
- double totalMemoryKBs, double freeMemoryKBs, double xapiMemoryUsageKBs, double averageLoad)
+ double totalMemoryKBs, double freeMemoryKBs, double xapiMemoryUsageKBs, double averageLoad)
{
this.hostId = hostId;
this.entityType = entityType;
@@ -47,16 +47,16 @@ public class HostStatsEntry implements HostStats {
public double getNetworkReadKBs() {
return networkReadKBs;
}
-
+
public void setNetworkReadKBs(double networkReadKBs) {
this.networkReadKBs = networkReadKBs;
}
-
+
@Override
public double getNetworkWriteKBs() {
return networkWriteKBs;
}
-
+
public void setNetworkWriteKBs(double networkWriteKBs) {
this.networkWriteKBs = networkWriteKBs;
}
@@ -65,16 +65,16 @@ public class HostStatsEntry implements HostStats {
public String getEntityType(){
return this.entityType;
}
-
+
public void setEntityType(String entityType){
this.entityType = entityType;
}
-
+
@Override
public double getTotalMemoryKBs(){
return this.totalMemoryKBs;
}
-
+
public void setTotalMemoryKBs(double totalMemoryKBs){
this.totalMemoryKBs = totalMemoryKBs;
}
@@ -83,11 +83,11 @@ public class HostStatsEntry implements HostStats {
public double getFreeMemoryKBs(){
return this.freeMemoryKBs;
}
-
+
public void setFreeMemoryKBs(double freeMemoryKBs){
this.freeMemoryKBs = freeMemoryKBs;
}
-
+
@Override
public double getCpuUtilization() {
return this.cpuUtilization;
@@ -106,7 +106,7 @@ public class HostStatsEntry implements HostStats {
public HostStats getHostStats() {
return this;
}
-
+
public void setHostId(long hostId) {
this.hostId = hostId;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/MaintainAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/MaintainAnswer.java b/api/src/com/cloud/agent/api/MaintainAnswer.java
index c362869..dcfdab3 100644
--- a/api/src/com/cloud/agent/api/MaintainAnswer.java
+++ b/api/src/com/cloud/agent/api/MaintainAnswer.java
@@ -18,28 +18,28 @@ package com.cloud.agent.api;
public class MaintainAnswer extends Answer {
boolean willMigrate;
-
+
public MaintainAnswer() {
}
-
+
public MaintainAnswer(MaintainCommand cmd) {
this(cmd, true, null);
}
-
+
public MaintainAnswer(MaintainCommand cmd, boolean willMigrate) {
this(cmd, true, null);
this.willMigrate = willMigrate;
}
-
+
public MaintainAnswer(MaintainCommand cmd, String details) {
this(cmd, true, details);
}
-
+
public MaintainAnswer(MaintainCommand cmd, boolean result, String details) {
super(cmd, result, details);
this.willMigrate = true;
}
-
+
public boolean getMigrate() {
return this.willMigrate;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/MaintainCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/MaintainCommand.java b/api/src/com/cloud/agent/api/MaintainCommand.java
index 654476a..2a9b9a5 100644
--- a/api/src/com/cloud/agent/api/MaintainCommand.java
+++ b/api/src/com/cloud/agent/api/MaintainCommand.java
@@ -20,7 +20,7 @@ public class MaintainCommand extends Command {
public MaintainCommand() {
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java b/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java
index 6dd7575..e490bdf 100644
--- a/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java
+++ b/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java
@@ -20,13 +20,13 @@ package com.cloud.agent.api;
public class ManageSnapshotAnswer extends Answer {
// For create Snapshot
private String _snapshotPath;
-
+
public ManageSnapshotAnswer() {}
public ManageSnapshotAnswer(Command cmd, boolean success, String result) {
super(cmd, success, result);
}
-
+
// For XenServer
public ManageSnapshotAnswer(ManageSnapshotCommand cmd, long snapshotId, String snapshotPath, boolean success, String result) {
super(cmd, success, result);
@@ -36,5 +36,5 @@ public class ManageSnapshotAnswer extends Answer {
public String getSnapshotPath() {
return _snapshotPath;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ManageSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ManageSnapshotCommand.java b/api/src/com/cloud/agent/api/ManageSnapshotCommand.java
index 9a5f424..5effc54 100644
--- a/api/src/com/cloud/agent/api/ManageSnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/ManageSnapshotCommand.java
@@ -25,9 +25,9 @@ public class ManageSnapshotCommand extends Command {
// XXX: Anyway there is something called inheritance in Java
public static String CREATE_SNAPSHOT = "-c";
public static String DESTROY_SNAPSHOT = "-d";
-
+
private String _commandSwitch;
-
+
// Information about the volume that the snapshot is based on
private String _volumePath = null;
StorageFilerTO _pool;
@@ -43,7 +43,7 @@ public class ManageSnapshotCommand extends Command {
public ManageSnapshotCommand(long snapshotId, String volumePath, StoragePool pool, String preSnapshotPath ,String snapshotName, String vmName) {
_commandSwitch = ManageSnapshotCommand.CREATE_SNAPSHOT;
_volumePath = volumePath;
- _pool = new StorageFilerTO(pool);
+ _pool = new StorageFilerTO(pool);
_snapshotPath = preSnapshotPath;
_snapshotName = snapshotName;
_snapshotId = snapshotId;
@@ -54,8 +54,8 @@ public class ManageSnapshotCommand extends Command {
_commandSwitch = ManageSnapshotCommand.DESTROY_SNAPSHOT;
_snapshotPath = snapshotPath;
}
-
-
+
+
@Override
public boolean executeInSequence() {
return false;
@@ -64,15 +64,15 @@ public class ManageSnapshotCommand extends Command {
public String getCommandSwitch() {
return _commandSwitch;
}
-
+
public String getVolumePath() {
return _volumePath;
}
-
+
public StorageFilerTO getPool() {
return _pool;
}
-
+
public String getSnapshotPath() {
return _snapshotPath;
}
@@ -84,9 +84,9 @@ public class ManageSnapshotCommand extends Command {
public long getSnapshotId() {
return _snapshotId;
}
-
+
public String getVmName() {
return _vmName;
}
-
-}
\ No newline at end of file
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/MigrateAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/MigrateAnswer.java b/api/src/com/cloud/agent/api/MigrateAnswer.java
index 4b5dd19..19d690a 100644
--- a/api/src/com/cloud/agent/api/MigrateAnswer.java
+++ b/api/src/com/cloud/agent/api/MigrateAnswer.java
@@ -18,15 +18,15 @@ package com.cloud.agent.api;
public class MigrateAnswer extends Answer {
Integer vncPort = null;
-
+
protected MigrateAnswer() {
}
-
+
public MigrateAnswer(MigrateCommand cmd, boolean result, String detail, Integer vncPort) {
super(cmd, result, detail);
this.vncPort = vncPort;
}
-
+
public Integer getVncPort() {
return vncPort;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/MigrateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/MigrateCommand.java b/api/src/com/cloud/agent/api/MigrateCommand.java
index 18a2be1..5042b8c 100644
--- a/api/src/com/cloud/agent/api/MigrateCommand.java
+++ b/api/src/com/cloud/agent/api/MigrateCommand.java
@@ -25,29 +25,29 @@ public class MigrateCommand extends Command {
protected MigrateCommand() {
}
-
+
public MigrateCommand(String vmName, String destIp, boolean isWindows) {
this.vmName = vmName;
this.destIp = destIp;
this.isWindows = isWindows;
}
-
+
public boolean isWindows() {
return isWindows;
}
-
+
public String getDestinationIp() {
return destIp;
}
-
+
public String getVmName() {
return vmName;
}
-
+
public void setHostGuid(String guid) {
this.hostGuid = guid;
}
-
+
public String getHostGuid() {
return this.hostGuid;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/api/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
index a8ab78d..df77985 100644
--- a/api/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
+++ b/api/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
@@ -30,13 +30,13 @@ public class ModifyStoragePoolAnswer extends Answer {
public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map<String, TemplateInfo> tInfo) {
super(cmd);
this.result = true;
- this.poolInfo = new StoragePoolInfo(null,
- cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(),
+ this.poolInfo = new StoragePoolInfo(null,
+ cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(),
cmd.getPool().getType(), capacityBytes, availableBytes );
-
+
this.templateInfo = tInfo;
}
-
+
public StoragePoolInfo getPoolInfo() {
return poolInfo;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java b/api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
index 04f14e3..8bc956d 100644
--- a/api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
+++ b/api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
@@ -23,25 +23,25 @@ import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
public class ModifyStoragePoolCommand extends Command {
-
+
boolean add;
StorageFilerTO pool;
String localPath;
String [] options;
public static final String LOCAL_PATH_PREFIX="/mnt/";
-
+
public ModifyStoragePoolCommand() {
-
+
}
-
+
public ModifyStoragePoolCommand(boolean add, StoragePool pool, String localPath) {
this.add = add;
this.pool = new StorageFilerTO(pool);
this.localPath = localPath;
}
-
+
public ModifyStoragePoolCommand(boolean add, StoragePool pool) {
this(add, pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
}
@@ -53,11 +53,11 @@ public class ModifyStoragePoolCommand extends Command {
public void setPool(StoragePool pool) {
this.pool = new StorageFilerTO(pool);
}
-
+
public boolean getAdd() {
return add;
}
-
+
@Override
public boolean executeInSequence() {
return false;
@@ -71,5 +71,5 @@ public class ModifyStoragePoolCommand extends Command {
this.options = options;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/NetworkUsageAnswer.java b/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
index 7d5d49b..fd8ebda 100644
--- a/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
+++ b/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
@@ -33,7 +33,7 @@ public class NetworkUsageAnswer extends Answer {
this.bytesSent = bytesSent;
routerName = cmd.getDomRName();
}
-
+
public NetworkUsageAnswer(Command command, Exception e) {
super(command, e);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/NetworkUsageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/NetworkUsageCommand.java b/api/src/com/cloud/agent/api/NetworkUsageCommand.java
index acb23cf..6cbf93b 100644
--- a/api/src/com/cloud/agent/api/NetworkUsageCommand.java
+++ b/api/src/com/cloud/agent/api/NetworkUsageCommand.java
@@ -57,7 +57,7 @@ public class NetworkUsageCommand extends Command {
this.option = "create";
this.vpcCIDR = vpcCIDR;
}
-
+
public NetworkUsageCommand(String privateIP, String domRName, String option, boolean forVpc, String gatewayIP)
{
this.privateIP = privateIP;
@@ -66,7 +66,7 @@ public class NetworkUsageCommand extends Command {
this.gatewayIP = gatewayIP;
this.option = option;
}
-
+
public String getPrivateIP() {
return privateIP;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PingAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PingAnswer.java b/api/src/com/cloud/agent/api/PingAnswer.java
index 388d67d..d9ed89c 100644
--- a/api/src/com/cloud/agent/api/PingAnswer.java
+++ b/api/src/com/cloud/agent/api/PingAnswer.java
@@ -21,7 +21,7 @@ public class PingAnswer extends Answer {
protected PingAnswer() {
}
-
+
public PingAnswer(PingCommand cmd) {
super(cmd);
_command = cmd;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PingCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PingCommand.java b/api/src/com/cloud/agent/api/PingCommand.java
index 3b3ca61..8d9681f 100755
--- a/api/src/com/cloud/agent/api/PingCommand.java
+++ b/api/src/com/cloud/agent/api/PingCommand.java
@@ -21,23 +21,23 @@ import com.cloud.host.Host;
public class PingCommand extends Command {
Host.Type hostType;
long hostId;
-
+
protected PingCommand() {
}
-
+
public PingCommand(Host.Type type, long id) {
hostType = type;
hostId = id;
}
-
+
public Host.Type getHostType() {
return hostType;
}
-
+
public long getHostId() {
return hostId;
}
-
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PingRoutingCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PingRoutingCommand.java b/api/src/com/cloud/agent/api/PingRoutingCommand.java
index eebe041..e25ac62 100755
--- a/api/src/com/cloud/agent/api/PingRoutingCommand.java
+++ b/api/src/com/cloud/agent/api/PingRoutingCommand.java
@@ -25,15 +25,15 @@ public class PingRoutingCommand extends PingCommand {
Map<String, State> newStates;
boolean _gatewayAccessible = true;
boolean _vnetAccessible = true;
-
+
protected PingRoutingCommand() {
}
-
+
public PingRoutingCommand(Host.Type type, long id, Map<String, State> states) {
super(type, id);
this.newStates = states;
}
-
+
public Map<String, State> getNewStates() {
return newStates;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
index 5842f38..d44987b 100644
--- a/api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
+++ b/api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java
@@ -25,17 +25,17 @@ import com.cloud.vm.VirtualMachine.State;
public class PingRoutingWithOvsCommand extends PingRoutingCommand {
List<Pair<String, Long>> states;
-
+
protected PingRoutingWithOvsCommand() {
super();
}
-
+
public PingRoutingWithOvsCommand(Host.Type type, long id,
Map<String, State> states, List<Pair<String, Long>> ovsStates) {
super(type, id, states);
this.states = ovsStates;
}
-
+
public List<Pair<String, Long>> getStates() {
return states;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PingStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PingStorageCommand.java b/api/src/com/cloud/agent/api/PingStorageCommand.java
index 963bc7b..438ab50 100755
--- a/api/src/com/cloud/agent/api/PingStorageCommand.java
+++ b/api/src/com/cloud/agent/api/PingStorageCommand.java
@@ -25,12 +25,12 @@ public class PingStorageCommand extends PingCommand {
protected PingStorageCommand() {
}
-
+
public PingStorageCommand(Host.Type type, long id, Map<String, Boolean> changes) {
super(type, id);
this.changes = changes;
}
-
+
public Map<String, Boolean> getChanges() {
return changes;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PlugNicCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PlugNicCommand.java b/api/src/com/cloud/agent/api/PlugNicCommand.java
index aa5141e..b896e45 100644
--- a/api/src/com/cloud/agent/api/PlugNicCommand.java
+++ b/api/src/com/cloud/agent/api/PlugNicCommand.java
@@ -19,22 +19,22 @@ package com.cloud.agent.api;
import com.cloud.agent.api.to.NicTO;
public class PlugNicCommand extends Command {
-
+
NicTO nic;
String instanceName;
-
+
public NicTO getNic() {
return nic;
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
protected PlugNicCommand() {
}
-
+
public PlugNicCommand(NicTO nic, String instanceName) {
this.nic = nic;
this.instanceName = instanceName;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PoolEjectCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PoolEjectCommand.java b/api/src/com/cloud/agent/api/PoolEjectCommand.java
index faea30e..3085042 100644
--- a/api/src/com/cloud/agent/api/PoolEjectCommand.java
+++ b/api/src/com/cloud/agent/api/PoolEjectCommand.java
@@ -18,22 +18,22 @@ package com.cloud.agent.api;
public class PoolEjectCommand extends Command {
private String hostuuid;
-
+
public String getHostuuid() {
return hostuuid;
}
-
+
public void setHostuuid(String hostuuid) {
this.hostuuid = hostuuid;
}
public PoolEjectCommand() {
super();
}
- public PoolEjectCommand(String hostuuid) {
+ public PoolEjectCommand(String hostuuid) {
super();
setHostuuid(hostuuid);
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java b/api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
index bbd63cc..1b215bc 100644
--- a/api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
+++ b/api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java
@@ -19,15 +19,15 @@ package com.cloud.agent.api;
public class PrepareForMigrationAnswer extends Answer {
protected PrepareForMigrationAnswer() {
}
-
+
public PrepareForMigrationAnswer(PrepareForMigrationCommand cmd, String detail) {
super(cmd, false, detail);
}
-
+
public PrepareForMigrationAnswer(PrepareForMigrationCommand cmd, Exception ex) {
super(cmd, ex);
}
-
+
public PrepareForMigrationAnswer(PrepareForMigrationCommand cmd) {
super(cmd, true, null);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java b/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java
index e10bca0..c0e1368 100644
--- a/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java
+++ b/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java
@@ -20,18 +20,18 @@ import com.cloud.agent.api.to.VirtualMachineTO;
public class PrepareForMigrationCommand extends Command {
VirtualMachineTO vm;
-
+
protected PrepareForMigrationCommand() {
}
-
+
public PrepareForMigrationCommand(VirtualMachineTO vm) {
this.vm = vm;
}
-
+
public VirtualMachineTO getVirtualMachine() {
return vm;
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java b/api/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
index eda0fd9..0c80bfa 100755
--- a/api/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
+++ b/api/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java
@@ -23,7 +23,7 @@ import com.cloud.utils.Ternary;
public class PrepareOCFS2NodesCommand extends Command {
List<Ternary<Integer, String, String>> nodes;
String clusterName;
-
+
@Override
public boolean executeInSequence() {
return true;
@@ -33,11 +33,11 @@ public class PrepareOCFS2NodesCommand extends Command {
this.nodes = nodes;
this.clusterName = clusterName;
}
-
+
public List<Ternary<Integer, String, String>> getNodes() {
return nodes;
}
-
+
public String getClusterName() {
return clusterName;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/PropagateResourceEventCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/PropagateResourceEventCommand.java b/api/src/com/cloud/agent/api/PropagateResourceEventCommand.java
index 3442c77..45cd4b3 100755
--- a/api/src/com/cloud/agent/api/PropagateResourceEventCommand.java
+++ b/api/src/com/cloud/agent/api/PropagateResourceEventCommand.java
@@ -21,24 +21,24 @@ import com.cloud.resource.ResourceState;
public class PropagateResourceEventCommand extends Command {
long hostId;
ResourceState.Event event;
-
+
protected PropagateResourceEventCommand() {
-
+
}
-
+
public PropagateResourceEventCommand(long hostId, ResourceState.Event event) {
this.hostId = hostId;
this.event = event;
}
-
+
public long getHostId() {
return hostId;
}
-
+
public ResourceState.Event getEvent() {
return event;
}
-
+
@Override
public boolean executeInSequence() {
// TODO Auto-generated method stub
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ReadyAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ReadyAnswer.java b/api/src/com/cloud/agent/api/ReadyAnswer.java
index 3f8172c..b5dd0b7 100644
--- a/api/src/com/cloud/agent/api/ReadyAnswer.java
+++ b/api/src/com/cloud/agent/api/ReadyAnswer.java
@@ -19,11 +19,11 @@ package com.cloud.agent.api;
public class ReadyAnswer extends Answer {
protected ReadyAnswer() {
}
-
+
public ReadyAnswer(ReadyCommand cmd) {
super(cmd, true, null);
}
-
+
public ReadyAnswer(ReadyCommand cmd, String details) {
super(cmd, false, details);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ReadyCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ReadyCommand.java b/api/src/com/cloud/agent/api/ReadyCommand.java
index 0c91a25..c6ca799 100644
--- a/api/src/com/cloud/agent/api/ReadyCommand.java
+++ b/api/src/com/cloud/agent/api/ReadyCommand.java
@@ -24,29 +24,29 @@ public class ReadyCommand extends Command {
private Long dcId;
private Long hostId;
-
+
public ReadyCommand(Long dcId) {
super();
this.dcId = dcId;
}
-
+
public ReadyCommand(Long dcId, Long hostId) {
this(dcId);
this.hostId = hostId;
}
-
+
public void setDetails(String details) {
_details = details;
}
-
+
public String getDetails() {
return _details;
}
-
+
public Long getDataCenterId() {
return dcId;
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/RebootAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/RebootAnswer.java b/api/src/com/cloud/agent/api/RebootAnswer.java
index da53b4f..244bf1e 100644
--- a/api/src/com/cloud/agent/api/RebootAnswer.java
+++ b/api/src/com/cloud/agent/api/RebootAnswer.java
@@ -18,24 +18,24 @@ package com.cloud.agent.api;
public class RebootAnswer extends Answer {
Integer vncPort;
-
+
protected RebootAnswer() {
}
-
+
public RebootAnswer(RebootCommand cmd, String details, Integer vncport) {
super(cmd, true, details);
this.vncPort = vncport;
}
-
+
public RebootAnswer(RebootCommand cmd, String details, boolean success) {
super(cmd, success, details);
this.vncPort = null;
}
-
+
public RebootAnswer(RebootCommand cmd, Exception e) {
super(cmd, e);
}
-
+
public Integer getVncPort() {
return vncPort;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/RebootCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/RebootCommand.java b/api/src/com/cloud/agent/api/RebootCommand.java
index 2925e2a..299e61b 100755
--- a/api/src/com/cloud/agent/api/RebootCommand.java
+++ b/api/src/com/cloud/agent/api/RebootCommand.java
@@ -20,25 +20,25 @@ import com.cloud.vm.VirtualMachine;
public class RebootCommand extends Command {
String vmName;
-
+
protected RebootCommand() {
}
-
+
public RebootCommand(VirtualMachine vm) {
vmName = vm.getInstanceName();
}
-
+
public RebootCommand(String vmName) {
this.vmName = vmName;
}
-
+
public String getVmName() {
return vmName;
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/RebootRouterCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/RebootRouterCommand.java b/api/src/com/cloud/agent/api/RebootRouterCommand.java
index bf5d866..c5027b3 100644
--- a/api/src/com/cloud/agent/api/RebootRouterCommand.java
+++ b/api/src/com/cloud/agent/api/RebootRouterCommand.java
@@ -18,7 +18,7 @@ package com.cloud.agent.api;
public class RebootRouterCommand extends RebootCommand {
-
+
protected String privateIp;
protected RebootRouterCommand() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java b/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
index 276ed06..41a779b 100755
--- a/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
+++ b/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
@@ -33,7 +33,7 @@ public class SecStorageFirewallCfgCommand extends Command {
this.intf = intf;
}
public PortConfig() {
-
+
}
public boolean isAdd() {
return add;
@@ -48,28 +48,28 @@ public class SecStorageFirewallCfgCommand extends Command {
return intf;
}
}
-
+
private List<PortConfig> portConfigs = new ArrayList<PortConfig>();
- private boolean isAppendAIp = false;
-
+ private boolean isAppendAIp = false;
+
public SecStorageFirewallCfgCommand() {
-
+
}
-
+
public SecStorageFirewallCfgCommand(boolean isAppend) {
this.isAppendAIp = isAppend;
- }
-
+ }
+
public void addPortConfig(String sourceIp, String port, boolean add, String intf) {
PortConfig pc = new PortConfig(sourceIp, port, add, intf);
this.portConfigs.add(pc);
-
+
}
public boolean getIsAppendAIp() {
return isAppendAIp;
}
-
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SecStorageSetupAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SecStorageSetupAnswer.java b/api/src/com/cloud/agent/api/SecStorageSetupAnswer.java
index 494bce5..bb0c016 100644
--- a/api/src/com/cloud/agent/api/SecStorageSetupAnswer.java
+++ b/api/src/com/cloud/agent/api/SecStorageSetupAnswer.java
@@ -20,12 +20,12 @@ public class SecStorageSetupAnswer extends Answer {
private String _dir;
protected SecStorageSetupAnswer() {
}
-
+
public SecStorageSetupAnswer(String dir) {
super(null, true, "success");
this._dir = dir;
}
-
+
public String get_dir() {
return _dir;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SecStorageSetupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SecStorageSetupCommand.java b/api/src/com/cloud/agent/api/SecStorageSetupCommand.java
index 208b8a6..50c06cf 100644
--- a/api/src/com/cloud/agent/api/SecStorageSetupCommand.java
+++ b/api/src/com/cloud/agent/api/SecStorageSetupCommand.java
@@ -21,7 +21,7 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
public class SecStorageSetupCommand extends Command {
private String secUrl;
private Certificates certs;
-
+
public static class Certificates {
@LogLevel(Log4jLevel.Off)
private String privKey;
@@ -29,30 +29,30 @@ public class SecStorageSetupCommand extends Command {
private String privCert;
@LogLevel(Log4jLevel.Off)
private String certChain;
-
+
public Certificates() {
-
+
}
-
+
public Certificates(String prvKey, String privCert, String certChain) {
this.privKey = prvKey;
this.privCert = privCert;
this.certChain = certChain;
}
-
+
public String getPrivKey() {
return this.privKey;
}
-
+
public String getPrivCert() {
return this.privCert;
}
-
+
public String getCertChain() {
return this.certChain;
}
}
-
+
public SecStorageSetupCommand() {
super();
}
@@ -62,7 +62,7 @@ public class SecStorageSetupCommand extends Command {
this.secUrl = secUrl;
this.certs = certs;
}
-
+
@Override
public boolean executeInSequence() {
return true;
@@ -71,13 +71,13 @@ public class SecStorageSetupCommand extends Command {
public String getSecUrl() {
return secUrl;
}
-
+
public Certificates getCerts() {
return this.certs;
}
public void setSecUrl(String secUrl) {
this.secUrl = secUrl;
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SecStorageVMSetupCommand.java b/api/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
index 03f2321..be97709 100644
--- a/api/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
+++ b/api/src/com/cloud/agent/api/SecStorageVMSetupCommand.java
@@ -20,11 +20,11 @@ public class SecStorageVMSetupCommand extends Command {
String [] allowedInternalSites = new String[0];
String copyUserName;
String copyPassword;
-
+
public SecStorageVMSetupCommand() {
super();
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java b/api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
index 00cdbe8..144fea2 100644
--- a/api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
+++ b/api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java
@@ -26,24 +26,24 @@ public class SecurityGroupRuleAnswer extends Answer {
Long logSequenceNumber = null;
Long vmId = null;
FailureReason reason = FailureReason.NONE;
-
-
+
+
protected SecurityGroupRuleAnswer() {
}
-
+
public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd) {
super(cmd);
this.logSequenceNumber = cmd.getSeqNum();
this.vmId = cmd.getVmId();
}
-
+
public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd, boolean result, String detail) {
super(cmd, result, detail);
this.logSequenceNumber = cmd.getSeqNum();
this.vmId = cmd.getVmId();
reason = FailureReason.PROGRAMMING_FAILED;
}
-
+
public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd, boolean result, String detail, FailureReason r) {
super(cmd, result, detail);
this.logSequenceNumber = cmd.getSeqNum();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SecurityGroupRulesCmd.java b/api/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
index 32550df..affad1f 100644
--- a/api/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
+++ b/api/src/com/cloud/agent/api/SecurityGroupRulesCmd.java
@@ -126,7 +126,7 @@ public class SecurityGroupRulesCmd extends Command {
public void setEgressRuleSet(IpPortAndProto[] egressRuleSet) {
this.egressRuleSet = egressRuleSet;
}
-
+
public String getGuestIp() {
return guestIp;
}
@@ -156,15 +156,15 @@ public class SecurityGroupRulesCmd extends Command {
}
return ruleBuilder.toString();
}
-
+
//convert cidrs in the form "a.b.c.d/e" to "hexvalue of 32bit ip/e"
private String compressCidr(String cidr) {
String [] toks = cidr.split("/");
long ipnum = NetUtils.ip2Long(toks[0]);
return Long.toHexString(ipnum) + "/" + toks[1];
}
-
-
+
+
public String stringifyCompressedRules() {
StringBuilder ruleBuilder = new StringBuilder();
for (SecurityGroupRulesCmd.IpPortAndProto ipPandP : getIngressRuleSet()) {
@@ -187,7 +187,7 @@ public class SecurityGroupRulesCmd extends Command {
}
return ruleBuilder.toString();
}
-
+
/*
* Compress the security group rules using zlib compression to allow the call to the hypervisor
* to scale beyond 8k cidrs.
@@ -243,7 +243,7 @@ public class SecurityGroupRulesCmd extends Command {
public Long getVmId() {
return vmId;
}
-
+
public int getTotalNumCidrs() {
//useful for logging
int count = 0;
@@ -255,11 +255,11 @@ public class SecurityGroupRulesCmd extends Command {
}
return count;
}
-
+
public void setMsId(long msId) {
this.msId = msId;
}
-
+
public Long getMsId() {
return msId;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SetupAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupAnswer.java b/api/src/com/cloud/agent/api/SetupAnswer.java
index beee79f..97252a2 100644
--- a/api/src/com/cloud/agent/api/SetupAnswer.java
+++ b/api/src/com/cloud/agent/api/SetupAnswer.java
@@ -33,5 +33,5 @@ public class SetupAnswer extends Answer {
public boolean needReconnect() {
return _reconnect;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SetupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupCommand.java b/api/src/com/cloud/agent/api/SetupCommand.java
index 0397813..ee43c59 100644
--- a/api/src/com/cloud/agent/api/SetupCommand.java
+++ b/api/src/com/cloud/agent/api/SetupCommand.java
@@ -23,7 +23,7 @@ public class SetupCommand extends Command {
HostEnvironment env;
boolean multipath;
boolean needSetup;
-
+
public boolean needSetup() {
return needSetup;
}
@@ -37,18 +37,18 @@ public class SetupCommand extends Command {
this.multipath = false;
this.needSetup = false;
}
-
+
public HostEnvironment getEnvironment() {
return env;
}
-
+
protected SetupCommand() {
}
-
+
public void setMultipathOn() {
this.multipath = true;
}
-
+
public boolean useMultipath() {
return multipath;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
index 10dab55..2cf5bf8 100644
--- a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
+++ b/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java
@@ -28,7 +28,7 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand{
Integer priority;
boolean add = true;
NicTO nic;
-
+
public NicTO getNic() {
return nic;
}
@@ -53,12 +53,12 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand{
public boolean executeInSequence() {
return true;
}
-
+
protected SetupGuestNetworkCommand() {
}
-
-
- public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority,
+
+
+ public SetupGuestNetworkCommand(String dhcpRange, String networkDomain, boolean isRedundant, Integer priority,
String defaultDns1, String defaultDns2, boolean add, NicTO nic) {
this.dhcpRange = dhcpRange;
this.networkDomain = networkDomain;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ShutdownCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ShutdownCommand.java b/api/src/com/cloud/agent/api/ShutdownCommand.java
index fa66e34..5412f35 100644
--- a/api/src/com/cloud/agent/api/ShutdownCommand.java
+++ b/api/src/com/cloud/agent/api/ShutdownCommand.java
@@ -24,31 +24,31 @@ public class ShutdownCommand extends Command {
public static final String Update = "update";
public static final String Unknown = "unknown";
public static final String DeleteHost = "deleteHost";
-
+
private String reason;
private String detail;
protected ShutdownCommand() {
super();
}
-
+
public ShutdownCommand(String reason, String detail) {
super();
this.reason = reason;
this.detail = detail;
}
-
+
/**
- * @return return the reason the agent shutdown. If Unknown, call getDetail() for any details.
+ * @return return the reason the agent shutdown. If Unknown, call getDetail() for any details.
*/
public String getReason() {
return reason;
}
-
+
public String getDetail() {
return detail;
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/SnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SnapshotCommand.java b/api/src/com/cloud/agent/api/SnapshotCommand.java
index 892db37..dceb461 100644
--- a/api/src/com/cloud/agent/api/SnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/SnapshotCommand.java
@@ -111,4 +111,4 @@ public class SnapshotCommand extends Command {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartAnswer.java b/api/src/com/cloud/agent/api/StartAnswer.java
index d4a3f63..922d060 100644
--- a/api/src/com/cloud/agent/api/StartAnswer.java
+++ b/api/src/com/cloud/agent/api/StartAnswer.java
@@ -21,20 +21,20 @@ import com.cloud.agent.api.to.VirtualMachineTO;
public class StartAnswer extends Answer {
VirtualMachineTO vm;
String host_guid;
-
+
protected StartAnswer() {
}
-
+
public StartAnswer(StartCommand cmd, String msg) {
super(cmd, false, msg);
this.vm = cmd.getVirtualMachine();
}
-
+
public StartAnswer(StartCommand cmd, Exception e) {
super(cmd, false, e.getMessage());
this.vm = cmd.getVirtualMachine();
}
-
+
public StartAnswer(StartCommand cmd) {
super(cmd, true, null);
this.vm = cmd.getVirtualMachine();
@@ -46,7 +46,7 @@ public class StartAnswer extends Answer {
this.vm = cmd.getVirtualMachine();
this.host_guid = guid;
}
-
+
public VirtualMachineTO getVirtualMachine() {
return vm;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartCommand.java b/api/src/com/cloud/agent/api/StartCommand.java
index 4d87138..ec707d6 100644
--- a/api/src/com/cloud/agent/api/StartCommand.java
+++ b/api/src/com/cloud/agent/api/StartCommand.java
@@ -28,12 +28,12 @@ public class StartCommand extends Command {
public VirtualMachineTO getVirtualMachine() {
return vm;
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
protected StartCommand() {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartupAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupAnswer.java b/api/src/com/cloud/agent/api/StartupAnswer.java
index a078c2d..c0925cb 100755
--- a/api/src/com/cloud/agent/api/StartupAnswer.java
+++ b/api/src/com/cloud/agent/api/StartupAnswer.java
@@ -20,24 +20,24 @@ package com.cloud.agent.api;
public class StartupAnswer extends Answer {
long hostId;
int pingInterval;
-
+
protected StartupAnswer() {
}
-
+
public StartupAnswer(StartupCommand cmd, long hostId, int pingInterval) {
super(cmd);
this.hostId = hostId;
this.pingInterval = pingInterval;
}
-
+
public StartupAnswer(StartupCommand cmd, String details) {
super(cmd, false, details);
}
-
+
public long getHostId() {
return hostId;
}
-
+
public int getPingInterval() {
return pingInterval;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupCommand.java b/api/src/com/cloud/agent/api/StartupCommand.java
index 6088bea..dd2d390 100755
--- a/api/src/com/cloud/agent/api/StartupCommand.java
+++ b/api/src/com/cloud/agent/api/StartupCommand.java
@@ -43,11 +43,11 @@ public class StartupCommand extends Command {
String agentTag;
String resourceName;
String gatewayIpAddress;
-
+
public StartupCommand(Host.Type type) {
this.type = type;
}
-
+
public StartupCommand(Long id, Host.Type type, String name, String dataCenter, String pod, String guid, String version) {
super();
this.id = id;
@@ -58,48 +58,48 @@ public class StartupCommand extends Command {
this.version = version;
this.type = type;
}
-
+
public StartupCommand(Long id, Host.Type type, String name, String dataCenter, String pod, String guid, String version, String gatewayIpAddress) {
this(id, type, name, dataCenter, pod, guid, version);
this.gatewayIpAddress = gatewayIpAddress;
- }
-
+ }
+
public Host.Type getHostType() {
return type;
}
-
+
public void setHostType(Host.Type type) {
this.type = type;
}
-
+
public String getIqn() {
return iqn;
}
-
+
public void setCluster(String cluster) {
this.cluster = cluster;
}
-
+
public String getCluster() {
return cluster;
}
-
+
public void setIqn(String iqn) {
this.iqn = iqn;
}
-
+
public String getDataCenter() {
return dataCenter;
}
-
+
public String getPod() {
return pod;
}
-
+
public Long getId() {
return id;
}
-
+
public String getStorageIpAddressDeux() {
return storageIpAddressDeux;
}
@@ -131,11 +131,11 @@ public class StartupCommand extends Command {
public String getName() {
return name;
}
-
+
public String getVersion() {
return version;
}
-
+
public void setDataCenter(String dataCenter) {
this.dataCenter = dataCenter;
}
@@ -147,7 +147,7 @@ public class StartupCommand extends Command {
public void setGuid(String guid) {
this.guid = guid;
}
-
+
public void setGuid(String guid, String resourceName) {
this.resourceName = resourceName;
this.guid = guid + "-" + resourceName;
@@ -232,15 +232,15 @@ public class StartupCommand extends Command {
public void setVersion(String version) {
this.version = version;
}
-
+
public void setPublicIpAddress(String publicIpAddress) {
this.publicIpAddress = publicIpAddress;
}
-
+
public String getAgentTag() {
return agentTag;
}
-
+
public void setAgentTag(String tag) {
agentTag = tag;
}
@@ -248,7 +248,7 @@ public class StartupCommand extends Command {
public void setResourceName(String resourceName) {
this.resourceName = resourceName;
}
-
+
public String getGuidWithoutResource() {
if (resourceName == null) {
return guid;
@@ -265,11 +265,11 @@ public class StartupCommand extends Command {
}
}
}
-
+
public String getResourceName() {
return resourceName;
}
-
+
public String getGatewayIpAddress() {
return gatewayIpAddress;
}
@@ -277,8 +277,8 @@ public class StartupCommand extends Command {
public void setGatewayIpAddress(String gatewayIpAddress) {
this.gatewayIpAddress = gatewayIpAddress;
}
-
-
+
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java b/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
index 2ba4ab9..c4ed107 100644
--- a/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
+++ b/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java
@@ -19,7 +19,7 @@ package com.cloud.agent.api;
import com.cloud.host.Host;
public class StartupExternalFirewallCommand extends StartupCommand {
-
+
public StartupExternalFirewallCommand() {
super(Host.Type.ExternalFirewall);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartupProxyCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupProxyCommand.java b/api/src/com/cloud/agent/api/StartupProxyCommand.java
index 6399157..25cd769 100644
--- a/api/src/com/cloud/agent/api/StartupProxyCommand.java
+++ b/api/src/com/cloud/agent/api/StartupProxyCommand.java
@@ -21,12 +21,12 @@ import com.cloud.host.Host;
public class StartupProxyCommand extends StartupCommand {
private int proxyPort;
private long proxyVmId;
-
+
public StartupProxyCommand() {
super(Host.Type.ConsoleProxy);
setIqn("NoIqn");
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartupRoutingCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupRoutingCommand.java b/api/src/com/cloud/agent/api/StartupRoutingCommand.java
index e698940..5961ab0 100755
--- a/api/src/com/cloud/agent/api/StartupRoutingCommand.java
+++ b/api/src/com/cloud/agent/api/StartupRoutingCommand.java
@@ -90,7 +90,7 @@ getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStr
long memory,
long dom0MinMemory,
final String caps,
- final HypervisorType hypervisorType,
+ final HypervisorType hypervisorType,
final Map<String, String> hostDetails,
Map<String, VmState> vms) {
super(Host.Type.Routing);
@@ -114,7 +114,7 @@ getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStr
public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, final String caps, final HypervisorType hypervisorType, final Map<String, String> hostDetails, Map<String, VmState> vms, String hypervisorVersion) {
this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType, hostDetails, vms);
this.hypervisorVersion = hypervisorVersion;
- }
+ }
public void setChanges(Map<String, VmState> vms) {
this.vms = vms;
@@ -128,7 +128,7 @@ getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStr
this.vms.put(vm_name, new VmState(vms.get(vm_name), null));
}
}
-
+
public void setClusterVMStateChanges(HashMap<String, Pair<String, State>> allStates){
_clusterVMStates = allStates;
}
@@ -156,7 +156,7 @@ getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStr
public Map<String, VmState> getVmStates() {
return vms;
}
-
+
public HashMap<String, Pair<String, State>> getClusterVMStateChanges() {
return _clusterVMStates;
}
@@ -219,6 +219,6 @@ getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStr
public void setHypervisorVersion(String hypervisorVersion) {
this.hypervisorVersion = hypervisorVersion;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java b/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
index 35896fb..c19ea99 100644
--- a/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
+++ b/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java
@@ -19,12 +19,12 @@ package com.cloud.agent.api;
import com.cloud.host.Host;
public class StartupSecondaryStorageCommand extends StartupCommand {
-
+
public StartupSecondaryStorageCommand() {
super(Host.Type.SecondaryStorage);
setIqn("NoIqn");
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StartupStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StartupStorageCommand.java b/api/src/com/cloud/agent/api/StartupStorageCommand.java
index d1e67d4..3c3b058 100755
--- a/api/src/com/cloud/agent/api/StartupStorageCommand.java
+++ b/api/src/com/cloud/agent/api/StartupStorageCommand.java
@@ -26,7 +26,7 @@ import com.cloud.storage.template.TemplateInfo;
public class StartupStorageCommand extends StartupCommand {
-
+
String parent;
Map<String, TemplateInfo> templateInfo;
long totalSize;
@@ -39,7 +39,7 @@ public class StartupStorageCommand extends StartupCommand {
public StartupStorageCommand() {
super(Host.Type.Storage);
}
-
+
public StartupStorageCommand(String parent, StoragePoolType fsType, long totalSize, Map<String, TemplateInfo> info) {
super(Host.Type.Storage);
this.parent = parent;
@@ -48,7 +48,7 @@ public class StartupStorageCommand extends StartupCommand {
this.poolInfo = null;
this.fsType = fsType;
}
-
+
public StartupStorageCommand(String parent, StoragePoolType fsType, Map<String, TemplateInfo> templateInfo, StoragePoolInfo poolInfo) {
super(Host.Type.Storage);
@@ -62,7 +62,7 @@ public class StartupStorageCommand extends StartupCommand {
public String getParent() {
return parent;
}
-
+
public void setParent(String parent) {
this.parent = parent;
}
@@ -70,15 +70,15 @@ public class StartupStorageCommand extends StartupCommand {
public void setNfsShare(String nfsShare) {
this.nfsShare = nfsShare;
}
-
+
public String getNfsShare() {
return nfsShare;
}
-
+
public long getTotalSize() {
return totalSize;
}
-
+
public Map<String, TemplateInfo> getTemplateInfo() {
return templateInfo;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StopAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StopAnswer.java b/api/src/com/cloud/agent/api/StopAnswer.java
index 52f28f1..1111fed 100755
--- a/api/src/com/cloud/agent/api/StopAnswer.java
+++ b/api/src/com/cloud/agent/api/StopAnswer.java
@@ -18,28 +18,28 @@ package com.cloud.agent.api;
public class StopAnswer extends RebootAnswer {
Integer vncPort;
-
+
protected StopAnswer() {
}
-
+
public StopAnswer(StopCommand cmd, String details, Integer vncPort, boolean success) {
super(cmd, details, success);
this.vncPort = vncPort;
}
-
+
public StopAnswer(StopCommand cmd, String details, boolean success) {
super(cmd, details, success);
vncPort = null;
}
-
+
public StopAnswer(StopCommand cmd, Exception e) {
super(cmd, e);
}
-
+
@Override
public Integer getVncPort() {
return vncPort;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StopCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StopCommand.java b/api/src/com/cloud/agent/api/StopCommand.java
index 176a7fb..9ee7ce3 100755
--- a/api/src/com/cloud/agent/api/StopCommand.java
+++ b/api/src/com/cloud/agent/api/StopCommand.java
@@ -23,35 +23,35 @@ public class StopCommand extends RebootCommand {
private boolean isProxy=false;
private String urlPort=null;
private String publicConsoleProxyIpAddress=null;
-
+
protected StopCommand() {
}
-
+
public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String publicConsoleProxyIpAddress) {
super(vm);
this.isProxy = isProxy;
this.urlPort = urlPort;
this.publicConsoleProxyIpAddress = publicConsoleProxyIpAddress;
}
-
+
public StopCommand(VirtualMachine vm, String vnet) {
super(vm);
this.vnet = vnet;
}
-
+
public StopCommand(VirtualMachine vm, String vmName, String vnet) {
super(vmName);
this.vnet = vnet;
}
-
+
public StopCommand(String vmName) {
super(vmName);
}
-
+
public String getVnet() {
return vnet;
}
-
+
@Override
public boolean executeInSequence() {
return true;
@@ -60,11 +60,11 @@ public class StopCommand extends RebootCommand {
public boolean isProxy() {
return this.isProxy;
}
-
+
public String getURLPort() {
return this.urlPort;
}
-
+
public String getPublicConsoleProxyIpAddress() {
return this.publicConsoleProxyIpAddress;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/StoragePoolInfo.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/StoragePoolInfo.java b/api/src/com/cloud/agent/api/StoragePoolInfo.java
index 4ac6b29..475205f 100644
--- a/api/src/com/cloud/agent/api/StoragePoolInfo.java
+++ b/api/src/com/cloud/agent/api/StoragePoolInfo.java
@@ -29,7 +29,7 @@ public class StoragePoolInfo {
long capacityBytes;
long availableBytes;
Map<String, String> details;
-
+
protected StoragePoolInfo() {
super();
}
@@ -46,14 +46,14 @@ public class StoragePoolInfo {
this.capacityBytes = capacityBytes;
this.availableBytes = availableBytes;
}
-
+
public StoragePoolInfo(String uuid, String host, String hostPath,
String localPath, StoragePoolType poolType, long capacityBytes,
long availableBytes, Map<String, String> details) {
this(uuid, host, hostPath, localPath, poolType, capacityBytes, availableBytes);
this.details = details;
}
-
+
public long getCapacityBytes() {
return capacityBytes;
}
@@ -84,4 +84,4 @@ public class StoragePoolInfo {
public Map<String, String> getDetails() {
return details;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/TransferAgentCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/TransferAgentCommand.java b/api/src/com/cloud/agent/api/TransferAgentCommand.java
index f6f63b7..0dfde7e 100644
--- a/api/src/com/cloud/agent/api/TransferAgentCommand.java
+++ b/api/src/com/cloud/agent/api/TransferAgentCommand.java
@@ -23,10 +23,10 @@ public class TransferAgentCommand extends Command {
protected long futureOwner;
protected long currentOwner;
Event event;
-
+
protected TransferAgentCommand() {
}
-
+
public TransferAgentCommand(long agentId, long currentOwner, long futureOwner, Event event) {
this.agentId = agentId;
this.currentOwner = currentOwner;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/UnPlugNicCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UnPlugNicCommand.java b/api/src/com/cloud/agent/api/UnPlugNicCommand.java
index 0530527..b6cab88 100644
--- a/api/src/com/cloud/agent/api/UnPlugNicCommand.java
+++ b/api/src/com/cloud/agent/api/UnPlugNicCommand.java
@@ -21,7 +21,7 @@ import com.cloud.agent.api.to.NicTO;
public class UnPlugNicCommand extends Command{
NicTO nic;
String instanceName;
-
+
public NicTO getNic() {
return nic;
}
@@ -30,10 +30,10 @@ public class UnPlugNicCommand extends Command{
public boolean executeInSequence() {
return true;
}
-
+
protected UnPlugNicCommand() {
}
-
+
public UnPlugNicCommand(NicTO nic, String instanceName) {
this.nic = nic;
this.instanceName = instanceName;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/UnsupportedAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UnsupportedAnswer.java b/api/src/com/cloud/agent/api/UnsupportedAnswer.java
index 10a2b8a..7d0f244 100644
--- a/api/src/com/cloud/agent/api/UnsupportedAnswer.java
+++ b/api/src/com/cloud/agent/api/UnsupportedAnswer.java
@@ -20,7 +20,7 @@ public class UnsupportedAnswer extends Answer {
protected UnsupportedAnswer() {
super();
}
-
+
public UnsupportedAnswer(Command cmd, String details) {
super(cmd, false, details);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/UpgradeAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UpgradeAnswer.java b/api/src/com/cloud/agent/api/UpgradeAnswer.java
index b93131b..00b0f25 100644
--- a/api/src/com/cloud/agent/api/UpgradeAnswer.java
+++ b/api/src/com/cloud/agent/api/UpgradeAnswer.java
@@ -19,7 +19,7 @@ package com.cloud.agent.api;
public class UpgradeAnswer extends Answer {
protected UpgradeAnswer() {
}
-
+
public UpgradeAnswer(UpgradeCommand cmd, String failure) {
super(cmd, false, failure);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/UpgradeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UpgradeCommand.java b/api/src/com/cloud/agent/api/UpgradeCommand.java
index e85e72c..0e1b6d2 100644
--- a/api/src/com/cloud/agent/api/UpgradeCommand.java
+++ b/api/src/com/cloud/agent/api/UpgradeCommand.java
@@ -22,18 +22,18 @@ package com.cloud.agent.api;
public class UpgradeCommand extends Command {
String url;
-
+
protected UpgradeCommand() {
}
-
+
public UpgradeCommand(String url) {
this.url = url;
}
-
+
public String getUpgradeUrl() {
return url;
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java b/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
index e451768..1b3ff74 100644
--- a/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
@@ -19,16 +19,16 @@ public class UpgradeSnapshotCommand extends SnapshotCommand {
private String version;
private Long templateId;
private Long tmpltAccountId;
-
+
protected UpgradeSnapshotCommand() {
-
+
}
-
+
/**
* @param primaryStoragePoolNameLabel The UUID of the primary storage Pool
* @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
* @param snapshotUuid The UUID of the snapshot which is going to be upgraded
- * @param _version version for this snapshot
+ * @param _version version for this snapshot
*/
public UpgradeSnapshotCommand(String primaryStoragePoolNameLabel,
String secondaryStoragePoolURL,
@@ -58,5 +58,5 @@ public class UpgradeSnapshotCommand extends SnapshotCommand {
public Long getTmpltAccountId() {
return tmpltAccountId;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java b/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
index d9b0e61..f5bb544 100644
--- a/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
+++ b/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java
@@ -21,11 +21,11 @@ public class ValidateSnapshotAnswer extends Answer {
private String expectedSnapshotBackupUuid;
private String actualSnapshotBackupUuid;
private String actualSnapshotUuid;
-
+
protected ValidateSnapshotAnswer() {
-
+
}
-
+
public ValidateSnapshotAnswer(ValidateSnapshotCommand cmd, boolean success, String result, String expectedSnapshotBackupUuid, String actualSnapshotBackupUuid, String actualSnapshotUuid) {
super(cmd, success, result);
this.expectedSnapshotBackupUuid = expectedSnapshotBackupUuid;
@@ -39,14 +39,14 @@ public class ValidateSnapshotAnswer extends Answer {
public String getExpectedSnapshotBackupUuid() {
return expectedSnapshotBackupUuid;
}
-
+
/**
* @return the actualSnapshotBackupUuid
*/
public String getActualSnapshotBackupUuid() {
return actualSnapshotBackupUuid;
}
-
+
public String getActualSnapshotUuid() {
return actualSnapshotUuid;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java b/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
index 527502c..9ffbf29 100644
--- a/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java
@@ -22,24 +22,24 @@ public class ValidateSnapshotCommand extends Command {
private String firstBackupUuid;
private String previousSnapshotUuid;
private String templateUuid;
-
+
protected ValidateSnapshotCommand() {
-
+
}
-
+
/**
* @param primaryStoragePoolNameLabel The primary storage Pool Name Label
* @param volumeUuid The UUID of the volume for which the snapshot was taken
* @param firstBackupUuid This UUID of the first snapshot that was ever taken for this volume, even it was deleted.
* @param previousSnapshotUuid The UUID of the previous snapshot on the primary.
- * @param templateUuid If this is a root volume and no snapshot has been taken for it,
- * this is the UUID of the template VDI.
+ * @param templateUuid If this is a root volume and no snapshot has been taken for it,
+ * this is the UUID of the template VDI.
*/
public ValidateSnapshotCommand(String primaryStoragePoolNameLabel,
String volumeUuid,
String firstBackupUuid,
String previousSnapshotUuid,
- String templateUuid)
+ String templateUuid)
{
this.primaryStoragePoolNameLabel = primaryStoragePoolNameLabel;
this.volumeUuid = volumeUuid;
@@ -51,7 +51,7 @@ public class ValidateSnapshotCommand extends Command {
public String getPrimaryStoragePoolNameLabel() {
return primaryStoragePoolNameLabel;
}
-
+
/**
* @return the volumeUuid
*/
@@ -65,11 +65,11 @@ public class ValidateSnapshotCommand extends Command {
public String getFirstBackupUuid() {
return firstBackupUuid;
}
-
+
public String getPreviousSnapshotUuid() {
return previousSnapshotUuid;
}
-
+
/**
* @return the templateUuid
*/
@@ -81,4 +81,4 @@ public class ValidateSnapshotCommand extends Command {
public boolean executeInSequence() {
return false;
}
-}
\ No newline at end of file
+}