You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/01/10 01:48:36 UTC
[49/52] [partial] Summary: Fixes for api_refactoring
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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 703aea0..f00f490 100644
--- a/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java
@@ -21,16 +21,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(StoragePool pool,
String secondaryStoragePoolURL,
@@ -60,5 +60,5 @@ public class UpgradeSnapshotCommand extends SnapshotCommand {
public Long getTmpltAccountId() {
return tmpltAccountId;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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/c4c9d2d8/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
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/VmStatsEntry.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/VmStatsEntry.java b/api/src/com/cloud/agent/api/VmStatsEntry.java
index 55694f8..8828e91 100755
--- a/api/src/com/cloud/agent/api/VmStatsEntry.java
+++ b/api/src/com/cloud/agent/api/VmStatsEntry.java
@@ -19,17 +19,17 @@ package com.cloud.agent.api;
import com.cloud.vm.VmStats;
public class VmStatsEntry implements VmStats {
-
+
double cpuUtilization;
double networkReadKBs;
double networkWriteKBs;
- int numCPUs;
+ int numCPUs;
String entityType;
-
+
public VmStatsEntry() {
}
-
- public VmStatsEntry(double cpuUtilization, double networkReadKBs, double networkWriteKBs, int numCPUs, String entityType)
+
+ public VmStatsEntry(double cpuUtilization, double networkReadKBs, double networkWriteKBs, int numCPUs, String entityType)
{
this.cpuUtilization = cpuUtilization;
this.networkReadKBs = networkReadKBs;
@@ -41,7 +41,7 @@ public class VmStatsEntry implements VmStats {
public double getCPUUtilization() {
return cpuUtilization;
}
-
+
public void setCPUUtilization(double cpuUtilization) {
this.cpuUtilization = cpuUtilization;
}
@@ -49,23 +49,23 @@ public class VmStatsEntry implements VmStats {
public double getNetworkReadKBs() {
return networkReadKBs;
}
-
+
public void setNetworkReadKBs(double networkReadKBs) {
this.networkReadKBs = networkReadKBs;
}
-
+
public double getNetworkWriteKBs() {
return networkWriteKBs;
}
-
+
public void setNetworkWriteKBs(double networkWriteKBs) {
this.networkWriteKBs = networkWriteKBs;
}
-
+
public int getNumCPUs() {
return numCPUs;
}
-
+
public void setNumCPUs(int numCPUs) {
this.numCPUs = numCPUs;
}
@@ -73,10 +73,10 @@ public class VmStatsEntry implements VmStats {
public String getEntityType(){
return this.entityType;
}
-
+
public void setEntityType(String entityType){
this.entityType = entityType;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java b/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
index e0f4a28..fdd1fe9 100644
--- a/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
+++ b/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
@@ -18,23 +18,23 @@ package com.cloud.agent.api.baremetal;
import com.cloud.agent.api.Command;
-public class IpmISetBootDevCommand extends Command {
+public class IpmISetBootDevCommand extends Command {
public enum BootDev {
pxe(),
disk(),
cdrom(),
}
-
+
BootDev bootDev;
-
+
public BootDev getBootDev() {
return bootDev;
}
-
+
public IpmISetBootDevCommand(BootDev dev) {
bootDev = dev;
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
index 1190cb3..d8f0529 100644
--- a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
+++ b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
@@ -22,8 +22,8 @@ public class PreparePxeServerAnswer extends Answer {
public PreparePxeServerAnswer(PreparePxeServerCommand cmd) {
super(cmd, true, "SUCCESS");
}
-
+
public PreparePxeServerAnswer(PreparePxeServerCommand cmd, String details) {
super(cmd, false, details);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
index 0cda0f1..6c73563 100644
--- a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
+++ b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
@@ -28,12 +28,12 @@ public class PreparePxeServerCommand extends Command {
String template;
String vmName;
String hostName;
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public PreparePxeServerCommand(String ip, String mac, String netMask, String gateway, String dns, String template, String vmName, String hostName) {
this.ip = ip;
this.mac = mac;
@@ -44,7 +44,7 @@ public class PreparePxeServerCommand extends Command {
this.vmName = vmName;
this.hostName = hostName;
}
-
+
public String getIp() {
return ip;
}
@@ -68,11 +68,11 @@ public class PreparePxeServerCommand extends Command {
public String getTemplate() {
return template;
}
-
+
public String getVmName() {
return vmName;
}
-
+
public String getHostName() {
return hostName;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java b/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
index 03d178e..b187420 100644
--- a/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
+++ b/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
@@ -25,12 +25,12 @@ public class prepareCreateTemplateCommand extends Command {
String gateway;
String dns;
String template;
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public prepareCreateTemplateCommand(String ip, String mac, String netMask, String gateway, String dns, String template) {
this.ip = ip;
this.mac = mac;
@@ -43,23 +43,23 @@ public class prepareCreateTemplateCommand extends Command {
public String getIp() {
return ip;
}
-
+
public String getMac() {
return mac;
}
-
+
public String getNetMask() {
return netMask;
}
-
+
public String getGateWay() {
return gateway;
}
-
+
public String getDns() {
return dns;
}
-
+
public String getTemplate() {
return template;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/check/CheckSshAnswer.java b/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
index 7618159..3414eb0 100644
--- a/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
+++ b/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
@@ -20,17 +20,17 @@ import com.cloud.agent.api.Answer;
public class CheckSshAnswer extends Answer {
protected CheckSshAnswer() {
-
+
}
-
+
public CheckSshAnswer(CheckSshCommand cmd) {
super(cmd, true, null);
}
-
+
public CheckSshAnswer(CheckSshCommand cmd, String details) {
super(cmd, false, details);
}
-
+
public CheckSshAnswer(CheckSshCommand cmd, Throwable th) {
super(cmd, false, th.getMessage());
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/check/CheckSshCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/check/CheckSshCommand.java b/api/src/com/cloud/agent/api/check/CheckSshCommand.java
index fb4210f..e384983 100644
--- a/api/src/com/cloud/agent/api/check/CheckSshCommand.java
+++ b/api/src/com/cloud/agent/api/check/CheckSshCommand.java
@@ -24,11 +24,11 @@ public class CheckSshCommand extends Command {
int interval;
int retries;
String name;
-
+
protected CheckSshCommand() {
super();
}
-
+
public CheckSshCommand(String instanceName, String ip, int port) {
super();
this.ip = ip;
@@ -37,7 +37,7 @@ public class CheckSshCommand extends Command {
this.retries = 100;
this.name = instanceName;
}
-
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java b/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
index 6021762..a2ae611 100644
--- a/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
+++ b/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
@@ -20,7 +20,7 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.agent.api.to.SwiftTO;
/**
- * 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 downloadSnapshotFromSwiftCommand extends SnapshotCommand {
@LogLevel(Log4jLevel.Off)
@@ -29,9 +29,9 @@ public class downloadSnapshotFromSwiftCommand extends SnapshotCommand {
private String _parent;
protected downloadSnapshotFromSwiftCommand() {
-
+
}
-
+
public downloadSnapshotFromSwiftCommand(SwiftTO swift, String secondaryStorageUrl, Long dcId, Long accountId, Long volumeId, String parent, String BackupUuid, int wait) {
super(null, secondaryStorageUrl, BackupUuid, "", dcId, accountId, volumeId);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java b/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
index 0bf6e98..8229065 100644
--- a/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
+++ b/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
@@ -20,8 +20,8 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
import com.cloud.agent.api.to.SwiftTO;
/**
- *
- *
+ *
+ *
*/
public class downloadTemplateFromSwiftToSecondaryStorageCommand extends Command {
@@ -35,9 +35,9 @@ public class downloadTemplateFromSwiftToSecondaryStorageCommand extends Command
private String path;
protected downloadTemplateFromSwiftToSecondaryStorageCommand() {
-
+
}
-
+
public downloadTemplateFromSwiftToSecondaryStorageCommand(SwiftTO swift, String secondaryStorageUrl, Long dcId, Long accountId, Long templateId, String path, int wait) {
this.swift = swift;
@@ -87,4 +87,4 @@ public class downloadTemplateFromSwiftToSecondaryStorageCommand extends Command
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
index 318d939..7582b0d 100644
--- a/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
+++ b/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
@@ -26,33 +26,33 @@ public class CheckConsoleProxyLoadCommand extends ProxyCommand {
private String proxyVmName;
private String proxyManagementIp;
private int proxyCmdPort;
-
+
public CheckConsoleProxyLoadCommand() {
}
-
+
public CheckConsoleProxyLoadCommand(long proxyVmId, String proxyVmName, String proxyManagementIp, int proxyCmdPort) {
this.proxyVmId = proxyVmId;
this.proxyVmName = proxyVmName;
this.proxyManagementIp = proxyManagementIp;
this.proxyCmdPort = proxyCmdPort;
}
-
+
public long getProxyVmId() {
return proxyVmId;
}
-
+
public String getProxyVmName() {
return proxyVmName;
}
-
+
public String getProxyManagementIp() {
return proxyManagementIp;
}
-
+
public int getProxyCmdPort() {
return proxyCmdPort;
}
-
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
index df8f47d..ae93f51 100644
--- a/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
+++ b/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
@@ -23,21 +23,21 @@ public class ConsoleProxyLoadAnswer extends Answer {
private long proxyVmId;
private String proxyVmName;
-
+
protected ConsoleProxyLoadAnswer() {
}
-
+
public ConsoleProxyLoadAnswer(Command command, long proxyVmId, String proxyVmName, boolean success, String details) {
super(command, success, details);
-
+
this.proxyVmId = proxyVmId;
this.proxyVmName = proxyVmName;
}
-
+
public long getProxyVmId() {
return proxyVmId;
}
-
+
public String getProxyVmName() {
return proxyVmName;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java b/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
index fd306ff..c5af38e 100644
--- a/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
+++ b/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
@@ -27,21 +27,21 @@ public class StartConsoleProxyAgentHttpHandlerCommand extends Command {
private String keystorePassword;
@LogLevel(Log4jLevel.Off)
private String encryptorPassword;
-
+
public StartConsoleProxyAgentHttpHandlerCommand() {
super();
}
-
+
public StartConsoleProxyAgentHttpHandlerCommand(byte[] ksBits, String ksPassword) {
this.keystoreBits = ksBits;
this.keystorePassword = ksPassword;
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public byte[] getKeystoreBits() {
return keystoreBits;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
index b918ba4..ef4a549 100644
--- a/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
+++ b/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
@@ -25,7 +25,7 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCo
private String proxyManagementIp;
private int proxyCmdPort;
int interval;
-
+
public WatchConsoleProxyLoadCommand(int interval, long proxyVmId, String proxyVmName,
String proxyManagementIp, int proxyCmdPort) {
this.interval = interval;
@@ -34,30 +34,30 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCo
this.proxyManagementIp = proxyManagementIp;
this.proxyCmdPort = proxyCmdPort;
}
-
+
protected WatchConsoleProxyLoadCommand() {
}
-
+
public long getProxyVmId() {
return proxyVmId;
}
-
+
public String getProxyVmName() {
return proxyVmName;
}
-
+
public String getProxyManagementIp() {
return proxyManagementIp;
}
-
+
public int getProxyCmdPort() {
return proxyCmdPort;
}
-
+
public int getInterval() {
return interval;
}
-
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java b/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
index ed972a2..dc7f1a1 100644
--- a/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
+++ b/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
@@ -27,7 +27,7 @@ public class CreateLoadBalancerApplianceCommand extends NetworkElementCommand {
String password;
String publicInterface;
String privateInterface;
-
+
public CreateLoadBalancerApplianceCommand(String ip, String netmask, String gateway) {
this.ip = ip;
this.netmask = netmask;
@@ -45,4 +45,4 @@ public class CreateLoadBalancerApplianceCommand extends NetworkElementCommand {
public String getGateway() {
return gateway;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
index ff38941..5c2cd58 100644
--- a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
+++ b/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
@@ -29,56 +29,56 @@ public class DhcpEntryCommand extends NetworkElementCommand {
String staticRoutes;
String defaultDns;
-
+
protected DhcpEntryCommand() {
-
+
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName) {
this.vmMac = vmMac;
this.vmIpAddress = vmIpAddress;
this.vmName = vmName;
}
-
+
public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String dns, String gateway) {
this(vmMac, vmIpAddress, vmName);
this.dns = dns;
this.gateway = gateway;
}
-
+
public String getDns() {
return dns;
}
-
+
public String getGateway() {
return gateway;
}
-
+
public String getVmMac() {
return vmMac;
}
-
+
public String getVmIpAddress() {
return vmIpAddress;
}
-
+
public String getVmName() {
return vmName;
}
-
+
public void setNextServer(String ip) {
nextServer = ip;
}
-
+
public String getNextServer() {
return nextServer;
}
-
+
public String getDefaultRouter() {
return defaultRouter;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
index 1892196..194923c 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
@@ -20,13 +20,13 @@ import com.cloud.agent.api.Answer;
public class IpAssocAnswer extends Answer{
String[] results;
-
+
public static final String errorResult = "Failed";
-
+
protected IpAssocAnswer() {
super();
}
-
+
public IpAssocAnswer(IpAssocCommand cmd, String[] results) {
boolean finalResult = true;
@@ -41,7 +41,7 @@ public class IpAssocAnswer extends Answer{
assert(cmd.getIpAddresses().length == results.length) : "Shouldn't the results match the commands?";
this.results = results;
}
-
+
String[] getResults() {
return results;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
index 5326b11..5cdc2da 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
@@ -19,12 +19,12 @@ package com.cloud.agent.api.routing;
import com.cloud.agent.api.to.IpAddressTO;
public class IpAssocCommand extends NetworkElementCommand {
-
+
IpAddressTO[] ipAddresses;
protected IpAssocCommand() {
}
-
+
public IpAssocCommand(IpAddressTO[] ips) {
this.ipAddresses = ips;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
index cc7fcb0..e5c900d 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
@@ -22,7 +22,7 @@ public class IpAssocVpcCommand extends IpAssocCommand{
protected IpAssocVpcCommand() {
super();
}
-
+
public IpAssocVpcCommand(IpAddressTO[] ips) {
super(ips);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
index a5505e1..1c1fb91 100644
--- a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
+++ b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
@@ -31,13 +31,13 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand {
public String lbStatsPort = "8081"; /*load balancer listen on this port for stats */
public String lbStatsSrcCidrs = "0/0" ; /* TODO : currently there is no filtering based on the source ip */
public String lbStatsAuth = "admin1:AdMiN123";
- public String lbStatsUri = "/admin?stats";
+ public String lbStatsUri = "/admin?stats";
NicTO nic;
Long vpcId;
-
+
protected LoadBalancerConfigCommand() {
}
-
+
public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers, Long vpcId) {
this.loadBalancers = loadBalancers;
this.vpcId = vpcId;
@@ -51,11 +51,11 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand {
this.nic = nic;
this.vpcId = vpcId;
}
-
+
public NicTO getNic() {
return nic;
}
-
+
public LoadBalancerTO[] getLoadBalancers() {
return loadBalancers;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
index 61e41e8..41ae80f 100644
--- a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
+++ b/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
@@ -22,7 +22,7 @@ import com.cloud.agent.api.Command;
public abstract class NetworkElementCommand extends Command {
HashMap<String, String> accessDetails = new HashMap<String, String>(0);
-
+
public static final String ACCOUNT_ID = "account.id";
public static final String GUEST_NETWORK_CIDR = "guest.network.cidr";
public static final String GUEST_NETWORK_GATEWAY = "guest.network.gateway";
@@ -32,19 +32,19 @@ public abstract class NetworkElementCommand extends Command {
public static final String ROUTER_GUEST_IP = "router.guest.ip";
public static final String ZONE_NETWORK_TYPE = "zone.network.type";
public static final String GUEST_BRIDGE = "guest.bridge";
-
+
protected NetworkElementCommand() {
super();
}
-
+
public void setAccessDetail(String name, String value) {
accessDetails.put(name, value);
}
-
+
public String getAccessDetail(String name) {
return accessDetails.get(name);
}
-
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
index 8cf3ba2..68d7caf 100644
--- a/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
+++ b/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
@@ -18,17 +18,17 @@ package com.cloud.agent.api.routing;
public class RemoteAccessVpnCfgCommand extends NetworkElementCommand {
-
+
boolean create;
String vpnServerIp;
String ipRange;
String presharedKey;
String localIp;
-
+
protected RemoteAccessVpnCfgCommand() {
this.create = false;
}
-
+
public boolean isCreate() {
return create;
}
@@ -37,12 +37,12 @@ public class RemoteAccessVpnCfgCommand extends NetworkElementCommand {
public boolean executeInSequence() {
return true;
}
-
-
+
+
public RemoteAccessVpnCfgCommand(boolean create, String vpnServerAddress, String localIp, String ipRange, String ipsecPresharedKey) {
this.vpnServerIp = vpnServerAddress;
this.ipRange = ipRange;
- this.presharedKey = ipsecPresharedKey;
+ this.presharedKey = ipsecPresharedKey;
this.localIp = localIp;
this.create = create;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
index 92cf671..6dac148 100644
--- a/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
@@ -22,25 +22,25 @@ public class SavePasswordCommand extends NetworkElementCommand {
String password;
String vmIpAddress;
String vmName;
-
- protected SavePasswordCommand() {
+
+ protected SavePasswordCommand() {
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public SavePasswordCommand(String password, String vmIpAddress, String vmName) {
this.password = password;
this.vmIpAddress = vmIpAddress;
this.vmName = vmName;
}
-
+
public String getPassword() {
return password;
}
-
+
public String getVmIpAddress() {
return vmIpAddress;
}
@@ -48,7 +48,7 @@ public class SavePasswordCommand extends NetworkElementCommand {
public String getVmName() {
return vmName;
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
index 82730bd..5268c3d 100644
--- a/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
@@ -20,16 +20,16 @@ import com.cloud.agent.api.Answer;
public class SetFirewallRulesAnswer extends Answer {
String[] results;
-
+
protected SetFirewallRulesAnswer() {
}
-
+
public SetFirewallRulesAnswer(SetFirewallRulesCommand cmd, boolean success, String[] results) {
super(cmd, success, null);
assert (cmd.getRules().length == results.length) : "rules and their results should be the same length don't you think?";
this.results = results;
}
-
+
public String[] getResults() {
return results;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
index 528f36b..3841bd7 100644
--- a/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
@@ -23,7 +23,7 @@ import java.util.Set;
import com.cloud.agent.api.to.FirewallRuleTO;
/**
- *
+ *
* AccessDetails allow different components to put in information about
* how to access the components inside the command.
*/
@@ -32,11 +32,11 @@ public class SetFirewallRulesCommand extends NetworkElementCommand {
protected SetFirewallRulesCommand() {
}
-
+
public SetFirewallRulesCommand(List<FirewallRuleTO> rules) {
- this.rules = rules.toArray(new FirewallRuleTO[rules.size()]);
+ this.rules = rules.toArray(new FirewallRuleTO[rules.size()]);
}
-
+
public FirewallRuleTO[] getRules() {
return rules;
}
@@ -45,34 +45,34 @@ public class SetFirewallRulesCommand extends NetworkElementCommand {
String [][] result = new String [2][];
Set<String> toAdd = new HashSet<String>();
-
+
for (FirewallRuleTO fwTO: rules) {
- /* example : 172.16.92.44:tcp:80:80:0.0.0.0/0:,200.16.92.44:tcp:220:220:0.0.0.0/0:,
+ /* example : 172.16.92.44:tcp:80:80:0.0.0.0/0:,200.16.92.44:tcp:220:220:0.0.0.0/0:,
* each entry format <ip>:protocol:srcport:destport:scidr:
* reverted entry format <ip>:reverted:0:0:0:
*/
- if (fwTO.revoked() == true)
+ if (fwTO.revoked() == true)
{
StringBuilder sb = new StringBuilder();
/* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
- sb.append(fwTO.getSrcIp()).append(":reverted:0:0:0:");
+ sb.append(fwTO.getSrcIp()).append(":reverted:0:0:0:");
String fwRuleEntry = sb.toString();
toAdd.add(fwRuleEntry);
continue;
}
-
+
List<String> cidr;
StringBuilder sb = new StringBuilder();
sb.append(fwTO.getSrcIp()).append(":").append(fwTO.getProtocol()).append(":");
if ("icmp".compareTo(fwTO.getProtocol()) == 0)
{
sb.append(fwTO.getIcmpType()).append(":").append(fwTO.getIcmpCode()).append(":");
-
+
}else if (fwTO.getStringSrcPortRange() == null)
sb.append("0:0").append(":");
else
sb.append(fwTO.getStringSrcPortRange()).append(":");
-
+
cidr = fwTO.getSourceCidrList();
if (cidr == null || cidr.isEmpty())
{
@@ -80,19 +80,19 @@ public class SetFirewallRulesCommand extends NetworkElementCommand {
}else{
Boolean firstEntry = true;
for (String tag : cidr) {
- if (!firstEntry) sb.append("-");
+ if (!firstEntry) sb.append("-");
sb.append(tag);
firstEntry = false;
}
}
sb.append(":");
String fwRuleEntry = sb.toString();
-
+
toAdd.add(fwRuleEntry);
-
+
}
result[0] = toAdd.toArray(new String[toAdd.size()]);
-
+
return result;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java b/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
index cc14295..dc192ad 100644
--- a/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
@@ -20,17 +20,17 @@ import com.cloud.agent.api.Answer;
public class SetNetworkACLAnswer extends Answer {
String[] results;
-
+
protected SetNetworkACLAnswer() {
}
-
+
public SetNetworkACLAnswer(SetNetworkACLCommand cmd, boolean success, String[] results) {
super(cmd, success, null);
assert (cmd.getRules().length == results.length) : "ACLs and their results should be the same length";
this.results = results;
}
-
+
public String[] getResults() {
return results;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
index b8fe119..dba7354 100644
--- a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
@@ -30,12 +30,12 @@ public class SetNetworkACLCommand extends NetworkElementCommand{
protected SetNetworkACLCommand() {
}
-
+
public SetNetworkACLCommand(List<NetworkACLTO> rules, NicTO nic) {
- this.rules = rules.toArray(new NetworkACLTO[rules.size()]);
+ this.rules = rules.toArray(new NetworkACLTO[rules.size()]);
this.nic = nic;
}
-
+
public NetworkACLTO[] getRules() {
return rules;
}
@@ -43,22 +43,22 @@ public class SetNetworkACLCommand extends NetworkElementCommand{
String [][] result = new String [2][];
Set<String> toAdd = new HashSet<String>();
-
+
for (NetworkACLTO aclTO: rules) {
- /* example : Ingress:tcp:80:80:0.0.0.0/0:,Egress:tcp:220:220:0.0.0.0/0:,
+ /* example : Ingress:tcp:80:80:0.0.0.0/0:,Egress:tcp:220:220:0.0.0.0/0:,
* each entry format Ingress/Egress:protocol:start port: end port:scidrs:
* reverted entry format Ingress/Egress:reverted:0:0:0:
*/
- if (aclTO.revoked() == true)
+ if (aclTO.revoked() == true)
{
StringBuilder sb = new StringBuilder();
/* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
- sb.append(aclTO.getTrafficType().toString()).append(":reverted:0:0:0:");
+ sb.append(aclTO.getTrafficType().toString()).append(":reverted:0:0:0:");
String aclRuleEntry = sb.toString();
toAdd.add(aclRuleEntry);
continue;
}
-
+
List<String> cidr;
StringBuilder sb = new StringBuilder();
sb.append(aclTO.getTrafficType().toString()).append(":").append(aclTO.getProtocol()).append(":");
@@ -75,22 +75,22 @@ public class SetNetworkACLCommand extends NetworkElementCommand{
}else{
Boolean firstEntry = true;
for (String tag : cidr) {
- if (!firstEntry) sb.append("-");
+ if (!firstEntry) sb.append("-");
sb.append(tag);
firstEntry = false;
}
}
sb.append(":");
String aclRuleEntry = sb.toString();
-
+
toAdd.add(aclRuleEntry);
-
+
}
result[0] = toAdd.toArray(new String[toAdd.size()]);
-
+
return result;
}
-
+
public NicTO getNic() {
return nic;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
index 9aa2f6d..15306fb 100644
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
@@ -23,14 +23,14 @@ public class SetPortForwardingRulesAnswer extends Answer {
protected SetPortForwardingRulesAnswer() {
super();
}
-
+
public SetPortForwardingRulesAnswer(SetPortForwardingRulesCommand cmd, String[] results, boolean success) {
super(cmd, success, null);
-
+
assert(cmd.getRules().length == results.length) : "Shouldn't the results match the commands?";
this.results = results;
}
-
+
String[] getResults() {
return results;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
index dc82043..a7bf37f 100644
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
@@ -25,7 +25,7 @@ public class SetPortForwardingRulesCommand extends NetworkElementCommand {
protected SetPortForwardingRulesCommand() {
}
-
+
public SetPortForwardingRulesCommand(List<? extends PortForwardingRuleTO> pfRules) {
rules = new PortForwardingRuleTO[pfRules.size()];
int i = 0;
@@ -33,7 +33,7 @@ public class SetPortForwardingRulesCommand extends NetworkElementCommand {
rules[i++] = rule;
}
}
-
+
public PortForwardingRuleTO[] getRules() {
return rules;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
index 042e788..7228457 100644
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
@@ -23,7 +23,7 @@ import com.cloud.agent.api.to.PortForwardingRuleTO;
public class SetPortForwardingRulesVpcCommand extends SetPortForwardingRulesCommand{
protected SetPortForwardingRulesVpcCommand() {
}
-
+
public SetPortForwardingRulesVpcCommand(List<? extends PortForwardingRuleTO> pfRules) {
super(pfRules);
}