diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java index f39d0e789614..67d499c4a318 100644 --- a/agent/src/com/cloud/agent/Agent.java +++ b/agent/src/com/cloud/agent/Agent.java @@ -135,7 +135,7 @@ public Agent(final IAgentShell shell) { Runtime.getRuntime().addShutdownHook(new ShutdownThread(this)); _ugentTaskPool = - new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( + new ThreadPoolExecutor(_shell.getPingRetries(), 2 * _shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( "UgentTask")); _executor = @@ -148,7 +148,7 @@ public Agent(final IAgentShell shell, final int localAgentId, final ServerResour _resource = resource; _link = null; - resource.setAgentControl(this); + _resource.setAgentControl(this); final String value = _shell.getPersistentProperty(getResourceName(), "id"); _id = value != null ? Long.parseLong(value) : null; @@ -173,7 +173,7 @@ public Agent(final IAgentShell shell, final int localAgentId, final ServerResour Runtime.getRuntime().addShutdownHook(new ShutdownThread(this)); _ugentTaskPool = - new ThreadPoolExecutor(shell.getPingRetries(), 2 * shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( + new ThreadPoolExecutor(_shell.getPingRetries(), 2 * _shell.getPingRetries(), 10, TimeUnit.MINUTES, new SynchronousQueue(), new NamedThreadFactory( "UgentTask")); _executor = diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java index 08f098239865..3a8058f95ee4 100644 --- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java +++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java @@ -313,7 +313,7 @@ public String getName() { return _name; } - private void launchConsoleProxy(final byte[] ksBits, final String ksPassword, final String encryptorPassword) { + private void launchConsoleProxy(final Byte[] ksBits, final String ksPassword, final String encryptorPassword) { final Object resource = this; if (_consoleProxyMain == null) { _consoleProxyMain = new Thread(new ManagedContextRunnable() { diff --git a/api/src/com/cloud/agent/api/Answer.java b/api/src/com/cloud/agent/api/Answer.java index fd6a0d1b46a5..f4ba71d4ecfd 100644 --- a/api/src/com/cloud/agent/api/Answer.java +++ b/api/src/com/cloud/agent/api/Answer.java @@ -19,7 +19,7 @@ import com.cloud.utils.exception.ExceptionUtil; public class Answer extends Command { - protected boolean result; + protected Boolean result = false; protected String details; protected Answer() { @@ -39,7 +39,7 @@ public Answer(final Command command, final Exception e) { this(command, false, ExceptionUtil.toString(e)); } - public boolean getResult() { + public Boolean getResult() { return result; } @@ -48,7 +48,7 @@ public String getDetails() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/api/src/com/cloud/agent/api/Command.java b/api/src/com/cloud/agent/api/Command.java index 2341a994dbdd..0813950a934a 100644 --- a/api/src/com/cloud/agent/api/Command.java +++ b/api/src/com/cloud/agent/api/Command.java @@ -36,13 +36,13 @@ public static enum OnError { // allow command to carry over hypervisor or other environment related context info @LogLevel(Log4jLevel.Trace) protected Map contextMap = new HashMap(); - private int wait; //in second + private Integer wait; //in second protected Command() { this.wait = 0; } - public int getWait() { + public Integer getWait() { return wait; } @@ -60,7 +60,7 @@ public final String toString() { * When this is set to true, the commands are executed by a single * thread on the agent. */ - public abstract boolean executeInSequence(); + public abstract Boolean executeInSequence(); public void setContextParam(String name, String value) { contextMap.put(name, value); diff --git a/api/src/com/cloud/agent/api/PvlanSetupCommand.java b/api/src/com/cloud/agent/api/PvlanSetupCommand.java index 512d1bcbe4af..0aa541bc61ab 100644 --- a/api/src/com/cloud/agent/api/PvlanSetupCommand.java +++ b/api/src/com/cloud/agent/api/PvlanSetupCommand.java @@ -61,7 +61,7 @@ static public PvlanSetupCommand createVmSetup(String op, URI uri, String network } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java b/api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java index b13293f522c5..35b2398aa08b 100644 --- a/api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java +++ b/api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java @@ -38,7 +38,7 @@ public CreateVolumeOVACommand(String secUrl, String volPath, String volName, Sto } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java b/api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java index bd3eb80b8adb..44c8343db993 100644 --- a/api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java +++ b/api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java @@ -31,7 +31,7 @@ public PrepareOVAPackingCommand(String secUrl, String templatePath) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/api/src/com/cloud/agent/api/to/DataTO.java b/api/src/com/cloud/agent/api/to/DataTO.java index af43aa102e84..80449c202fce 100644 --- a/api/src/com/cloud/agent/api/to/DataTO.java +++ b/api/src/com/cloud/agent/api/to/DataTO.java @@ -32,5 +32,5 @@ public interface DataTO { */ String getPath(); - long getId(); + Long getId(); } diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java index edfb0aa7c17d..0fbda71f9099 100644 --- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java +++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java @@ -40,31 +40,31 @@ * */ public class FirewallRuleTO implements InternalIdentity { - long id; + Long id; String srcVlanTag; String srcIp; String protocol; - int[] srcPortRange; - boolean revoked; - boolean alreadyAdded; + Integer[] srcPortRange; + Boolean revoked; + Boolean alreadyAdded; private List sourceCidrList; FirewallRule.Purpose purpose; private Integer icmpType; private Integer icmpCode; private FirewallRule.TrafficType trafficType; private String guestCidr; - private boolean defaultEgressPolicy; + private Boolean defaultEgressPolicy = false; private FirewallRule.FirewallRuleType type; protected FirewallRuleTO() { } - public FirewallRuleTO(long id, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded, + public FirewallRuleTO(Long id, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, Boolean revoked, Boolean alreadyAdded, FirewallRule.Purpose purpose, List sourceCidr, Integer icmpType, Integer icmpCode) { this(id, null, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, purpose, sourceCidr, icmpType, icmpCode); } - public FirewallRuleTO(long id, String srcVlanTag, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded, + public FirewallRuleTO(Long id, String srcVlanTag, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, Boolean revoked, Boolean alreadyAdded, FirewallRule.Purpose purpose, List sourceCidr, Integer icmpType, Integer icmpCode) { this.id = id; this.srcVlanTag = srcVlanTag; @@ -78,10 +78,10 @@ public FirewallRuleTO(long id, String srcVlanTag, String srcIp, String protocol, portRange.add(srcPortEnd); } - srcPortRange = new int[portRange.size()]; + srcPortRange = new Integer[portRange.size()]; int i = 0; for (Integer port : portRange) { - srcPortRange[i] = port.intValue(); + srcPortRange[i] = port; i++; } } @@ -157,7 +157,7 @@ public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, Firewa } public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType, - boolean defaultEgressPolicy) { + Boolean defaultEgressPolicy) { this(rule.getId(), srcVlanTag, srcIp, @@ -174,7 +174,7 @@ public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, Firewa this.defaultEgressPolicy = defaultEgressPolicy; } - public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, boolean revokeState, boolean alreadyAdded) { + public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, Boolean revokeState, Boolean alreadyAdded) { this(rule.getId(), srcVlanTag, srcIp, @@ -189,7 +189,7 @@ public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, Firewa rule.getIcmpCode()); } - public FirewallRuleTO(FirewallRule rule, String guestVlanTag, FirewallRule.TrafficType trafficType, String guestCidr, boolean defaultEgressPolicy, + public FirewallRuleTO(FirewallRule rule, String guestVlanTag, FirewallRule.TrafficType trafficType, String guestCidr, Boolean defaultEgressPolicy, FirewallRule.FirewallRuleType type) { this(rule.getId(), guestVlanTag, @@ -214,7 +214,7 @@ public FirewallRule.TrafficType getTrafficType() { } @Override - public long getId() { + public Long getId() { return id; } @@ -230,7 +230,7 @@ public String getProtocol() { return protocol; } - public int[] getSrcPortRange() { + public Integer[] getSrcPortRange() { return srcPortRange; } @@ -249,7 +249,7 @@ public String getStringSrcPortRange() { return NetUtils.portRangeToString(srcPortRange); } - public boolean revoked() { + public Boolean revoked() { return revoked; } @@ -257,7 +257,7 @@ public List getSourceCidrList() { return sourceCidrList; } - public boolean isAlreadyAdded() { + public Boolean isAlreadyAdded() { return alreadyAdded; } @@ -265,7 +265,7 @@ public FirewallRule.Purpose getPurpose() { return purpose; } - public boolean isDefaultEgressPolicy() { + public Boolean isDefaultEgressPolicy() { return defaultEgressPolicy; } diff --git a/api/src/com/cloud/agent/api/to/IpAddressTO.java b/api/src/com/cloud/agent/api/to/IpAddressTO.java index 1169820e19a8..d96456829165 100644 --- a/api/src/com/cloud/agent/api/to/IpAddressTO.java +++ b/api/src/com/cloud/agent/api/to/IpAddressTO.java @@ -20,12 +20,12 @@ public class IpAddressTO { - private long accountId; + private Long accountId; private String publicIp; - private boolean sourceNat; - private boolean add; - private boolean oneToOneNat; - private boolean firstIP; + private Boolean sourceNat; + private Boolean add; + private Boolean oneToOneNat; + private Boolean firstIP; private String broadcastUri; private String vlanGateway; private String vlanNetmask; @@ -34,10 +34,10 @@ public class IpAddressTO { private TrafficType trafficType; private String networkName; private Integer nicDevId; - private boolean newNic; + private Boolean newNic; - public IpAddressTO(long accountId, String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String broadcastUri, String vlanGateway, String vlanNetmask, - String vifMacAddress, Integer networkRate, boolean isOneToOneNat) { + public IpAddressTO(Long accountId, String ipAddress, Boolean add, Boolean firstIP, Boolean sourceNat, String broadcastUri, String vlanGateway, String vlanNetmask, + String vifMacAddress, Integer networkRate, Boolean isOneToOneNat) { this.accountId = accountId; this.publicIp = ipAddress; this.add = add; @@ -49,12 +49,14 @@ public IpAddressTO(long accountId, String ipAddress, boolean add, boolean firstI this.vifMacAddress = vifMacAddress; this.networkRate = networkRate; this.oneToOneNat = isOneToOneNat; + setNicDevId(0); + setNewNic(false); } protected IpAddressTO() { } - public long getAccountId() { + public Long getAccountId() { return accountId; } @@ -78,23 +80,23 @@ public void setTrafficType(TrafficType trafficType) { this.trafficType = trafficType; } - public boolean isAdd() { + public Boolean isAdd() { return add; } - public boolean isOneToOneNat() { + public Boolean isOneToOneNat() { return this.oneToOneNat; } - public boolean isFirstIP() { + public Boolean isFirstIP() { return firstIP; } - public void setSourceNat(boolean sourceNat) { + public void setSourceNat(Boolean sourceNat) { this.sourceNat = sourceNat; } - public boolean isSourceNat() { + public Boolean isSourceNat() { return sourceNat; } @@ -126,11 +128,11 @@ public void setNicDevId(Integer nicDevId) { this.nicDevId = nicDevId; } - public boolean isNewNic() { + public Boolean isNewNic() { return newNic; } - public void setNewNic(boolean newNic) { + public void setNewNic(Boolean newNic) { this.newNic = newNic; } } diff --git a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java index dffbc9e3d0e9..3cf8d1b4d874 100644 --- a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java +++ b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java @@ -38,22 +38,22 @@ public class LoadBalancerTO { String uuid; String srcIp; - int srcPort; + Integer srcPort; String protocol; String lbProtocol; String algorithm; - boolean revoked; - boolean alreadyAdded; - boolean inline; + Boolean revoked; + Boolean alreadyAdded; + Boolean inline; DestinationTO[] destinations; private StickinessPolicyTO[] stickinessPolicies; private HealthCheckPolicyTO[] healthCheckPolicies; private LbSslCert sslCert; /* XXX: Should this be SslCertTO? */ private AutoScaleVmGroupTO autoScaleVmGroupTO; - final static int MAX_STICKINESS_POLICIES = 1; - final static int MAX_HEALTHCHECK_POLICIES = 1; + final static Integer MAX_STICKINESS_POLICIES = 1; + final static Integer MAX_HEALTHCHECK_POLICIES = 1; - public LoadBalancerTO(String uuid, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline, + public LoadBalancerTO(String uuid, String srcIp, Integer srcPort, String protocol, String algorithm, Boolean revoked, Boolean alreadyAdded, Boolean inline, List destinations) { if (destinations == null) { // for autoscaleconfig destinations will be null; destinations = new ArrayList(); @@ -76,13 +76,13 @@ public LoadBalancerTO(String uuid, String srcIp, int srcPort, String protocol, S } } - public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline, + public LoadBalancerTO(String id, String srcIp, Integer srcPort, String protocol, String algorithm, Boolean revoked, Boolean alreadyAdded, Boolean inline, List argDestinations, List stickinessPolicies) { this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, argDestinations, stickinessPolicies, null, null, null); } - public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline, + public LoadBalancerTO(String id, String srcIp, Integer srcPort, String protocol, String algorithm, Boolean revoked, Boolean alreadyAdded, Boolean inline, List argDestinations, List stickinessPolicies, List healthCheckPolicies, LbSslCert sslCert, String lbProtocol) { this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, argDestinations); @@ -134,7 +134,7 @@ public String getSrcIp() { return srcIp; } - public int getSrcPort() { + public Integer getSrcPort() { return srcPort; } @@ -150,15 +150,15 @@ public String getLbProtocol() { return lbProtocol; } - public boolean isRevoked() { + public Boolean isRevoked() { return revoked; } - public boolean isAlreadyAdded() { + public Boolean isAlreadyAdded() { return alreadyAdded; } - public boolean isInline() { + public Boolean isInline() { return inline; } @@ -182,7 +182,7 @@ public void setAutoScaleVmGroupTO(AutoScaleVmGroupTO autoScaleVmGroupTO) { this.autoScaleVmGroupTO = autoScaleVmGroupTO; } - public boolean isAutoScaleVmGroupTO() { + public Boolean isAutoScaleVmGroupTO() { return this.autoScaleVmGroupTO != null; } @@ -211,14 +211,14 @@ public StickinessPolicyTO(String methodName, List> paramsLi public static class HealthCheckPolicyTO { private String pingPath; private String description; - private int responseTime; - private int healthcheckInterval; - private int healthcheckThresshold; - private int unhealthThresshold; - private boolean revoke = false; + private Integer responseTime; + private Integer healthcheckInterval; + private Integer healthcheckThresshold; + private Integer unhealthThresshold; + private Boolean revoke = false; - public HealthCheckPolicyTO(String pingPath, String description, int responseTime, int healthcheckInterval, int healthcheckThresshold, int unhealthThresshold, - boolean revoke) { + public HealthCheckPolicyTO(String pingPath, String description, Integer responseTime, Integer healthcheckInterval, Integer healthcheckThresshold, Integer unhealthThresshold, + Boolean revoke) { this.description = description; this.pingPath = pingPath; @@ -241,27 +241,27 @@ public String getDescription() { return description; } - public int getResponseTime() { + public Integer getResponseTime() { return responseTime; } - public int getHealthcheckInterval() { + public Integer getHealthcheckInterval() { return healthcheckInterval; } - public int getHealthcheckThresshold() { + public Integer getHealthcheckThresshold() { return healthcheckThresshold; } - public int getUnhealthThresshold() { + public Integer getUnhealthThresshold() { return unhealthThresshold; } - public void setRevoke(boolean revoke) { + public void setRevoke(Boolean revoke) { this.revoke = revoke; } - public boolean isRevoked() { + public Boolean isRevoked() { return revoke; } @@ -269,12 +269,12 @@ public boolean isRevoked() { public static class DestinationTO { String destIp; - int destPort; - boolean revoked; - boolean alreadyAdded; + Integer destPort; + Boolean revoked; + Boolean alreadyAdded; String monitorState; - public DestinationTO(String destIp, int destPort, boolean revoked, boolean alreadyAdded) { + public DestinationTO(String destIp, Integer destPort, Boolean revoked, Boolean alreadyAdded) { this.destIp = destIp; this.destPort = destPort; this.revoked = revoked; @@ -288,15 +288,15 @@ public String getDestIp() { return destIp; } - public int getDestPort() { + public Integer getDestPort() { return destPort; } - public boolean isRevoked() { + public Boolean isRevoked() { return revoked; } - public boolean isAlreadyAdded() { + public Boolean isAlreadyAdded() { return alreadyAdded; } @@ -363,13 +363,13 @@ public CounterTO getCounter() { public static class AutoScalePolicyTO implements Serializable { private static final long serialVersionUID = 2L; private final long id; - private final int duration; - private final int quietTime; + private final Integer duration; + private final Integer quietTime; private String action; - boolean revoked; + Boolean revoked; private final List conditions; - public AutoScalePolicyTO(long id, int duration, int quietTime, String action, List conditions, boolean revoked) { + public AutoScalePolicyTO(long id, Integer duration, Integer quietTime, String action, List conditions, Boolean revoked) { this.id = id; this.duration = duration; this.quietTime = quietTime; @@ -382,11 +382,11 @@ public long getId() { return id; } - public int getDuration() { + public Integer getDuration() { return duration; } - public int getQuietTime() { + public Integer getQuietTime() { return quietTime; } @@ -394,7 +394,7 @@ public String getAction() { return action; } - public boolean isRevoked() { + public Boolean isRevoked() { return revoked; } @@ -487,16 +487,16 @@ public String getNetworkId() { public static class AutoScaleVmGroupTO implements Serializable { private static final long serialVersionUID = 2L; private final String uuid; - private final int minMembers; - private final int maxMembers; - private final int memberPort; - private final int interval; + private final Integer minMembers; + private final Integer maxMembers; + private final Integer memberPort; + private final Integer interval; private final List policies; private final AutoScaleVmProfileTO profile; private final String state; private final String currentState; - AutoScaleVmGroupTO(String uuid, int minMembers, int maxMembers, int memberPort, int interval, List policies, AutoScaleVmProfileTO profile, + AutoScaleVmGroupTO(String uuid, Integer minMembers, Integer maxMembers, Integer memberPort, Integer interval, List policies, AutoScaleVmProfileTO profile, String state, String currentState) { this.uuid = uuid; this.minMembers = minMembers; @@ -513,19 +513,19 @@ public String getUuid() { return uuid; } - public int getMinMembers() { + public Integer getMinMembers() { return minMembers; } - public int getMaxMembers() { + public Integer getMaxMembers() { return maxMembers; } - public int getMemberPort() { + public Integer getMemberPort() { return memberPort; } - public int getInterval() { + public Integer getInterval() { return interval; } diff --git a/api/src/com/cloud/agent/api/to/MonitorServiceTO.java b/api/src/com/cloud/agent/api/to/MonitorServiceTO.java index b9a28107ba81..613df6d4dc64 100644 --- a/api/src/com/cloud/agent/api/to/MonitorServiceTO.java +++ b/api/src/com/cloud/agent/api/to/MonitorServiceTO.java @@ -19,7 +19,7 @@ import org.apache.cloudstack.api.InternalIdentity; public class MonitorServiceTO implements InternalIdentity { - long id; + Long id; String service; String processname; String serviceName; @@ -48,7 +48,7 @@ public String getPidFile() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/api/src/com/cloud/agent/api/to/NetworkACLTO.java b/api/src/com/cloud/agent/api/to/NetworkACLTO.java index 3d800794da8c..efa78a0ce3e8 100644 --- a/api/src/com/cloud/agent/api/to/NetworkACLTO.java +++ b/api/src/com/cloud/agent/api/to/NetworkACLTO.java @@ -27,24 +27,24 @@ import com.cloud.utils.net.NetUtils; public class NetworkACLTO implements InternalIdentity { - long id; + Long id; String vlanTag; String protocol; - int[] portRange; - boolean revoked; - boolean alreadyAdded; + Integer[] portRange; + Boolean revoked; + Boolean alreadyAdded; private List cidrList; private Integer icmpType; private Integer icmpCode; private TrafficType trafficType; String action; - int number; + Integer number; protected NetworkACLTO() { } - public NetworkACLTO(long id, String vlanTag, String protocol, Integer portStart, Integer portEnd, boolean revoked, boolean alreadyAdded, List cidrList, - Integer icmpType, Integer icmpCode, TrafficType trafficType, boolean allow, int number) { + public NetworkACLTO(Long id, String vlanTag, String protocol, Integer portStart, Integer portEnd, Boolean revoked, Boolean alreadyAdded, List cidrList, + Integer icmpType, Integer icmpCode, TrafficType trafficType, Boolean allow, Integer number) { this.vlanTag = vlanTag; this.protocol = protocol; @@ -55,10 +55,10 @@ public NetworkACLTO(long id, String vlanTag, String protocol, Integer portStart, range.add(portEnd); } - portRange = new int[range.size()]; + portRange = new Integer[range.size()]; int i = 0; for (Integer port : range) { - portRange[i] = port.intValue(); + portRange[i] = port; i++; } } @@ -96,7 +96,7 @@ public NetworkACLTO(NetworkACLItem rule, String vlanTag, NetworkACLItem.TrafficT } @Override - public long getId() { + public Long getId() { return id; } @@ -108,7 +108,7 @@ public String getProtocol() { return protocol; } - public int[] getSrcPortRange() { + public Integer[] getSrcPortRange() { return portRange; } @@ -127,7 +127,7 @@ public String getStringPortRange() { return NetUtils.portRangeToString(portRange); } - public boolean revoked() { + public Boolean revoked() { return revoked; } @@ -135,7 +135,7 @@ public List getSourceCidrList() { return cidrList; } - public boolean isAlreadyAdded() { + public Boolean isAlreadyAdded() { return alreadyAdded; } @@ -147,7 +147,7 @@ public String getAction() { return action; } - public int getNumber() { + public Integer getNumber() { return number; } } diff --git a/api/src/com/cloud/agent/api/to/NetworkTO.java b/api/src/com/cloud/agent/api/to/NetworkTO.java index be11deaa1ec8..690a0ee4b8b0 100644 --- a/api/src/com/cloud/agent/api/to/NetworkTO.java +++ b/api/src/com/cloud/agent/api/to/NetworkTO.java @@ -36,7 +36,7 @@ public class NetworkTO { protected TrafficType type; protected URI broadcastUri; protected URI isolationUri; - protected boolean isSecurityGroupEnabled; + protected Boolean isSecurityGroupEnabled; protected String name; public NetworkTO() { @@ -94,7 +94,7 @@ public String getName() { return name; } - public void setSecurityGroupEnabled(boolean enabled) { + public void setSecurityGroupEnabled(Boolean enabled) { this.isSecurityGroupEnabled = enabled; } @@ -178,7 +178,7 @@ public void setIsolationuri(URI isolationUri) { this.isolationUri = isolationUri; } - public boolean isSecurityGroupEnabled() { + public Boolean isSecurityGroupEnabled() { return this.isSecurityGroupEnabled; } } diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/com/cloud/agent/api/to/NicTO.java index bd681f282cd5..5511b3e1c161 100644 --- a/api/src/com/cloud/agent/api/to/NicTO.java +++ b/api/src/com/cloud/agent/api/to/NicTO.java @@ -19,11 +19,11 @@ import java.util.List; public class NicTO extends NetworkTO { - int deviceId; + Integer deviceId; Integer networkRateMbps; Integer networkRateMulticastMbps; - boolean defaultNic; - boolean pxeDisable; + Boolean defaultNic; + Boolean pxeDisable; String nicUuid; List nicSecIps; @@ -31,11 +31,11 @@ public NicTO() { super(); } - public void setDeviceId(int deviceId) { + public void setDeviceId(Integer deviceId) { this.deviceId = deviceId; } - public int getDeviceId() { + public Integer getDeviceId() { return deviceId; } @@ -51,19 +51,19 @@ public Integer getNetworkRateMulticastMbps() { return networkRateMulticastMbps; } - public boolean isDefaultNic() { + public Boolean isDefaultNic() { return defaultNic; } - public void setDefaultNic(boolean defaultNic) { + public void setDefaultNic(Boolean defaultNic) { this.defaultNic = defaultNic; } - public void setPxeDisable(boolean pxeDisable) { + public void setPxeDisable(Boolean pxeDisable) { this.pxeDisable = pxeDisable; } - public boolean getPxeDisable() { + public Boolean getPxeDisable() { return pxeDisable; } diff --git a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java index 76d6d952814c..33690fa9e25e 100644 --- a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java +++ b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java @@ -27,7 +27,7 @@ */ public class PortForwardingRuleTO extends FirewallRuleTO { String dstIp; - int[] dstPortRange; + Integer[] dstPortRange; protected PortForwardingRuleTO() { super(); @@ -36,21 +36,21 @@ protected PortForwardingRuleTO() { public PortForwardingRuleTO(PortForwardingRule rule, String srcVlanTag, String srcIp) { super(rule, srcVlanTag, srcIp); this.dstIp = rule.getDestinationIpAddress().addr(); - this.dstPortRange = new int[] {rule.getDestinationPortStart(), rule.getDestinationPortEnd()}; + this.dstPortRange = new Integer[] {rule.getDestinationPortStart(), rule.getDestinationPortEnd()}; } public PortForwardingRuleTO(long id, String srcIp, int srcPortStart, int srcPortEnd, String dstIp, int dstPortStart, int dstPortEnd, String protocol, boolean revoked, boolean alreadyAdded) { super(id, null, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, FirewallRule.Purpose.PortForwarding, null, 0, 0); this.dstIp = dstIp; - this.dstPortRange = new int[] {dstPortStart, dstPortEnd}; + this.dstPortRange = new Integer[] {dstPortStart, dstPortEnd}; } public String getDstIp() { return dstIp; } - public int[] getDstPortRange() { + public Integer[] getDstPortRange() { return dstPortRange; } diff --git a/api/src/com/cloud/agent/api/to/S3TO.java b/api/src/com/cloud/agent/api/to/S3TO.java index a46d609a9d3c..662cf6d25e30 100644 --- a/api/src/com/cloud/agent/api/to/S3TO.java +++ b/api/src/com/cloud/agent/api/to/S3TO.java @@ -40,8 +40,8 @@ public final class S3TO implements S3Utils.ClientOptions, DataStoreTO { private Integer socketTimeout; private Integer connectionTtl; private Date created; - private boolean enableRRS; - private long maxSingleUploadSizeInBytes; + private Boolean enableRRS; + private Long maxSingleUploadSizeInBytes; private static final String pathSeparator = "/"; public S3TO() { @@ -52,7 +52,7 @@ public S3TO() { public S3TO(final Long id, final String uuid, final String accessKey, final String secretKey, final String endPoint, final String bucketName, final Boolean httpsFlag, final Integer connectionTimeout, final Integer maxErrorRetry, final Integer socketTimeout, final Date created, - final boolean enableRRS, final long maxUploadSize, final Integer connectionTtl, final Boolean useTCPKeepAlive) { + final Boolean enableRRS, final Long maxUploadSize, final Integer connectionTtl, final Boolean useTCPKeepAlive) { super(); @@ -290,19 +290,19 @@ public DataStoreRole getRole() { return DataStoreRole.Image; } - public boolean getEnableRRS() { + public Boolean getEnableRRS() { return enableRRS; } - public void setEnableRRS(boolean enableRRS) { + public void setEnableRRS(Boolean enableRRS) { this.enableRRS = enableRRS; } - public long getMaxSingleUploadSizeInBytes() { + public Long getMaxSingleUploadSizeInBytes() { return maxSingleUploadSizeInBytes; } - public void setMaxSingleUploadSizeInBytes(long maxSingleUploadSizeInBytes) { + public void setMaxSingleUploadSizeInBytes(Long maxSingleUploadSizeInBytes) { this.maxSingleUploadSizeInBytes = maxSingleUploadSizeInBytes; } diff --git a/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java b/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java index 8064c301991a..f69d0927c6a7 100644 --- a/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java +++ b/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java @@ -63,14 +63,14 @@ public StaticNatRuleTO(StaticNatRule rule, String scrIp, String dstIp) { this.dstIp = dstIp; } - public StaticNatRuleTO(long id, String srcIp, Integer srcPortStart, Integer srcPortEnd, String dstIp, Integer dstPortStart, Integer dstPortEnd, String protocol, - boolean revoked, boolean alreadyAdded) { + public StaticNatRuleTO(Long id, String srcIp, Integer srcPortStart, Integer srcPortEnd, String dstIp, Integer dstPortStart, Integer dstPortEnd, String protocol, + Boolean revoked, Boolean alreadyAdded) { super(id, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, FirewallRule.Purpose.StaticNat, null, 0, 0); this.dstIp = dstIp; } - public StaticNatRuleTO(long id, String srcVlanTag, String srcIp, Integer srcPortStart, Integer srcPortEnd, String dstIp, Integer dstPortStart, Integer dstPortEnd, - String protocol, boolean revoked, boolean alreadyAdded) { + public StaticNatRuleTO(Long id, String srcVlanTag, String srcIp, Integer srcPortStart, Integer srcPortEnd, String dstIp, Integer dstPortStart, Integer dstPortEnd, + String protocol, Boolean revoked, Boolean alreadyAdded) { super(id, srcVlanTag, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, FirewallRule.Purpose.StaticNat, null, 0, 0); this.dstIp = dstIp; } diff --git a/api/src/com/cloud/agent/api/to/StorageFilerTO.java b/api/src/com/cloud/agent/api/to/StorageFilerTO.java index 8f58c9e1c917..0a79df5f1a6d 100644 --- a/api/src/com/cloud/agent/api/to/StorageFilerTO.java +++ b/api/src/com/cloud/agent/api/to/StorageFilerTO.java @@ -20,12 +20,12 @@ import com.cloud.storage.StoragePool; public class StorageFilerTO { - long id; + Long id; String uuid; String host; String path; String userInfo; - int port; + Integer port; StoragePoolType type; public StorageFilerTO(StoragePool pool) { @@ -38,7 +38,7 @@ public StorageFilerTO(StoragePool pool) { this.userInfo = pool.getUserInfo(); } - public long getId() { + public Long getId() { return id; } @@ -58,7 +58,7 @@ public String getUserInfo() { return userInfo; } - public int getPort() { + public Integer getPort() { return port; } diff --git a/api/src/com/cloud/agent/api/to/TemplateTO.java b/api/src/com/cloud/agent/api/to/TemplateTO.java index 9d22af899e8d..51b8929a5eba 100644 --- a/api/src/com/cloud/agent/api/to/TemplateTO.java +++ b/api/src/com/cloud/agent/api/to/TemplateTO.java @@ -22,7 +22,7 @@ import com.cloud.template.VirtualMachineTemplate; public class TemplateTO implements InternalIdentity { - private long id; + private Long id; private String uniqueName; private ImageFormat format; @@ -36,7 +36,7 @@ public TemplateTO(VirtualMachineTemplate template) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java index c367ec9e07d8..0b639b88c60f 100644 --- a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java +++ b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java @@ -24,11 +24,11 @@ import com.cloud.vm.VirtualMachine.Type; public class VirtualMachineTO { - private long id; + private Long id; private String name; private BootloaderType bootloader; Type type; - int cpus; + Integer cpus; /** 'speed' is still here since 4.0.X/4.1.X management servers do not support @@ -43,17 +43,17 @@ public class VirtualMachineTO { Integer minSpeed; Integer maxSpeed; - long minRam; - long maxRam; + Long minRam; + Long maxRam; String hostName; String arch; String os; String platformEmulator; String bootArgs; String[] bootupScripts; - boolean enableHA; - boolean limitCpuUse; - boolean enableDynamicallyScaleVm; + Boolean enableHA; + Boolean limitCpuUse; + Boolean enableDynamicallyScaleVm; String vncPassword; String vncAddr; Map params; @@ -70,8 +70,8 @@ public class VirtualMachineTO { String configDriveIsoFile = null; - public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, - String os, boolean enableHA, boolean limitCpuUse, String vncPassword) { + public VirtualMachineTO(Long id, String instanceName, VirtualMachine.Type type, Integer cpus, Integer speed, Long minRam, Long maxRam, BootloaderType bootloader, + String os, Boolean enableHA, Boolean limitCpuUse, String vncPassword) { this.id = id; name = instanceName; this.type = type; @@ -86,8 +86,8 @@ public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, this.vncPassword = vncPassword; } - public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer minSpeed, Integer maxSpeed, long minRam, long maxRam, - BootloaderType bootloader, String os, boolean enableHA, boolean limitCpuUse, String vncPassword) { + public VirtualMachineTO(Long id, String instanceName, VirtualMachine.Type type, Integer cpus, Integer minSpeed, Integer maxSpeed, Long minRam, Long maxRam, + BootloaderType bootloader, String os, Boolean enableHA, Boolean limitCpuUse, String vncPassword) { this.id = id; name = instanceName; this.type = type; @@ -106,19 +106,19 @@ public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, protected VirtualMachineTO() { } - public long getId() { + public Long getId() { return id; } - public void setId(long id) { + public void setId(Long id) { this.id = id; } - public boolean isEnableDynamicallyScaleVm() { + public Boolean isEnableDynamicallyScaleVm() { return enableDynamicallyScaleVm; } - public void setEnableDynamicallyScaleVm(boolean enableDynamicallyScaleVm) { + public void setEnableDynamicallyScaleVm(Boolean enableDynamicallyScaleVm) { this.enableDynamicallyScaleVm = enableDynamicallyScaleVm; } @@ -142,11 +142,11 @@ public void setBootloader(BootloaderType bootloader) { this.bootloader = bootloader; } - public int getCpus() { + public Integer getCpus() { return cpus; } - public void setCpus(int cpus) { + public void setCpus(Integer cpus) { this.cpus = cpus; } @@ -162,20 +162,20 @@ public Integer getMaxSpeed() { return maxSpeed; } - public boolean getLimitCpuUse() { + public Boolean getLimitCpuUse() { return limitCpuUse; } - public long getMinRam() { + public Long getMinRam() { return minRam; } - public void setRam(long minRam, long maxRam) { + public void setRam(Long minRam, Long maxRam) { this.minRam = minRam; this.maxRam = maxRam; } - public long getMaxRam() { + public Long getMaxRam() { return maxRam; } diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/com/cloud/agent/api/to/VolumeTO.java index 2ad5e0b26f70..32bb928eb314 100644 --- a/api/src/com/cloud/agent/api/to/VolumeTO.java +++ b/api/src/com/cloud/agent/api/to/VolumeTO.java @@ -26,15 +26,15 @@ public class VolumeTO implements InternalIdentity { protected VolumeTO() { } - private long id; + private Long id; private String name; private String mountPoint; private String path; - private long size; + private Long size; private Volume.Type type; private StoragePoolType storagePoolType; private String storagePoolUuid; - private long deviceId; + private Long deviceId; private String chainInfo; private String guestOsType; private Long bytesReadRate; @@ -44,7 +44,7 @@ protected VolumeTO() { private String cacheMode; private Long chainSize; - public VolumeTO(long id, Volume.Type type, StoragePoolType poolType, String poolUuid, String name, String mountPoint, String path, long size, String chainInfo) { + public VolumeTO(Long id, Volume.Type type, StoragePoolType poolType, String poolUuid, String name, String mountPoint, String path, Long size, String chainInfo) { this.id = id; this.name = name; this.path = path; @@ -56,7 +56,7 @@ public VolumeTO(long id, Volume.Type type, StoragePoolType poolType, String pool this.chainInfo = chainInfo; } - public VolumeTO(long id, Volume.Type type, StoragePoolType poolType, String poolUuid, String name, String mountPoint, String path, long size, String chainInfo, + public VolumeTO(Long id, Volume.Type type, StoragePoolType poolType, String poolUuid, String name, String mountPoint, String path, Long size, String chainInfo, String guestOsType) { this.id = id; this.name = name; @@ -85,16 +85,16 @@ public VolumeTO(Volume volume, StoragePool pool) { this.deviceId = volume.getDeviceId(); } - public long getDeviceId() { + public Long getDeviceId() { return deviceId; } - public void setDeviceId(long id) { + public void setDeviceId(Long id) { this.deviceId = id; } @Override - public long getId() { + public Long getId() { return id; } @@ -102,7 +102,7 @@ public String getPath() { return path; } - public long getSize() { + public Long getSize() { return size; } diff --git a/api/src/com/cloud/dc/DedicatedResources.java b/api/src/com/cloud/dc/DedicatedResources.java index 63188ca0b0e9..f549277551dc 100644 --- a/api/src/com/cloud/dc/DedicatedResources.java +++ b/api/src/com/cloud/dc/DedicatedResources.java @@ -22,7 +22,7 @@ public interface DedicatedResources extends InfrastructureEntity, InternalIdentity, Identity { @Override - long getId(); + Long getId(); Long getDataCenterId(); diff --git a/api/src/com/cloud/host/Host.java b/api/src/com/cloud/host/Host.java index 689ed12b64e3..fe93f1139538 100644 --- a/api/src/com/cloud/host/Host.java +++ b/api/src/com/cloud/host/Host.java @@ -34,13 +34,13 @@ public enum Type { false), ExternalVirtualSwitchSupervisor(false), PxeServer(false), BaremetalPxe(false), BaremetalDhcp(false), TrafficMonitor(false), ExternalDhcp(false), SecondaryStorageVM(true), LocalSecondaryStorage(false), L2Networking(false); - boolean _virtual; + Boolean _virtual; - private Type(boolean virtual) { + private Type(Boolean virtual) { _virtual = virtual; } - public boolean isVirtual() { + public Boolean isVirtual() { return _virtual; } @@ -126,7 +126,7 @@ public static String[] toStrings(Host.Type... types) { /** * @return availability zone. */ - long getDataCenterId(); + Long getDataCenterId(); /** * @return parent path. only used for storage server. @@ -156,7 +156,7 @@ public static String[] toStrings(Host.Type... types) { /* * @return total size */ - long getTotalSize(); + Long getTotalSize(); /* * @return capabilities @@ -166,7 +166,7 @@ public static String[] toStrings(Host.Type... types) { /* * @return last pinged time */ - long getLastPinged(); + Long getLastPinged(); /* * @return management server id @@ -200,7 +200,7 @@ public static String[] toStrings(Host.Type... types) { String getHypervisorVersion(); - boolean isInMaintenanceStates(); + Boolean isInMaintenanceStates(); ResourceState getResourceState(); } diff --git a/api/src/com/cloud/host/HostStats.java b/api/src/com/cloud/host/HostStats.java index 4eb7b1a6de14..c105a58ed6e6 100644 --- a/api/src/com/cloud/host/HostStats.java +++ b/api/src/com/cloud/host/HostStats.java @@ -19,22 +19,19 @@ public interface HostStats { // host related stats - public double getCpuUtilization(); + public Double getCpuUtilization(); - public double getNetworkWriteKBs(); + public Double getNetworkWriteKBs(); - public double getTotalMemoryKBs(); + public Double getTotalMemoryKBs(); - public double getFreeMemoryKBs(); + public Double getFreeMemoryKBs(); - public double getNetworkReadKBs(); + public Double getNetworkReadKBs(); public String getEntityType(); - public double getUsedMemory(); + public Double getUsedMemory(); public HostStats getHostStats(); - - // public double getAverageLoad(); - // public double getXapiMemoryUsageKBs(); } diff --git a/api/src/com/cloud/network/GuestVlan.java b/api/src/com/cloud/network/GuestVlan.java index 4597192ef606..9f0a584f6af8 100644 --- a/api/src/com/cloud/network/GuestVlan.java +++ b/api/src/com/cloud/network/GuestVlan.java @@ -22,7 +22,7 @@ public interface GuestVlan extends InternalIdentity, Identity { @Override - public long getId(); + public Long getId(); public long getAccountId(); diff --git a/api/src/com/cloud/network/MonitoringService.java b/api/src/com/cloud/network/MonitoringService.java index b33e8ffe1390..6eb2fe2dd028 100644 --- a/api/src/com/cloud/network/MonitoringService.java +++ b/api/src/com/cloud/network/MonitoringService.java @@ -33,7 +33,7 @@ enum Service { } @Override - long getId(); + Long getId(); String getService(); diff --git a/api/src/com/cloud/network/NetworkProfile.java b/api/src/com/cloud/network/NetworkProfile.java index ab033edaa534..88fe1aa6eec8 100644 --- a/api/src/com/cloud/network/NetworkProfile.java +++ b/api/src/com/cloud/network/NetworkProfile.java @@ -124,7 +124,7 @@ public URI getBroadcastUri() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java index d3c8193242e8..2360cb41b587 100644 --- a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java +++ b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java @@ -32,7 +32,7 @@ public enum State { } @Override - long getId(); + Long getId(); State getState(); diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java index cfc439abcd8f..e04c4de4c1c7 100644 --- a/api/src/com/cloud/network/Site2SiteVpnConnection.java +++ b/api/src/com/cloud/network/Site2SiteVpnConnection.java @@ -28,7 +28,7 @@ enum State { } @Override - public long getId(); + public Long getId(); public String getUuid(); diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/com/cloud/network/as/AutoScalePolicy.java index 56ea3f5f7f72..f2e894fe1034 100644 --- a/api/src/com/cloud/network/as/AutoScalePolicy.java +++ b/api/src/com/cloud/network/as/AutoScalePolicy.java @@ -25,7 +25,7 @@ public interface AutoScalePolicy extends ControlledEntity, InternalIdentity { @Override - long getId(); + Long getId(); String getUuid(); diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java index cf2c15c42166..fdf68c782db2 100644 --- a/api/src/com/cloud/network/as/AutoScaleVmGroup.java +++ b/api/src/com/cloud/network/as/AutoScaleVmGroup.java @@ -31,7 +31,7 @@ public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity, Di String State_Disabled = "disabled"; @Override - long getId(); + Long getId(); @Override long getAccountId(); diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java index 495446a6e837..30347ec68627 100644 --- a/api/src/com/cloud/network/as/AutoScaleVmProfile.java +++ b/api/src/com/cloud/network/as/AutoScaleVmProfile.java @@ -31,7 +31,7 @@ public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity, Displayable { @Override - public long getId(); + public Long getId(); public String getUuid(); diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java index b0c87cc112f3..1dd477c9bd6c 100644 --- a/api/src/com/cloud/network/vpc/NetworkACL.java +++ b/api/src/com/cloud/network/vpc/NetworkACL.java @@ -32,7 +32,7 @@ public interface NetworkACL extends InternalIdentity, Identity, Displayable { Long getVpcId(); @Override - long getId(); + Long getId(); String getName(); diff --git a/api/src/com/cloud/network/vpc/StaticRouteProfile.java b/api/src/com/cloud/network/vpc/StaticRouteProfile.java index 737541f0a406..61215ae1e470 100644 --- a/api/src/com/cloud/network/vpc/StaticRouteProfile.java +++ b/api/src/com/cloud/network/vpc/StaticRouteProfile.java @@ -77,7 +77,7 @@ public Long getVpcId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/api/src/com/cloud/projects/Project.java b/api/src/com/cloud/projects/Project.java index 5fff3082c367..4b4df08e6a4f 100644 --- a/api/src/com/cloud/projects/Project.java +++ b/api/src/com/cloud/projects/Project.java @@ -38,7 +38,7 @@ public enum ListProjectResourcesCriteria { long getDomainId(); @Override - long getId(); + Long getId(); Date getCreated(); diff --git a/api/src/com/cloud/storage/StorageStats.java b/api/src/com/cloud/storage/StorageStats.java index a474b23489cd..b3d365472d5b 100644 --- a/api/src/com/cloud/storage/StorageStats.java +++ b/api/src/com/cloud/storage/StorageStats.java @@ -20,10 +20,10 @@ public interface StorageStats { /** * @return bytes used by the storage server already. */ - public long getByteUsed(); + public Long getByteUsed(); /** * @return bytes capacity of the storage server */ - public long getCapacityBytes(); + public Long getCapacityBytes(); } diff --git a/api/src/com/cloud/storage/VolumeStats.java b/api/src/com/cloud/storage/VolumeStats.java index 70c0b17f84ab..6a8514f44505 100644 --- a/api/src/com/cloud/storage/VolumeStats.java +++ b/api/src/com/cloud/storage/VolumeStats.java @@ -20,5 +20,5 @@ public interface VolumeStats { /** * @return bytes used by the volume */ - public long getBytesUsed(); + public Long getBytesUsed(); } diff --git a/api/src/com/cloud/user/User.java b/api/src/com/cloud/user/User.java index 0ecdcfa58d4e..86e675279f3a 100644 --- a/api/src/com/cloud/user/User.java +++ b/api/src/com/cloud/user/User.java @@ -30,7 +30,7 @@ public enum Source { public static final long UID_ADMIN = 2; @Override - public long getId(); + public Long getId(); public String getUuid(); diff --git a/api/src/com/cloud/user/UserAccount.java b/api/src/com/cloud/user/UserAccount.java index 0449514cc197..73280da71c6a 100644 --- a/api/src/com/cloud/user/UserAccount.java +++ b/api/src/com/cloud/user/UserAccount.java @@ -22,7 +22,7 @@ public interface UserAccount extends InternalIdentity { @Override - long getId(); + Long getId(); String getUsername(); diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/com/cloud/vm/NicIpAlias.java index d7431ba31e0b..dc7eeab316e7 100644 --- a/api/src/com/cloud/vm/NicIpAlias.java +++ b/api/src/com/cloud/vm/NicIpAlias.java @@ -32,7 +32,7 @@ enum state { } @Override - long getId(); + Long getId(); long getNicId(); diff --git a/api/src/com/cloud/vm/NicProfile.java b/api/src/com/cloud/vm/NicProfile.java index 58e05124c89f..6229e7305442 100644 --- a/api/src/com/cloud/vm/NicProfile.java +++ b/api/src/com/cloud/vm/NicProfile.java @@ -31,9 +31,9 @@ public class NicProfile implements InternalIdentity, Serializable { private static final long serialVersionUID = 4997005771736090304L; - long id; - long networkId; - long vmId; + Long id; + Long networkId; + Long vmId; String reservationId; Integer deviceId; @@ -48,9 +48,9 @@ public class NicProfile implements InternalIdentity, Serializable { URI isolationUri; URI broadcastUri; ReservationStrategy strategy; - boolean defaultNic; + Boolean defaultNic; Integer networkRate; - boolean isSecurityGroupEnabled; + Boolean isSecurityGroupEnabled; // IPv4 String iPv4Address; @@ -73,9 +73,10 @@ public class NicProfile implements InternalIdentity, Serializable { // public NicProfile() { + } - public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri, Integer networkRate, boolean isSecurityGroupEnabled, String name) { + public NicProfile(Nic nic, Network network, URI broadcastUri, URI isolationUri, Integer networkRate, Boolean isSecurityGroupEnabled, String name) { id = nic.getId(); networkId = network.getId(); mode = network.getMode(); @@ -128,27 +129,27 @@ public NicProfile(ReservationStrategy strategy, String iPv4Address, String macAd // @Override - public long getId() { + public Long getId() { return id; } - public void setId(long id) { + public void setId(Long id) { this.id = id; } - public long getNetworkId() { + public Long getNetworkId() { return networkId; } - public void setNetworId(long networkId){ + public void setNetworId(Long networkId){ this.networkId = networkId; } - public long getVirtualMachineId() { + public Long getVirtualMachineId() { return vmId; } - public void setVirtualMachineId(long virtualMachineId) { + public void setVirtualMachineId(Long virtualMachineId) { this.vmId = virtualMachineId; } @@ -164,7 +165,7 @@ public Integer getDeviceId() { return deviceId; } - public void setDeviceId(int deviceId) { + public void setDeviceId(Integer deviceId) { this.deviceId = deviceId; } @@ -248,11 +249,11 @@ public void setReservationStrategy(ReservationStrategy strategy) { this.strategy = strategy; } - public boolean isDefaultNic() { + public Boolean isDefaultNic() { return defaultNic; } - public void setDefaultNic(boolean defaultNic) { + public void setDefaultNic(Boolean defaultNic) { this.defaultNic = defaultNic; } @@ -264,11 +265,11 @@ public void setNetworkRate(Integer networkRate) { this.networkRate = networkRate; } - public boolean isSecurityGroupEnabled() { + public Boolean isSecurityGroupEnabled() { return isSecurityGroupEnabled; } - public void setSecurityGroupEnabled(boolean enabled) { + public void setSecurityGroupEnabled(Boolean enabled) { isSecurityGroupEnabled = enabled; } diff --git a/api/src/com/cloud/vm/NicSecondaryIp.java b/api/src/com/cloud/vm/NicSecondaryIp.java index fb90dd351f68..bc6911f8d7e9 100644 --- a/api/src/com/cloud/vm/NicSecondaryIp.java +++ b/api/src/com/cloud/vm/NicSecondaryIp.java @@ -28,7 +28,7 @@ public interface NicSecondaryIp extends ControlledEntity, Identity, InternalIden * @return id in the CloudStack database */ @Override - long getId(); + Long getId(); long getNicId(); diff --git a/api/src/com/cloud/vm/VmDiskStats.java b/api/src/com/cloud/vm/VmDiskStats.java index 2323f0f64df6..f217632f810f 100644 --- a/api/src/com/cloud/vm/VmDiskStats.java +++ b/api/src/com/cloud/vm/VmDiskStats.java @@ -19,12 +19,12 @@ public interface VmDiskStats { // vm related disk stats - public long getIORead(); + public Long getIORead(); - public long getIOWrite(); + public Long getIOWrite(); - public long getBytesRead(); + public Long getBytesRead(); - public long getBytesWrite(); + public Long getBytesWrite(); } diff --git a/api/src/com/cloud/vm/VmStats.java b/api/src/com/cloud/vm/VmStats.java index 2b7943883e19..3401051ead25 100644 --- a/api/src/com/cloud/vm/VmStats.java +++ b/api/src/com/cloud/vm/VmStats.java @@ -18,18 +18,18 @@ public interface VmStats { // vm related stats - public double getCPUUtilization(); + public Double getCPUUtilization(); - public double getNetworkReadKBs(); + public Double getNetworkReadKBs(); - public double getNetworkWriteKBs(); + public Double getNetworkWriteKBs(); - public double getDiskReadIOs(); + public Double getDiskReadIOs(); - public double getDiskWriteIOs(); + public Double getDiskWriteIOs(); - public double getDiskReadKBs(); + public Double getDiskReadKBs(); - public double getDiskWriteKBs(); + public Double getDiskWriteKBs(); } diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshot.java b/api/src/com/cloud/vm/snapshot/VMSnapshot.java index 7713b2052ace..59cf42b6dea6 100644 --- a/api/src/com/cloud/vm/snapshot/VMSnapshot.java +++ b/api/src/com/cloud/vm/snapshot/VMSnapshot.java @@ -71,7 +71,7 @@ enum Event { } @Override - long getId(); + Long getId(); public String getName(); diff --git a/api/src/org/apache/cloudstack/api/InternalIdentity.java b/api/src/org/apache/cloudstack/api/InternalIdentity.java index 4149dd1c8465..4c99f01aa135 100644 --- a/api/src/org/apache/cloudstack/api/InternalIdentity.java +++ b/api/src/org/apache/cloudstack/api/InternalIdentity.java @@ -24,5 +24,5 @@ // For example, all ControlledEntity, OwnedBy would have an internal ID public interface InternalIdentity extends Serializable { - long getId(); + Long getId(); } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java index 0303445af77d..c68166ca6936 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java @@ -161,7 +161,7 @@ public void execute() throws ResourceUnavailableException { } @Override - public long getId() { + public Long getId() { throw new UnsupportedOperationException("database id can only provided by VO objects"); } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index ee62aa5ad4ad..edcda1205273 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -153,7 +153,7 @@ public void execute() throws ResourceUnavailableException { } @Override - public long getId() { + public Long getId() { throw new UnsupportedOperationException("database ID can only provided by VO objects"); } diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index 9a0dffe1fdc5..26d54442fb3d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java @@ -242,7 +242,7 @@ public void execute() throws ResourceUnavailableException { } @Override - public long getId() { + public Long getId() { throw new UnsupportedOperationException("database id can only provided by VO objects"); } diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java index 94db9156fd55..32b956174165 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java @@ -198,7 +198,7 @@ public String getDestIpAddress() { } @Override - public long getId() { + public Long getId() { throw new UnsupportedOperationException("Don't call me"); } diff --git a/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java b/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java index 70bbeee30c3f..e9ca48177286 100644 --- a/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java @@ -43,10 +43,6 @@ public class AsyncJobResponse extends BaseResponse { @Param(description = "the async command executed") private String cmd; - @SerializedName("jobstatus") - @Param(description = "the current job status-should be 0 for PENDING") - private Integer jobStatus; - @SerializedName("jobprocstatus") @Param(description = "the progress information of the PENDING job") private Integer jobProcStatus; @@ -89,7 +85,7 @@ public void setCmd(String cmd) { @Override public void setJobStatus(Integer jobStatus) { - this.jobStatus = jobStatus; + super.setJobStatus(jobStatus); } public void setJobProcStatus(Integer jobProcStatus) { diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java index 9e20b49dfdeb..826d95ddb4b0 100644 --- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java @@ -37,14 +37,6 @@ public class SystemVmResponse extends BaseResponse { @Param(description = "the system VM type") private String systemVmType; - @SerializedName("jobid") - @Param(description = "the job ID associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job.") - private String jobId; - - @SerializedName("jobstatus") - @Param(description = "the job status associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job.") - private Integer jobStatus; - @SerializedName("zoneid") @Param(description = "the Zone ID for the system VM") private String zoneId; diff --git a/api/src/org/apache/cloudstack/usage/Usage.java b/api/src/org/apache/cloudstack/usage/Usage.java index fe35390dd4a1..ee666116f66b 100644 --- a/api/src/org/apache/cloudstack/usage/Usage.java +++ b/api/src/org/apache/cloudstack/usage/Usage.java @@ -20,7 +20,7 @@ public interface Usage { - public long getId(); + public Long getId(); public Long getZoneId(); diff --git a/core/src/com/cloud/agent/api/AgentControlAnswer.java b/core/src/com/cloud/agent/api/AgentControlAnswer.java index 119623d04d91..225d9d1a60a7 100644 --- a/core/src/com/cloud/agent/api/AgentControlAnswer.java +++ b/core/src/com/cloud/agent/api/AgentControlAnswer.java @@ -27,7 +27,7 @@ public AgentControlAnswer(Command command) { super(command); } - public AgentControlAnswer(Command command, boolean success, String details) { + public AgentControlAnswer(Command command, Boolean success, String details) { super(command, success, details); } } diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/com/cloud/agent/api/AgentControlCommand.java index 8baf2f9bf09d..0865e9cd0438 100644 --- a/core/src/com/cloud/agent/api/AgentControlCommand.java +++ b/core/src/com/cloud/agent/api/AgentControlCommand.java @@ -25,7 +25,7 @@ public AgentControlCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/AttachIsoCommand.java b/core/src/com/cloud/agent/api/AttachIsoCommand.java index 07676878b6bb..a7a175d56d4e 100644 --- a/core/src/com/cloud/agent/api/AttachIsoCommand.java +++ b/core/src/com/cloud/agent/api/AttachIsoCommand.java @@ -24,19 +24,19 @@ public class AttachIsoCommand extends Command { private String vmName; private String storeUrl; private String isoPath; - private boolean attach; + private Boolean attach; protected AttachIsoCommand() { } - public AttachIsoCommand(String vmName, String isoPath, boolean attach) { + public AttachIsoCommand(String vmName, String isoPath, Boolean attach) { this.vmName = vmName; this.isoPath = isoPath; this.attach = attach; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } @@ -48,7 +48,7 @@ public String getIsoPath() { return isoPath; } - public boolean isAttach() { + public Boolean isAttach() { return attach; } diff --git a/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java b/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java index ebf5d0b746ff..086413d9aac2 100644 --- a/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java +++ b/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java @@ -26,9 +26,9 @@ public class AttachOrDettachConfigDriveCommand extends Command { String vmName; List vmData; String configDriveLabel; - boolean isAttach = false; + Boolean isAttach = false; - public AttachOrDettachConfigDriveCommand(String vmName, List vmData, String label, boolean attach) { + public AttachOrDettachConfigDriveCommand(String vmName, List vmData, String label, Boolean attach) { this.vmName = vmName; this.vmData = vmData; this.configDriveLabel = label; @@ -36,7 +36,7 @@ public AttachOrDettachConfigDriveCommand(String vmName, List vmData, S } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -48,7 +48,7 @@ public List getVmData() { return vmData; } - public boolean isAttach() { + public Boolean isAttach() { return isAttach; } diff --git a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java index 59a2ed3723ea..ad51deb48adf 100644 --- a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java @@ -21,13 +21,13 @@ public class BackupSnapshotAnswer extends Answer { private String backupSnapshotName; - private boolean full; + private Boolean full; protected BackupSnapshotAnswer() { } - public BackupSnapshotAnswer(BackupSnapshotCommand cmd, boolean success, String result, String backupSnapshotName, boolean full) { + public BackupSnapshotAnswer(BackupSnapshotCommand cmd, Boolean success, String result, String backupSnapshotName, Boolean full) { super(cmd, success, result); this.backupSnapshotName = backupSnapshotName; this.full = full; @@ -40,7 +40,7 @@ public String getBackupSnapshotName() { return backupSnapshotName; } - public boolean isFull() { + public Boolean isFull() { return full; } } diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java index 2a46610117f8..e72f4ae4b358 100644 --- a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java @@ -31,7 +31,7 @@ public class BackupSnapshotCommand extends SnapshotCommand { private String prevSnapshotUuid; private String prevBackupUuid; - private boolean isVolumeInactive; + private Boolean isVolumeInactive; private String vmName; private Long snapshotId; @LogLevel(Log4jLevel.Off) @@ -55,8 +55,9 @@ protected BackupSnapshotCommand() { * @param isVolumeInactive True if the volume belongs to a VM that is not running or is detached. * @param secHostId This is the Id of the secondary storage. */ - public BackupSnapshotCommand(String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, Long snapshotId, Long secHostId, String volumePath, - StoragePool pool, String snapshotUuid, String snapshotName, String prevSnapshotUuid, String prevBackupUuid, boolean isVolumeInactive, String vmName, int wait) { + public BackupSnapshotCommand(String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, Long snapshotId, + Long secHostId, String volumePath, StoragePool pool, String snapshotUuid, String snapshotName, String prevSnapshotUuid, + String prevBackupUuid, Boolean isVolumeInactive, String vmName, Integer wait) { super(pool, secondaryStoragePoolURL, snapshotUuid, snapshotName, dcId, accountId, volumeId); this.snapshotId = snapshotId; this.prevSnapshotUuid = prevSnapshotUuid; @@ -76,7 +77,7 @@ public String getPrevBackupUuid() { return prevBackupUuid; } - public boolean isVolumeInactive() { + public Boolean isVolumeInactive() { return isVolumeInactive; } diff --git a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java b/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java index dfde6e10f81e..a8df76552ba1 100644 --- a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java +++ b/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java @@ -23,7 +23,7 @@ public class BumpUpPriorityCommand extends NetworkElementCommand { @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/CancelCommand.java b/core/src/com/cloud/agent/api/CancelCommand.java index 5adace2d334e..7980f50f9eaf 100644 --- a/core/src/com/cloud/agent/api/CancelCommand.java +++ b/core/src/com/cloud/agent/api/CancelCommand.java @@ -20,18 +20,18 @@ package com.cloud.agent.api; public class CancelCommand extends Command { - protected long sequence; + protected Long sequence; protected String reason; protected CancelCommand() { } - public CancelCommand(long sequence, String reason) { + public CancelCommand(Long sequence, String reason) { this.sequence = sequence; this.reason = reason; } - public long getSequence() { + public Long getSequence() { return sequence; } @@ -40,7 +40,7 @@ public String getReason() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java b/core/src/com/cloud/agent/api/ChangeAgentAnswer.java index 1d4332511163..845e3510a6c6 100644 --- a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java +++ b/core/src/com/cloud/agent/api/ChangeAgentAnswer.java @@ -23,7 +23,7 @@ public class ChangeAgentAnswer extends Answer { protected ChangeAgentAnswer() { } - public ChangeAgentAnswer(ChangeAgentCommand cmd, boolean result) { + public ChangeAgentAnswer(ChangeAgentCommand cmd, Boolean result) { super(cmd, result, null); } } diff --git a/core/src/com/cloud/agent/api/ChangeAgentCommand.java b/core/src/com/cloud/agent/api/ChangeAgentCommand.java index 61cc9433eeea..275fdb202fbc 100644 --- a/core/src/com/cloud/agent/api/ChangeAgentCommand.java +++ b/core/src/com/cloud/agent/api/ChangeAgentCommand.java @@ -22,18 +22,18 @@ import com.cloud.host.Status.Event; public class ChangeAgentCommand extends Command { - long agentId; + Long agentId; Event event; protected ChangeAgentCommand() { } - public ChangeAgentCommand(long agentId, Event event) { + public ChangeAgentCommand(Long agentId, Event event) { this.agentId = agentId; this.event = event; } - public long getAgentId() { + public Long getAgentId() { return agentId; } @@ -42,7 +42,7 @@ public Event getEvent() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/CheckHealthAnswer.java b/core/src/com/cloud/agent/api/CheckHealthAnswer.java index 80414d2ec676..e731ed88b087 100644 --- a/core/src/com/cloud/agent/api/CheckHealthAnswer.java +++ b/core/src/com/cloud/agent/api/CheckHealthAnswer.java @@ -24,7 +24,7 @@ public class CheckHealthAnswer extends Answer { public CheckHealthAnswer() { } - public CheckHealthAnswer(CheckHealthCommand cmd, boolean alive) { + public CheckHealthAnswer(CheckHealthCommand cmd, Boolean alive) { super(cmd, alive, "resource is " + (alive ? "alive" : "not alive")); } } diff --git a/core/src/com/cloud/agent/api/CheckHealthCommand.java b/core/src/com/cloud/agent/api/CheckHealthCommand.java index 129281183111..b72d7cb2932b 100644 --- a/core/src/com/cloud/agent/api/CheckHealthCommand.java +++ b/core/src/com/cloud/agent/api/CheckHealthCommand.java @@ -26,7 +26,7 @@ public CheckHealthCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java b/core/src/com/cloud/agent/api/CheckNetworkAnswer.java index 392ad35e7cb6..8c070f3bd569 100644 --- a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java +++ b/core/src/com/cloud/agent/api/CheckNetworkAnswer.java @@ -21,21 +21,21 @@ public class CheckNetworkAnswer extends Answer { // indicate if agent reconnect is needed after setupNetworkNames command - private boolean _reconnect; + private Boolean _reconnect; public CheckNetworkAnswer() { } - public CheckNetworkAnswer(CheckNetworkCommand cmd, boolean result, String details, boolean reconnect) { + public CheckNetworkAnswer(CheckNetworkCommand cmd, Boolean result, String details, Boolean reconnect) { super(cmd, result, details); _reconnect = reconnect; } - public CheckNetworkAnswer(CheckNetworkCommand cmd, boolean result, String details) { + public CheckNetworkAnswer(CheckNetworkCommand cmd, Boolean result, String details) { this(cmd, result, details, false); } - public boolean needReconnect() { + public Boolean needReconnect() { return _reconnect; } diff --git a/core/src/com/cloud/agent/api/CheckNetworkCommand.java b/core/src/com/cloud/agent/api/CheckNetworkCommand.java index 717af2afa06c..e2a0ce0d57ca 100644 --- a/core/src/com/cloud/agent/api/CheckNetworkCommand.java +++ b/core/src/com/cloud/agent/api/CheckNetworkCommand.java @@ -39,7 +39,7 @@ protected CheckNetworkCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java b/core/src/com/cloud/agent/api/CheckOnHostAnswer.java index 5a26b22ec6a5..bab56ed2cf77 100644 --- a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java +++ b/core/src/com/cloud/agent/api/CheckOnHostAnswer.java @@ -20,8 +20,8 @@ package com.cloud.agent.api; public class CheckOnHostAnswer extends Answer { - boolean determined; - boolean alive; + Boolean determined; + Boolean alive; protected CheckOnHostAnswer() { } @@ -40,11 +40,11 @@ public CheckOnHostAnswer(CheckOnHostCommand cmd, String details) { super(cmd, false, details); } - public boolean isDetermined() { + public Boolean isDetermined() { return determined; } - public boolean isAlive() { + public Boolean isAlive() { return alive; } diff --git a/core/src/com/cloud/agent/api/CheckOnHostCommand.java b/core/src/com/cloud/agent/api/CheckOnHostCommand.java index b4055179e4dc..c34d0fe247d2 100644 --- a/core/src/com/cloud/agent/api/CheckOnHostCommand.java +++ b/core/src/com/cloud/agent/api/CheckOnHostCommand.java @@ -38,7 +38,7 @@ public HostTO getHost() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/CheckRouterAnswer.java b/core/src/com/cloud/agent/api/CheckRouterAnswer.java index 6a95ab11bc8e..dfedf1126390 100644 --- a/core/src/com/cloud/agent/api/CheckRouterAnswer.java +++ b/core/src/com/cloud/agent/api/CheckRouterAnswer.java @@ -30,7 +30,7 @@ public class CheckRouterAnswer extends Answer { protected CheckRouterAnswer() { } - public CheckRouterAnswer(final CheckRouterCommand cmd, final String details, final boolean parse) { + public CheckRouterAnswer(final CheckRouterCommand cmd, final String details, final Boolean parse) { super(cmd, true, details); if (parse) { if (!parseDetails(details)) { diff --git a/core/src/com/cloud/agent/api/CheckRouterCommand.java b/core/src/com/cloud/agent/api/CheckRouterCommand.java index 51a4493e0aa6..0f0f87c526d4 100644 --- a/core/src/com/cloud/agent/api/CheckRouterCommand.java +++ b/core/src/com/cloud/agent/api/CheckRouterCommand.java @@ -23,7 +23,7 @@ public class CheckRouterCommand extends NetworkElementCommand { @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -32,7 +32,7 @@ public CheckRouterCommand() { } @Override - public boolean isQuery() { + public Boolean isQuery() { return true; } } diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java index 50dfaf202f94..4674f418fe56 100644 --- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java +++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java @@ -32,7 +32,7 @@ protected CheckS2SVpnConnectionsAnswer() { ipToDetail = new HashMap(); } - public CheckS2SVpnConnectionsAnswer(CheckS2SVpnConnectionsCommand cmd, boolean result, String details) { + public CheckS2SVpnConnectionsAnswer(CheckS2SVpnConnectionsCommand cmd, Boolean result, String details) { super(cmd, result, details); ipToConnected = new HashMap(); ipToDetail = new HashMap(); @@ -58,7 +58,7 @@ protected void parseDetails(String details) { } } - public boolean isConnected(String ip) { + public Boolean isConnected(String ip) { if (this.getResult()) { Boolean status = ipToConnected.get(ip); diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java index e7eea542c2c0..3db90e731e43 100644 --- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java +++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java @@ -27,7 +27,7 @@ public class CheckS2SVpnConnectionsCommand extends NetworkElementCommand { List vpnIps; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } @@ -41,7 +41,7 @@ public List getVpnIps() { } @Override - public boolean isQuery() { + public Boolean isQuery() { return true; } } diff --git a/core/src/com/cloud/agent/api/CheckStateCommand.java b/core/src/com/cloud/agent/api/CheckStateCommand.java index bf55a5d1bef4..c8bd7f6465ab 100644 --- a/core/src/com/cloud/agent/api/CheckStateCommand.java +++ b/core/src/com/cloud/agent/api/CheckStateCommand.java @@ -34,7 +34,7 @@ public CheckStateCommand(String vmName) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java b/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java index 17549503b83e..6d5bd299f9d9 100644 --- a/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java +++ b/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java @@ -37,7 +37,7 @@ public String getVmName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java b/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java index 0323f759bf5c..54bf4ea84142 100644 --- a/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java +++ b/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java @@ -21,14 +21,14 @@ public class CleanupNetworkRulesCmd extends Command implements CronCommand { - private int interval = 10 * 60; + private Integer interval = 10 * 60; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } - public CleanupNetworkRulesCmd(int intervalSecs) { + public CleanupNetworkRulesCmd(Integer intervalSecs) { super(); interval = intervalSecs; } @@ -38,7 +38,7 @@ public CleanupNetworkRulesCmd() { } @Override - public int getInterval() { + public Integer getInterval() { return interval; } diff --git a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java index b0dc44cc7fd2..7db9555884e3 100644 --- a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java +++ b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncAnswer.java @@ -22,14 +22,14 @@ import java.util.HashMap; public class ClusterVMMetaDataSyncAnswer extends Answer { - private long _clusterId; + private Long _clusterId; private HashMap _vmMetaDatum; - private boolean _isExecuted=false; + private Boolean _isExecuted=false; // this is here because a cron command answer is being sent twice // AgentAttache.processAnswers // AgentManagerImpl.notifyAnswersToMonitors - public boolean isExecuted(){ + public Boolean isExecuted(){ return _isExecuted; } @@ -38,13 +38,13 @@ public void setExecuted(){ } - public ClusterVMMetaDataSyncAnswer(long clusterId, HashMap vmMetaDatum){ + public ClusterVMMetaDataSyncAnswer(Long clusterId, HashMap vmMetaDatum){ _clusterId = clusterId; _vmMetaDatum = vmMetaDatum; result = true; } - public long getClusterId() { + public Long getClusterId() { return _clusterId; } diff --git a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java index 971493c5e9d5..b595571533f6 100644 --- a/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java +++ b/core/src/com/cloud/agent/api/ClusterVMMetaDataSyncCommand.java @@ -21,29 +21,29 @@ public class ClusterVMMetaDataSyncCommand extends Command implements CronCommand { - int _interval; + Integer _interval; - long _clusterId; + Long _clusterId; public ClusterVMMetaDataSyncCommand() { } - public ClusterVMMetaDataSyncCommand(int interval, long clusterId){ + public ClusterVMMetaDataSyncCommand(Integer interval, Long clusterId){ _interval = interval; _clusterId = clusterId; } @Override - public int getInterval() { + public Integer getInterval() { return _interval; } - public long getClusterId() { + public Long getClusterId() { return _clusterId; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java index 78ef3360d0ad..386d6c473f0b 100644 --- a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java +++ b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java @@ -21,11 +21,11 @@ public class ConsoleAccessAuthenticationAnswer extends AgentControlAnswer { - private boolean _success; + private Boolean _success; - private boolean _isReauthenticating; + private Boolean _isReauthenticating; private String _host; - private int _port; + private Integer _port; private String _tunnelUrl; private String _tunnelSession; @@ -36,24 +36,24 @@ public ConsoleAccessAuthenticationAnswer() { _port = 0; } - public ConsoleAccessAuthenticationAnswer(Command cmd, boolean success) { + public ConsoleAccessAuthenticationAnswer(Command cmd, Boolean success) { super(cmd); _success = success; } - public boolean succeeded() { + public Boolean succeeded() { return _success; } - public void setSuccess(boolean value) { + public void setSuccess(Boolean value) { _success = value; } - public boolean isReauthenticating() { + public Boolean isReauthenticating() { return _isReauthenticating; } - public void setReauthenticating(boolean value) { + public void setReauthenticating(Boolean value) { _isReauthenticating = value; } @@ -65,11 +65,11 @@ public void setHost(String host) { _host = host; } - public int getPort() { + public Integer getPort() { return _port; } - public void setPort(int port) { + public void setPort(Integer port) { _port = port; } diff --git a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java index dd533d8774da..d64d9864177d 100644 --- a/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java +++ b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java @@ -27,7 +27,7 @@ public class ConsoleAccessAuthenticationCommand extends AgentControlCommand { private String _sid; private String _ticket; - private boolean _isReauthenticating; + private Boolean _isReauthenticating; public ConsoleAccessAuthenticationCommand() { _isReauthenticating = false; @@ -61,11 +61,11 @@ public String getTicket() { return _ticket; } - public boolean isReauthenticating() { + public Boolean isReauthenticating() { return _isReauthenticating; } - public void setReauthenticating(boolean value) { + public void setReauthenticating(Boolean value) { _isReauthenticating = value; } } diff --git a/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java b/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java index c53f741cf7f4..9aaf2f81a7e1 100644 --- a/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java +++ b/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java @@ -21,18 +21,18 @@ public class ConsoleProxyLoadReportCommand extends AgentControlCommand { - private long _proxyVmId; + private Long _proxyVmId; private String _loadInfo; public ConsoleProxyLoadReportCommand() { } - public ConsoleProxyLoadReportCommand(long proxyVmId, String loadInfo) { + public ConsoleProxyLoadReportCommand(Long proxyVmId, String loadInfo) { _proxyVmId = proxyVmId; _loadInfo = loadInfo; } - public long getProxyVmId() { + public Long getProxyVmId() { return _proxyVmId; } diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java index 7ac2ddedd2e3..7b4694aa0e0b 100644 --- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java @@ -47,7 +47,7 @@ protected CreatePrivateTemplateFromSnapshotCommand() { */ public CreatePrivateTemplateFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, - String backedUpSnapshotUuid, String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, int wait) { + String backedUpSnapshotUuid, String backedUpSnapshotName, String origTemplateInstallPath, Long newTemplateId, String templateName, Integer wait) { super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId); this.origTemplateInstallPath = origTemplateInstallPath; this.newTemplateId = newTemplateId; diff --git a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java index 3025147a3044..12863abb72ee 100644 --- a/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java +++ b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java @@ -27,8 +27,8 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand { private String _volumePath; private String _userSpecifiedName; private String _uniqueName; - private long _templateId; - private long _accountId; + private Long _templateId; + private Long _accountId; StorageFilerTO _primaryPool; // For XenServer private String _secondaryStorageUrl; @@ -36,8 +36,8 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand { public CreatePrivateTemplateFromVolumeCommand() { } - public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, long templateId, long accountId, String userSpecifiedName, - String uniqueName, String volumePath, String vmName, int wait) { + public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondaryStorageUrl, Long templateId, Long accountId, String userSpecifiedName, + String uniqueName, String volumePath, String vmName, Integer wait) { _secondaryStorageUrl = secondaryStorageUrl; _templateId = templateId; _accountId = accountId; @@ -51,7 +51,7 @@ public CreatePrivateTemplateFromVolumeCommand(StoragePool pool, String secondary } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -73,7 +73,7 @@ public String getUniqueName() { return _uniqueName; } - public long getTemplateId() { + public Long getTemplateId() { return _templateId; } @@ -96,7 +96,7 @@ public Long getAccountId() { return _accountId; } - public void setTemplateId(long templateId) { + public void setTemplateId(Long templateId) { _templateId = templateId; } } diff --git a/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java b/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java index 90a5e397144c..6c3e0330569d 100644 --- a/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java +++ b/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java @@ -29,21 +29,21 @@ public class CreateStoragePoolCommand extends ModifyStoragePoolCommand { public static final String STORAGE_HOST = "storageHost"; public static final String STORAGE_PORT = "storagePort"; - private boolean _createDatastore; + private Boolean _createDatastore; private Map _details; public CreateStoragePoolCommand() { } - public CreateStoragePoolCommand(boolean add, StoragePool pool) { + public CreateStoragePoolCommand(Boolean add, StoragePool pool) { super(add, pool); } - public void setCreateDatastore(boolean createDatastore) { + public void setCreateDatastore(Boolean createDatastore) { _createDatastore = createDatastore; } - public boolean getCreateDatastore() { + public Boolean getCreateDatastore() { return _createDatastore; } diff --git a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java index ad6765fb55d8..ff1b2ce3a3e8 100644 --- a/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java @@ -48,7 +48,7 @@ public CreateVMSnapshotAnswer() { } - public CreateVMSnapshotAnswer(CreateVMSnapshotCommand cmd, boolean success, String result) { + public CreateVMSnapshotAnswer(CreateVMSnapshotCommand cmd, Boolean success, String result) { super(cmd, success, result); } diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java index 4353944ee347..f19d8769b1f3 100644 --- a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java @@ -26,7 +26,7 @@ protected CreateVolumeFromSnapshotAnswer() { } - public CreateVolumeFromSnapshotAnswer(CreateVolumeFromSnapshotCommand cmd, boolean success, String result, String vdiUUID) { + public CreateVolumeFromSnapshotAnswer(CreateVolumeFromSnapshotCommand cmd, Boolean success, String result, String vdiUUID) { super(cmd, success, result); this.vdiUUID = vdiUUID; } diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java index fa9a4d584613..585b2cda522b 100644 --- a/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java @@ -46,7 +46,7 @@ protected CreateVolumeFromSnapshotCommand() { */ public CreateVolumeFromSnapshotCommand(StoragePool pool, String secondaryStoragePoolURL, Long dcId, Long accountId, Long volumeId, String backedUpSnapshotUuid, - String backedUpSnapshotName, int wait) { + String backedUpSnapshotName, Integer wait) { super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId); setWait(wait); } diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java index 92ea529c081e..cacec5917028 100644 --- a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java @@ -47,7 +47,7 @@ public CreateVolumeFromVMSnapshotAnswer(CreateVolumeFromVMSnapshotCommand cmd, S this.path = path; } - public CreateVolumeFromVMSnapshotAnswer(CreateVolumeFromVMSnapshotCommand cmd, boolean result, String string) { + public CreateVolumeFromVMSnapshotAnswer(CreateVolumeFromVMSnapshotCommand cmd, Boolean result, String string) { super(cmd, result, string); } } diff --git a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java index 69196afeafa3..02eeac08a92b 100644 --- a/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java @@ -67,7 +67,7 @@ public CreateVolumeFromVMSnapshotCommand(String path, String name, Boolean fullC } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/CronCommand.java b/core/src/com/cloud/agent/api/CronCommand.java index f179397c5ff4..467d0df258ae 100644 --- a/core/src/com/cloud/agent/api/CronCommand.java +++ b/core/src/com/cloud/agent/api/CronCommand.java @@ -23,5 +23,5 @@ public interface CronCommand { /** * @return interval at which to run the command in seconds. */ - public int getInterval(); + public Integer getInterval(); } diff --git a/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java b/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java index 351dc5d42fac..ecf2a10045da 100644 --- a/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java +++ b/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java @@ -39,7 +39,7 @@ public DeleteSnapshotsDirCommand(DataStoreTO store, String dir) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java index 969dd2eb801c..bfda5d4b6835 100644 --- a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java +++ b/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java @@ -36,7 +36,7 @@ public class DeleteStoragePoolCommand extends Command { private StorageFilerTO _pool; private String _localPath; - private boolean _removeDatastore; + private Boolean _removeDatastore; private Map _details; public DeleteStoragePoolCommand() { @@ -64,11 +64,11 @@ public String getLocalPath() { return _localPath; } - public void setRemoveDatastore(boolean removeDatastore) { + public void setRemoveDatastore(Boolean removeDatastore) { _removeDatastore = removeDatastore; } - public boolean getRemoveDatastore() { + public Boolean getRemoveDatastore() { return _removeDatastore; } @@ -81,7 +81,7 @@ public Map getDetails() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java index d5b8ab7f23e4..0569c4702153 100644 --- a/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java @@ -29,7 +29,7 @@ public class DeleteVMSnapshotAnswer extends Answer { public DeleteVMSnapshotAnswer() { } - public DeleteVMSnapshotAnswer(DeleteVMSnapshotCommand cmd, boolean result, String message) { + public DeleteVMSnapshotAnswer(DeleteVMSnapshotCommand cmd, Boolean result, String message) { super(cmd, result, message); } diff --git a/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java b/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java index 76ef420f73d6..5094e0593a12 100644 --- a/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java +++ b/core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java @@ -24,14 +24,14 @@ public class DirectNetworkUsageAnswer extends Answer { - Map ipBytesSentAndReceived; + Map ipBytesSentAndReceived; protected DirectNetworkUsageAnswer() { } public DirectNetworkUsageAnswer(Command command) { super(command); - this.ipBytesSentAndReceived = new HashMap(); + this.ipBytesSentAndReceived = new HashMap(); } public DirectNetworkUsageAnswer(Command command, Exception e) { @@ -39,21 +39,21 @@ public DirectNetworkUsageAnswer(Command command, Exception e) { this.ipBytesSentAndReceived = null; } - public void put(String ip, long[] bytesSentAndReceived) { + public void put(String ip, Long[] bytesSentAndReceived) { this.ipBytesSentAndReceived.put(ip, bytesSentAndReceived); } - public long[] get(String ip) { - long[] entry = ipBytesSentAndReceived.get(ip); + public Long[] get(String ip) { + Long[] entry = ipBytesSentAndReceived.get(ip); if (entry == null) { - ipBytesSentAndReceived.put(ip, new long[] {0, 0}); + ipBytesSentAndReceived.put(ip, new Long[] {0L, 0L}); return ipBytesSentAndReceived.get(ip); } else { return entry; } } - public Map getIpBytesSentAndReceived() { + public Map getIpBytesSentAndReceived() { return ipBytesSentAndReceived; } } diff --git a/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java b/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java index 79200a61069e..40746f7aa8bf 100644 --- a/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java +++ b/core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java @@ -39,7 +39,7 @@ public DirectNetworkUsageCommand(List publicIps, Date start, Date end, S } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java index 900aa994c60f..77093c6666df 100644 --- a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java +++ b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageAnswer.java @@ -23,16 +23,16 @@ import java.util.Map; public class ExternalNetworkResourceUsageAnswer extends Answer { - public Map ipBytes; - public Map guestVlanBytes; + public Map ipBytes; + public Map guestVlanBytes; protected ExternalNetworkResourceUsageAnswer() { } public ExternalNetworkResourceUsageAnswer(Command command) { super(command); - this.ipBytes = new HashMap(); - this.guestVlanBytes = new HashMap(); + this.ipBytes = new HashMap(); + this.guestVlanBytes = new HashMap(); } public ExternalNetworkResourceUsageAnswer(Command command, Exception e) { diff --git a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java index 09dc80b7bb0a..6cf089a66b84 100644 --- a/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java +++ b/core/src/com/cloud/agent/api/ExternalNetworkResourceUsageCommand.java @@ -25,7 +25,7 @@ public ExternalNetworkResourceUsageCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/FenceAnswer.java b/core/src/com/cloud/agent/api/FenceAnswer.java index fd1e4b5d2ca3..dd5f25c8bdf5 100644 --- a/core/src/com/cloud/agent/api/FenceAnswer.java +++ b/core/src/com/cloud/agent/api/FenceAnswer.java @@ -32,7 +32,7 @@ public FenceAnswer(FenceCommand cmd, String details) { super(cmd, true, details); } - public FenceAnswer(FenceCommand cmd, boolean result, String details) { + public FenceAnswer(FenceCommand cmd, Boolean result, String details) { super(cmd, result, details); } diff --git a/core/src/com/cloud/agent/api/FenceCommand.java b/core/src/com/cloud/agent/api/FenceCommand.java index 88e508ad1e26..7b0a191db8f3 100644 --- a/core/src/com/cloud/agent/api/FenceCommand.java +++ b/core/src/com/cloud/agent/api/FenceCommand.java @@ -31,7 +31,7 @@ public FenceCommand() { String vmName; String hostGuid; String hostIp; - boolean inSeq; + Boolean inSeq; public FenceCommand(VirtualMachine vm, Host host) { super(); @@ -41,7 +41,7 @@ public FenceCommand(VirtualMachine vm, Host host) { inSeq = false; } - public void setSeq(boolean inseq) { + public void setSeq(Boolean inseq) { inSeq = inseq; } @@ -58,7 +58,7 @@ public String getHostIp() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return inSeq; } } diff --git a/core/src/com/cloud/agent/api/GetDomRVersionCmd.java b/core/src/com/cloud/agent/api/GetDomRVersionCmd.java index ad1339bb9303..fd496a06d342 100644 --- a/core/src/com/cloud/agent/api/GetDomRVersionCmd.java +++ b/core/src/com/cloud/agent/api/GetDomRVersionCmd.java @@ -23,7 +23,7 @@ public class GetDomRVersionCmd extends NetworkElementCommand { @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -32,7 +32,7 @@ public GetDomRVersionCmd() { } @Override - public boolean isQuery() { + public Boolean isQuery() { return true; } } diff --git a/core/src/com/cloud/agent/api/GetFileStatsAnswer.java b/core/src/com/cloud/agent/api/GetFileStatsAnswer.java index 5c3f0065fb4a..5293f5800af9 100644 --- a/core/src/com/cloud/agent/api/GetFileStatsAnswer.java +++ b/core/src/com/cloud/agent/api/GetFileStatsAnswer.java @@ -24,18 +24,18 @@ @LogLevel(Log4jLevel.Trace) public class GetFileStatsAnswer extends Answer implements VolumeStats { - long size; + Long size; protected GetFileStatsAnswer() { } - public GetFileStatsAnswer(GetFileStatsCommand cmd, long value) { + public GetFileStatsAnswer(GetFileStatsCommand cmd, Long value) { super(cmd); size = value; } @Override - public long getBytesUsed() { + public Long getBytesUsed() { return size; } } diff --git a/core/src/com/cloud/agent/api/GetFileStatsCommand.java b/core/src/com/cloud/agent/api/GetFileStatsCommand.java index b2da1c316475..460dafc462a4 100644 --- a/core/src/com/cloud/agent/api/GetFileStatsCommand.java +++ b/core/src/com/cloud/agent/api/GetFileStatsCommand.java @@ -38,7 +38,7 @@ public String getPaths() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java b/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java index 38bb9301c78a..10330470ef88 100644 --- a/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java +++ b/core/src/com/cloud/agent/api/GetGPUStatsAnswer.java @@ -33,7 +33,7 @@ public GetGPUStatsAnswer(final GetGPUStatsCommand cmd, final HashMap getNics() { public class NicDetails { String macAddress; String vlanid; - boolean state; + Boolean state; public NicDetails() { } - public NicDetails(String macAddress, String vlanid, boolean state) { + public NicDetails(String macAddress, String vlanid, Boolean state) { this.macAddress = macAddress; this.vlanid = vlanid; this.state = state; @@ -64,13 +64,13 @@ public String getVlanid() { return vlanid; } - public boolean getState() { + public Boolean getState() { return state; } } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } \ No newline at end of file diff --git a/core/src/com/cloud/agent/api/GetVmConfigCommand.java b/core/src/com/cloud/agent/api/GetVmConfigCommand.java index 2a625c777328..757b2003df45 100644 --- a/core/src/com/cloud/agent/api/GetVmConfigCommand.java +++ b/core/src/com/cloud/agent/api/GetVmConfigCommand.java @@ -43,7 +43,7 @@ public void setNics(List nics){ } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java b/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java index 4b2b2e8e7bdf..690be51fec14 100644 --- a/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java +++ b/core/src/com/cloud/agent/api/GetVmDiskStatsCommand.java @@ -51,7 +51,7 @@ public String getHostName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/GetVmIpAddressCommand.java b/core/src/com/cloud/agent/api/GetVmIpAddressCommand.java index a9c7413b9f07..367e3565e32a 100644 --- a/core/src/com/cloud/agent/api/GetVmIpAddressCommand.java +++ b/core/src/com/cloud/agent/api/GetVmIpAddressCommand.java @@ -23,16 +23,16 @@ public class GetVmIpAddressCommand extends Command { String vmName; String vmNetworkCidr; - boolean windows = false; + Boolean windows = false; - public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, boolean windows) { + public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, Boolean windows) { this.vmName = vmName; this.windows = windows; this.vmNetworkCidr = vmNetworkCidr; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -40,7 +40,7 @@ public String getVmName(){ return vmName; } - public boolean isWindows(){ + public Boolean isWindows(){ return windows; } diff --git a/core/src/com/cloud/agent/api/GetVmStatsCommand.java b/core/src/com/cloud/agent/api/GetVmStatsCommand.java index 26d98d254543..1d471b071e4d 100644 --- a/core/src/com/cloud/agent/api/GetVmStatsCommand.java +++ b/core/src/com/cloud/agent/api/GetVmStatsCommand.java @@ -51,7 +51,7 @@ public String getHostName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/GetVncPortAnswer.java b/core/src/com/cloud/agent/api/GetVncPortAnswer.java index 7ebd61a862e0..cf69ad82dfa6 100644 --- a/core/src/com/cloud/agent/api/GetVncPortAnswer.java +++ b/core/src/com/cloud/agent/api/GetVncPortAnswer.java @@ -21,17 +21,17 @@ public class GetVncPortAnswer extends Answer { String address; - int port; + Integer port; protected GetVncPortAnswer() { } - public GetVncPortAnswer(GetVncPortCommand cmd, int port) { + public GetVncPortAnswer(GetVncPortCommand cmd, Integer port) { super(cmd, true, null); this.port = port; } - public GetVncPortAnswer(GetVncPortCommand cmd, String address, int port) { + public GetVncPortAnswer(GetVncPortCommand cmd, String address, Integer port) { super(cmd, true, null); this.address = address; this.port = port; @@ -45,7 +45,7 @@ public String getAddress() { return address; } - public int getPort() { + public Integer getPort() { return port; } } diff --git a/core/src/com/cloud/agent/api/GetVncPortCommand.java b/core/src/com/cloud/agent/api/GetVncPortCommand.java index f1d05d998a81..cab5a5ef3323 100644 --- a/core/src/com/cloud/agent/api/GetVncPortCommand.java +++ b/core/src/com/cloud/agent/api/GetVncPortCommand.java @@ -20,19 +20,19 @@ package com.cloud.agent.api; public class GetVncPortCommand extends Command { - long id; + Long id; String name; public GetVncPortCommand() { } - public GetVncPortCommand(long id, String name) { + public GetVncPortCommand(Long id, String name) { this.id = id; this.name = name; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -40,7 +40,7 @@ public String getName() { return name; } - public long getId() { + public Long getId() { return id; } } diff --git a/core/src/com/cloud/agent/api/HostStatsEntry.java b/core/src/com/cloud/agent/api/HostStatsEntry.java index 82041a604e8b..8f74cce1c6be 100644 --- a/core/src/com/cloud/agent/api/HostStatsEntry.java +++ b/core/src/com/cloud/agent/api/HostStatsEntry.java @@ -23,19 +23,19 @@ public class HostStatsEntry implements HostStats { - long hostId; + Long hostId; String entityType; - double cpuUtilization; - double networkReadKBs; - double networkWriteKBs; - double totalMemoryKBs; - double freeMemoryKBs; + Double cpuUtilization; + Double networkReadKBs; + 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) { + public HostStatsEntry(Long hostId, Double cpuUtilization, Double networkReadKBs, Double networkWriteKBs, String entityType, Double totalMemoryKBs, + Double freeMemoryKBs, Double xapiMemoryUsageKBs, Double averageLoad) { this.hostId = hostId; this.entityType = entityType; this.cpuUtilization = cpuUtilization; @@ -46,20 +46,20 @@ public HostStatsEntry(long hostId, double cpuUtilization, double networkReadKBs, } @Override - public double getNetworkReadKBs() { + public Double getNetworkReadKBs() { return networkReadKBs; } - public void setNetworkReadKBs(double networkReadKBs) { + public void setNetworkReadKBs(Double networkReadKBs) { this.networkReadKBs = networkReadKBs; } @Override - public double getNetworkWriteKBs() { + public Double getNetworkWriteKBs() { return networkWriteKBs; } - public void setNetworkWriteKBs(double networkWriteKBs) { + public void setNetworkWriteKBs(Double networkWriteKBs) { this.networkWriteKBs = networkWriteKBs; } @@ -73,34 +73,34 @@ public void setEntityType(String entityType) { } @Override - public double getTotalMemoryKBs() { + public Double getTotalMemoryKBs() { return this.totalMemoryKBs; } - public void setTotalMemoryKBs(double totalMemoryKBs) { + public void setTotalMemoryKBs(Double totalMemoryKBs) { this.totalMemoryKBs = totalMemoryKBs; } @Override - public double getFreeMemoryKBs() { + public Double getFreeMemoryKBs() { return this.freeMemoryKBs; } - public void setFreeMemoryKBs(double freeMemoryKBs) { + public void setFreeMemoryKBs(Double freeMemoryKBs) { this.freeMemoryKBs = freeMemoryKBs; } @Override - public double getCpuUtilization() { + public Double getCpuUtilization() { return this.cpuUtilization; } - public void setCpuUtilization(double cpuUtilization) { + public void setCpuUtilization(Double cpuUtilization) { this.cpuUtilization = cpuUtilization; } @Override - public double getUsedMemory() { + public Double getUsedMemory() { return (totalMemoryKBs - freeMemoryKBs) * 1024; } @@ -109,7 +109,7 @@ public HostStats getHostStats() { return this; } - public void setHostId(long hostId) { + public void setHostId(Long hostId) { this.hostId = hostId; } } diff --git a/core/src/com/cloud/agent/api/MaintainAnswer.java b/core/src/com/cloud/agent/api/MaintainAnswer.java index fb41b7aa5423..c68651b00c7a 100644 --- a/core/src/com/cloud/agent/api/MaintainAnswer.java +++ b/core/src/com/cloud/agent/api/MaintainAnswer.java @@ -20,7 +20,7 @@ package com.cloud.agent.api; public class MaintainAnswer extends Answer { - boolean willMigrate; + Boolean willMigrate; public MaintainAnswer() { } @@ -29,7 +29,7 @@ public MaintainAnswer(MaintainCommand cmd) { this(cmd, true, null); } - public MaintainAnswer(MaintainCommand cmd, boolean willMigrate) { + public MaintainAnswer(MaintainCommand cmd, Boolean willMigrate) { this(cmd, true, null); this.willMigrate = willMigrate; } @@ -38,12 +38,12 @@ public MaintainAnswer(MaintainCommand cmd, String details) { this(cmd, true, details); } - public MaintainAnswer(MaintainCommand cmd, boolean result, String details) { + public MaintainAnswer(MaintainCommand cmd, Boolean result, String details) { super(cmd, result, details); this.willMigrate = true; } - public boolean getMigrate() { + public Boolean getMigrate() { return this.willMigrate; } } diff --git a/core/src/com/cloud/agent/api/MaintainCommand.java b/core/src/com/cloud/agent/api/MaintainCommand.java index 264b6f2a7ad7..7b128501eb82 100644 --- a/core/src/com/cloud/agent/api/MaintainCommand.java +++ b/core/src/com/cloud/agent/api/MaintainCommand.java @@ -25,7 +25,7 @@ public MaintainCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java b/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java index 4eae16828531..f907977162d5 100644 --- a/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java @@ -26,12 +26,12 @@ public class ManageSnapshotAnswer extends Answer { public ManageSnapshotAnswer() { } - public ManageSnapshotAnswer(Command cmd, boolean success, String result) { + 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) { + public ManageSnapshotAnswer(ManageSnapshotCommand cmd, Long snapshotId, String snapshotPath, Boolean success, String result) { super(cmd, success, result); _snapshotPath = snapshotPath; } diff --git a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java b/core/src/com/cloud/agent/api/ManageSnapshotCommand.java index 688f7a84bb93..d2191c84cfc2 100644 --- a/core/src/com/cloud/agent/api/ManageSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/ManageSnapshotCommand.java @@ -37,13 +37,13 @@ public class ManageSnapshotCommand extends Command { // Information about the snapshot private String _snapshotPath = null; private String _snapshotName = null; - private long _snapshotId; + private Long _snapshotId; private String _vmName = null; public ManageSnapshotCommand() { } - public ManageSnapshotCommand(long snapshotId, String volumePath, StoragePool pool, String preSnapshotPath, String snapshotName, String vmName) { + public ManageSnapshotCommand(Long snapshotId, String volumePath, StoragePool pool, String preSnapshotPath, String snapshotName, String vmName) { _commandSwitch = ManageSnapshotCommand.CREATE_SNAPSHOT; _volumePath = volumePath; _pool = new StorageFilerTO(pool); @@ -53,13 +53,13 @@ public ManageSnapshotCommand(long snapshotId, String volumePath, StoragePool poo _vmName = vmName; } - public ManageSnapshotCommand(long snapshotId, String snapshotPath) { + public ManageSnapshotCommand(Long snapshotId, String snapshotPath) { _commandSwitch = ManageSnapshotCommand.DESTROY_SNAPSHOT; _snapshotPath = snapshotPath; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -83,7 +83,7 @@ public String getSnapshotName() { return _snapshotName; } - public long getSnapshotId() { + public Long getSnapshotId() { return _snapshotId; } diff --git a/core/src/com/cloud/agent/api/MigrateAnswer.java b/core/src/com/cloud/agent/api/MigrateAnswer.java index ebc360c9b9b2..1748302bec9c 100644 --- a/core/src/com/cloud/agent/api/MigrateAnswer.java +++ b/core/src/com/cloud/agent/api/MigrateAnswer.java @@ -25,7 +25,7 @@ public class MigrateAnswer extends Answer { protected MigrateAnswer() { } - public MigrateAnswer(MigrateCommand cmd, boolean result, String detail, Integer vncPort) { + public MigrateAnswer(MigrateCommand cmd, Boolean result, String detail, Integer vncPort) { super(cmd, result, detail); this.vncPort = vncPort; } diff --git a/core/src/com/cloud/agent/api/MigrateCommand.java b/core/src/com/cloud/agent/api/MigrateCommand.java index 9d1f83ac03f5..346a5c1e3982 100644 --- a/core/src/com/cloud/agent/api/MigrateCommand.java +++ b/core/src/com/cloud/agent/api/MigrateCommand.java @@ -25,14 +25,14 @@ public class MigrateCommand extends Command { String vmName; String destIp; String hostGuid; - boolean isWindows; + Boolean isWindows; VirtualMachineTO vmTO; - boolean executeInSequence = false; + Boolean executeInSequence = false; protected MigrateCommand() { } - public MigrateCommand(String vmName, String destIp, boolean isWindows, VirtualMachineTO vmTO, boolean executeInSequence) { + public MigrateCommand(String vmName, String destIp, Boolean isWindows, VirtualMachineTO vmTO, Boolean executeInSequence) { this.vmName = vmName; this.destIp = destIp; this.isWindows = isWindows; @@ -40,7 +40,7 @@ public MigrateCommand(String vmName, String destIp, boolean isWindows, VirtualMa this.executeInSequence = executeInSequence; } - public boolean isWindows() { + public Boolean isWindows() { return isWindows; } @@ -65,7 +65,7 @@ public String getHostGuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } } diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java index 515dd2d0ab63..ee984ac28350 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java @@ -71,7 +71,7 @@ public String getTargetHost() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java index 62dc18982ee0..b85cfaa059a2 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java @@ -33,7 +33,7 @@ public VirtualMachineTO getVirtualMachine() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java index f75d1ee355c0..95265bae776d 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java @@ -43,7 +43,7 @@ public Map getVolumeToFiler() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java index 47a09c836305..6535577cff41 100644 --- a/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java +++ b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java @@ -55,7 +55,7 @@ public Map getToken() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/ModifySshKeysCommand.java b/core/src/com/cloud/agent/api/ModifySshKeysCommand.java index bbb43ca3246a..868b6d5db6af 100644 --- a/core/src/com/cloud/agent/api/ModifySshKeysCommand.java +++ b/core/src/com/cloud/agent/api/ModifySshKeysCommand.java @@ -45,7 +45,7 @@ public String getPrvKey() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java index b92bb7208230..3ee8184664a0 100644 --- a/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java +++ b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java @@ -31,7 +31,7 @@ public class ModifyStoragePoolAnswer extends Answer { protected ModifyStoragePoolAnswer() { } - public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map tInfo) { + public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, Long capacityBytes, Long availableBytes, Map tInfo) { super(cmd); this.result = true; this.poolInfo = diff --git a/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java b/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java index 136eb0938e3d..6031f4a0c9f6 100644 --- a/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java +++ b/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java @@ -27,7 +27,7 @@ public class ModifyStoragePoolCommand extends Command { - boolean add; + Boolean add; StorageFilerTO pool; String localPath; String[] options; @@ -37,14 +37,14 @@ public ModifyStoragePoolCommand() { } - public ModifyStoragePoolCommand(boolean add, StoragePool pool, String localPath) { + 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) { + public ModifyStoragePoolCommand(Boolean add, StoragePool pool) { this(add, pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes())); } @@ -56,12 +56,12 @@ public void setPool(StoragePool pool) { this.pool = new StorageFilerTO(pool); } - public boolean getAdd() { + public Boolean getAdd() { return add; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java b/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java index 5acf6aaaf4ac..1d96bc363759 100644 --- a/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java +++ b/core/src/com/cloud/agent/api/ModifyVmNicConfigAnswer.java @@ -33,7 +33,7 @@ public String getVmName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java index 635097d41240..602e274f5305 100644 --- a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java +++ b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java @@ -24,8 +24,8 @@ public class ModifyVmNicConfigCommand extends Command { String vmName; String vlan; String macAddress; - int index; - boolean enable; + Integer index; + Boolean enable; String switchLableName; protected ModifyVmNicConfigCommand() { @@ -37,13 +37,13 @@ public ModifyVmNicConfigCommand(String vmName, String vlan, String macAddress) { this.macAddress = macAddress; } - public ModifyVmNicConfigCommand(String vmName, String vlan, int position) { + public ModifyVmNicConfigCommand(String vmName, String vlan, Integer position) { this.vmName = vmName; this.vlan = vlan; this.index = position; } - public ModifyVmNicConfigCommand(String vmName, String vlan, int position, boolean enable) { + public ModifyVmNicConfigCommand(String vmName, String vlan, Integer position, Boolean enable) { this.vmName = vmName; this.vlan = vlan; this.index = position; @@ -63,7 +63,7 @@ public void setSwitchLableName(String switchlableName) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java b/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java index 2df7d117f7cd..b3c33656de4f 100644 --- a/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java +++ b/core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java @@ -44,7 +44,7 @@ public VirtualMachine.Type getType() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java b/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java index c0752a1e97e5..a41a196b1923 100644 --- a/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java +++ b/core/src/com/cloud/agent/api/NetworkRulesVmSecondaryIpCommand.java @@ -34,7 +34,7 @@ public NetworkRulesVmSecondaryIpCommand(String vmName, VirtualMachine.Type type) this.type = type; } - public NetworkRulesVmSecondaryIpCommand(String vmName, String vmMac, String secondaryIp, boolean action) { + public NetworkRulesVmSecondaryIpCommand(String vmName, String vmMac, String secondaryIp, Boolean action) { this.vmName = vmName; this.vmMac = vmMac; this.vmSecIp = secondaryIp; @@ -66,7 +66,7 @@ public String getAction() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/NetworkUsageCommand.java b/core/src/com/cloud/agent/api/NetworkUsageCommand.java index 66d44e9110de..8c26ede61bee 100644 --- a/core/src/com/cloud/agent/api/NetworkUsageCommand.java +++ b/core/src/com/cloud/agent/api/NetworkUsageCommand.java @@ -26,7 +26,7 @@ public class NetworkUsageCommand extends Command { private String privateIP; private String domRName; private String option; - boolean forVpc = false; + Boolean forVpc = false; private String gatewayIP; private String vpcCIDR; @@ -34,7 +34,7 @@ protected NetworkUsageCommand() { } - public NetworkUsageCommand(String privateIP, String domRName, boolean forVpc, String gatewayIP) { + public NetworkUsageCommand(String privateIP, String domRName, Boolean forVpc, String gatewayIP) { this.privateIP = privateIP; this.domRName = domRName; this.forVpc = forVpc; @@ -42,14 +42,14 @@ public NetworkUsageCommand(String privateIP, String domRName, boolean forVpc, St this.option = "get"; } - public NetworkUsageCommand(String privateIP, String domRName, String option, boolean forVpc) { + public NetworkUsageCommand(String privateIP, String domRName, String option, Boolean forVpc) { this.privateIP = privateIP; this.domRName = domRName; this.option = option; this.forVpc = forVpc; } - public NetworkUsageCommand(String privateIP, String domRName, boolean forVpc, String gatewayIP, String vpcCIDR) { + public NetworkUsageCommand(String privateIP, String domRName, Boolean forVpc, String gatewayIP, String vpcCIDR) { this.privateIP = privateIP; this.domRName = domRName; this.forVpc = forVpc; @@ -58,7 +58,7 @@ public NetworkUsageCommand(String privateIP, String domRName, boolean forVpc, St this.vpcCIDR = vpcCIDR; } - public NetworkUsageCommand(String privateIP, String domRName, String option, boolean forVpc, String gatewayIP) { + public NetworkUsageCommand(String privateIP, String domRName, String option, Boolean forVpc, String gatewayIP) { this.privateIP = privateIP; this.domRName = domRName; this.forVpc = forVpc; @@ -78,7 +78,7 @@ public String getOption() { return option; } - public boolean isForVpc() { + public Boolean isForVpc() { return forVpc; } @@ -91,7 +91,7 @@ public String getGatewayIP() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java b/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java index ba24bd026211..f4064ce5fe8e 100644 --- a/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java +++ b/core/src/com/cloud/agent/api/PerformanceMonitorAnswer.java @@ -24,7 +24,7 @@ public PerformanceMonitorAnswer() { } public PerformanceMonitorAnswer(PerformanceMonitorCommand cmd, - boolean result, String details) { + Boolean result, String details) { super(cmd, result, details); } } diff --git a/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java b/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java index 9462bb52438c..c587c455d6bc 100644 --- a/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java +++ b/core/src/com/cloud/agent/api/PerformanceMonitorCommand.java @@ -29,13 +29,13 @@ public class PerformanceMonitorCommand extends Command { public PerformanceMonitorCommand() { } - public PerformanceMonitorCommand(Map params, int wait) { + public PerformanceMonitorCommand(Map params, Integer wait) { setWait(wait); this.params = params; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/PingCommand.java b/core/src/com/cloud/agent/api/PingCommand.java index 8136c3d8b2e7..466e3c49d87f 100644 --- a/core/src/com/cloud/agent/api/PingCommand.java +++ b/core/src/com/cloud/agent/api/PingCommand.java @@ -23,12 +23,12 @@ public class PingCommand extends Command { Host.Type hostType; - long hostId; + Long hostId; protected PingCommand() { } - public PingCommand(Host.Type type, long id) { + public PingCommand(Host.Type type, Long id) { hostType = type; hostId = id; } @@ -37,12 +37,12 @@ public Host.Type getHostType() { return hostType; } - public long getHostId() { + public Long getHostId() { return hostId; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/PingRoutingCommand.java b/core/src/com/cloud/agent/api/PingRoutingCommand.java index d7733ee91976..efe33edfa108 100644 --- a/core/src/com/cloud/agent/api/PingRoutingCommand.java +++ b/core/src/com/cloud/agent/api/PingRoutingCommand.java @@ -27,13 +27,13 @@ public class PingRoutingCommand extends PingCommand { Map _hostVmStateReport; - boolean _gatewayAccessible = true; - boolean _vnetAccessible = true; + Boolean _gatewayAccessible = true; + Boolean _vnetAccessible = true; protected PingRoutingCommand() { } - public PingRoutingCommand(Host.Type type, long id, Map hostVmStateReport) { + public PingRoutingCommand(Host.Type type, Long id, Map hostVmStateReport) { super(type, id); this._hostVmStateReport = hostVmStateReport; } @@ -42,19 +42,19 @@ public Map getHostVmStateReport() { return this._hostVmStateReport; } - public boolean isGatewayAccessible() { + public Boolean isGatewayAccessible() { return _gatewayAccessible; } - public void setGatewayAccessible(boolean gatewayAccessible) { + public void setGatewayAccessible(Boolean gatewayAccessible) { _gatewayAccessible = gatewayAccessible; } - public boolean isVnetAccessible() { + public Boolean isVnetAccessible() { return _vnetAccessible; } - public void setVnetAccessible(boolean vnetAccessible) { + public void setVnetAccessible(Boolean vnetAccessible) { _vnetAccessible = vnetAccessible; } } diff --git a/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java index c92407cf8b32..f4586f9e5e8f 100644 --- a/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java +++ b/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java @@ -32,7 +32,7 @@ protected PingRoutingWithNwGroupsCommand() { super(); } - public PingRoutingWithNwGroupsCommand(Host.Type type, long id, Map hostVmStateReport, + public PingRoutingWithNwGroupsCommand(Host.Type type, Long id, Map hostVmStateReport, HashMap> nwGrpStates) { super(type, id, hostVmStateReport); newGroupStates = nwGrpStates; diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java index aecbc6350925..e9eba114d621 100644 --- a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java +++ b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java @@ -32,7 +32,7 @@ protected PingRoutingWithOvsCommand() { super(); } - public PingRoutingWithOvsCommand(Host.Type type, long id, Map hostVmStateReport, + public PingRoutingWithOvsCommand(Host.Type type, Long id, Map hostVmStateReport, List> ovsStates) { super(type, id, hostVmStateReport); diff --git a/core/src/com/cloud/agent/api/PingStorageCommand.java b/core/src/com/cloud/agent/api/PingStorageCommand.java index 16ce78cfa24d..df3926b0ddff 100644 --- a/core/src/com/cloud/agent/api/PingStorageCommand.java +++ b/core/src/com/cloud/agent/api/PingStorageCommand.java @@ -29,7 +29,7 @@ public class PingStorageCommand extends PingCommand { protected PingStorageCommand() { } - public PingStorageCommand(Host.Type type, long id, Map changes) { + public PingStorageCommand(Host.Type type, Long id, Map changes) { super(type, id); this.changes = changes; } diff --git a/core/src/com/cloud/agent/api/PingTestCommand.java b/core/src/com/cloud/agent/api/PingTestCommand.java index 128b88a1a0fe..ca2e0b529915 100644 --- a/core/src/com/cloud/agent/api/PingTestCommand.java +++ b/core/src/com/cloud/agent/api/PingTestCommand.java @@ -52,7 +52,7 @@ public String getPrivateIp() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/PlugNicAnswer.java b/core/src/com/cloud/agent/api/PlugNicAnswer.java index a2845699bb47..b99e44dc47f4 100644 --- a/core/src/com/cloud/agent/api/PlugNicAnswer.java +++ b/core/src/com/cloud/agent/api/PlugNicAnswer.java @@ -23,7 +23,7 @@ public class PlugNicAnswer extends Answer { public PlugNicAnswer() { } - public PlugNicAnswer(PlugNicCommand cmd, boolean success, String result) { + public PlugNicAnswer(PlugNicCommand cmd, Boolean success, String result) { super(cmd, success, result); } } diff --git a/core/src/com/cloud/agent/api/PlugNicCommand.java b/core/src/com/cloud/agent/api/PlugNicCommand.java index 322b755b86a7..71a4ed356ada 100644 --- a/core/src/com/cloud/agent/api/PlugNicCommand.java +++ b/core/src/com/cloud/agent/api/PlugNicCommand.java @@ -36,7 +36,7 @@ public NicTO getNic() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java b/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java index 6b89654e604c..5deb1376acc2 100644 --- a/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java +++ b/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java @@ -36,7 +36,7 @@ public VirtualMachineTO getVirtualMachine() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java b/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java index 81f0275422e3..99c506c20e4b 100644 --- a/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java +++ b/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java @@ -28,7 +28,7 @@ public class PrepareOCFS2NodesCommand extends Command { String clusterName; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java b/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java index ed337885beed..482e2cfb967c 100644 --- a/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java +++ b/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java @@ -22,19 +22,19 @@ import com.cloud.resource.ResourceState; public class PropagateResourceEventCommand extends Command { - long hostId; + Long hostId; ResourceState.Event event; protected PropagateResourceEventCommand() { } - public PropagateResourceEventCommand(long hostId, ResourceState.Event event) { + public PropagateResourceEventCommand(Long hostId, ResourceState.Event event) { this.hostId = hostId; this.event = event; } - public long getHostId() { + public Long getHostId() { return hostId; } @@ -43,7 +43,7 @@ public ResourceState.Event getEvent() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { // TODO Auto-generated method stub return false; } diff --git a/core/src/com/cloud/agent/api/ReadyCommand.java b/core/src/com/cloud/agent/api/ReadyCommand.java index b02b004d6e52..a288a0cab86a 100644 --- a/core/src/com/cloud/agent/api/ReadyCommand.java +++ b/core/src/com/cloud/agent/api/ReadyCommand.java @@ -52,7 +52,7 @@ public Long getDataCenterId() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/RebootAnswer.java b/core/src/com/cloud/agent/api/RebootAnswer.java index 0cadcf1b1601..88be2461e9c2 100644 --- a/core/src/com/cloud/agent/api/RebootAnswer.java +++ b/core/src/com/cloud/agent/api/RebootAnswer.java @@ -30,7 +30,7 @@ public RebootAnswer(RebootCommand cmd, String details, Integer vncport) { this.vncPort = vncport; } - public RebootAnswer(RebootCommand cmd, String details, boolean success) { + public RebootAnswer(RebootCommand cmd, String details, Boolean success) { super(cmd, success, details); this.vncPort = null; } diff --git a/core/src/com/cloud/agent/api/RebootCommand.java b/core/src/com/cloud/agent/api/RebootCommand.java index d8f1ce956944..a85b9541d394 100644 --- a/core/src/com/cloud/agent/api/RebootCommand.java +++ b/core/src/com/cloud/agent/api/RebootCommand.java @@ -40,7 +40,7 @@ public String getVmName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java index 1c9d1627b42b..79ca83f577cf 100644 --- a/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java +++ b/core/src/com/cloud/agent/api/RecurringNetworkUsageCommand.java @@ -20,19 +20,19 @@ package com.cloud.agent.api; public class RecurringNetworkUsageCommand extends Command implements CronCommand { - int interval; + Integer interval; - public RecurringNetworkUsageCommand(int interval) { + public RecurringNetworkUsageCommand(Integer interval) { this.interval = interval; } @Override - public int getInterval() { + public Integer getInterval() { return interval; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java index 572dff401f74..acd7c22b4471 100644 --- a/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java @@ -30,7 +30,7 @@ public class RevertToVMSnapshotAnswer extends Answer { private List volumeTOs; private VirtualMachine.PowerState vmState; - public RevertToVMSnapshotAnswer(RevertToVMSnapshotCommand cmd, boolean result, String message) { + public RevertToVMSnapshotAnswer(RevertToVMSnapshotCommand cmd, Boolean result, String message) { super(cmd, result, message); } diff --git a/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java index fc8ba08433c5..6fbabce00d6c 100644 --- a/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java @@ -30,19 +30,19 @@ public RevertToVMSnapshotCommand(String vmName, String vmUuid, VMSnapshotTO snap this.vmUuid = vmUuid; } - public RevertToVMSnapshotCommand(String vmName, String vmUuid, VMSnapshotTO snapshot, List volumeTOs, String guestOSType, boolean reloadVm) { + public RevertToVMSnapshotCommand(String vmName, String vmUuid, VMSnapshotTO snapshot, List volumeTOs, String guestOSType, Boolean reloadVm) { this(vmName, vmUuid, snapshot, volumeTOs, guestOSType); setReloadVm(reloadVm); } - private boolean reloadVm = false; + private Boolean reloadVm = false; private String vmUuid; - public boolean isReloadVm() { + public Boolean isReloadVm() { return reloadVm; } - public void setReloadVm(boolean reloadVm) { + public void setReloadVm(Boolean reloadVm) { this.reloadVm = reloadVm; } diff --git a/core/src/com/cloud/agent/api/ScaleVmAnswer.java b/core/src/com/cloud/agent/api/ScaleVmAnswer.java index 1e498303e26f..c6a1b92f6e34 100644 --- a/core/src/com/cloud/agent/api/ScaleVmAnswer.java +++ b/core/src/com/cloud/agent/api/ScaleVmAnswer.java @@ -24,7 +24,7 @@ public class ScaleVmAnswer extends Answer { protected ScaleVmAnswer() { } - public ScaleVmAnswer(ScaleVmCommand cmd, boolean result, String detail) { + public ScaleVmAnswer(ScaleVmCommand cmd, Boolean result, String detail) { super(cmd, result, detail); } diff --git a/core/src/com/cloud/agent/api/ScaleVmCommand.java b/core/src/com/cloud/agent/api/ScaleVmCommand.java index 1c763dd05dd9..5365feaaca5a 100644 --- a/core/src/com/cloud/agent/api/ScaleVmCommand.java +++ b/core/src/com/cloud/agent/api/ScaleVmCommand.java @@ -25,11 +25,11 @@ public class ScaleVmCommand extends Command { VirtualMachineTO vm; String vmName; - int cpus; + Integer cpus; Integer minSpeed; Integer maxSpeed; - long minRam; - long maxRam; + Long minRam; + Long maxRam; public VirtualMachineTO getVm() { return vm; @@ -39,11 +39,11 @@ public void setVm(VirtualMachineTO vm) { this.vm = vm; } - public int getCpus() { + public Integer getCpus() { return cpus; } - public ScaleVmCommand(String vmName, int cpus, Integer minSpeed, Integer maxSpeed, long minRam, long maxRam, boolean limitCpuUse) { + public ScaleVmCommand(String vmName, Integer cpus, Integer minSpeed, Integer maxSpeed, Long minRam, Long maxRam, Boolean limitCpuUse) { super(); this.vmName = vmName; this.cpus = cpus; @@ -52,12 +52,9 @@ public ScaleVmCommand(String vmName, int cpus, Integer minSpeed, Integer maxSpee this.minRam = minRam; this.maxRam = maxRam; this.vm = new VirtualMachineTO(1L, vmName, null, cpus, minSpeed, maxSpeed, minRam, maxRam, null, null, false, limitCpuUse, null); - /*vm.setName(vmName); - vm.setCpus(cpus); - vm.setRam(minRam, maxRam);*/ } - public void setCpus(int cpus) { + public void setCpus(Integer cpus) { this.cpus = cpus; } @@ -77,19 +74,19 @@ public void setMaxSpeed(Integer maxSpeed) { this.maxSpeed = maxSpeed; } - public long getMinRam() { + public Long getMinRam() { return minRam; } - public void setMinRam(long minRam) { + public void setMinRam(Long minRam) { this.minRam = minRam; } - public long getMaxRam() { + public Long getMaxRam() { return maxRam; } - public void setMaxRam(long maxRam) { + public void setMaxRam(Long maxRam) { this.maxRam = maxRam; } @@ -106,7 +103,7 @@ public VirtualMachineTO getVirtualMachine() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } @@ -117,8 +114,7 @@ public ScaleVmCommand(VirtualMachineTO vm) { this.vm = vm; } - public boolean getLimitCpuUse() { - // TODO Auto-generated method stub + public Boolean getLimitCpuUse() { return false; } diff --git a/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java b/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java index 24c821b12ace..cbb50b9b7555 100644 --- a/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java +++ b/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java @@ -29,7 +29,7 @@ public ScheduleHostScanTaskCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; // standalone command and can be executed independent of other commands } } diff --git a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java b/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java index 653635c7c7f3..df93173c4540 100644 --- a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java +++ b/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java @@ -25,12 +25,12 @@ public class SecStorageFirewallCfgCommand extends Command { public static class PortConfig { - boolean add; + Boolean add; String sourceIp; String port; String intf; - public PortConfig(String sourceIp, String port, boolean add, String intf) { + public PortConfig(String sourceIp, String port, Boolean add, String intf) { this.add = add; this.sourceIp = sourceIp; this.port = port; @@ -41,7 +41,7 @@ public PortConfig() { } - public boolean isAdd() { + public Boolean isAdd() { return add; } @@ -59,28 +59,28 @@ public String getIntf() { } private List portConfigs = new ArrayList(); - private boolean isAppendAIp = false; + private Boolean isAppendAIp = false; public SecStorageFirewallCfgCommand() { } - public SecStorageFirewallCfgCommand(boolean isAppend) { + public SecStorageFirewallCfgCommand(Boolean isAppend) { this.isAppendAIp = isAppend; } - public void addPortConfig(String sourceIp, String port, boolean add, String intf) { + 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() { + public Boolean getIsAppendAIp() { return isAppendAIp; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java b/core/src/com/cloud/agent/api/SecStorageSetupCommand.java index 28e55c2f4efc..1bfea904c765 100644 --- a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java +++ b/core/src/com/cloud/agent/api/SecStorageSetupCommand.java @@ -42,7 +42,7 @@ public SecStorageSetupCommand(DataStoreTO store, String secUrl, KeystoreManager. } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java b/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java index 7753f708b0aa..35aed97abc2e 100644 --- a/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java +++ b/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java @@ -29,7 +29,7 @@ public SecStorageVMSetupCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java b/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java index b2740b948ffc..64907120f133 100644 --- a/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java +++ b/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java @@ -37,14 +37,14 @@ public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd) { this.vmId = cmd.getVmId(); } - public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd, boolean result, String detail) { + 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) { + public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd, Boolean result, String detail, FailureReason r) { super(cmd, result, detail); this.logSequenceNumber = cmd.getSeqNum(); this.vmId = cmd.getVmId(); diff --git a/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java b/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java index b9bdef564694..fc3c5be38156 100644 --- a/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java +++ b/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java @@ -36,15 +36,15 @@ public class SecurityGroupRulesCmd extends Command { public static class IpPortAndProto { private String proto; - private int startPort; - private int endPort; + private Integer startPort; + private Integer endPort; @LogLevel(Log4jLevel.Trace) private String[] allowedCidrs; public IpPortAndProto() { } - public IpPortAndProto(String proto, int startPort, int endPort, String[] allowedCidrs) { + public IpPortAndProto(String proto, Integer startPort, Integer endPort, String[] allowedCidrs) { super(); this.proto = proto; this.startPort = startPort; @@ -64,11 +64,11 @@ public String getProto() { return proto; } - public int getStartPort() { + public Integer getStartPort() { return startPort; } - public int getEndPort() { + public Integer getEndPort() { return endPort; } @@ -125,7 +125,7 @@ public SecurityGroupRulesCmd(String guestIp, String guestMac, String vmName, Lon } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } @@ -181,7 +181,7 @@ public String stringifyRules() { //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]); + Long ipnum = NetUtils.ip2Long(toks[0]); return Long.toHexString(ipnum) + "/" + toks[1]; } @@ -274,7 +274,7 @@ public Long getVmId() { return vmId; } - public int getTotalNumCidrs() { + public Integer getTotalNumCidrs() { //useful for logging int count = 0; for (IpPortAndProto i : ingressRuleSet) { @@ -286,7 +286,7 @@ public int getTotalNumCidrs() { return count; } - public void setMsId(long msId) { + public void setMsId(Long msId) { this.msId = msId; } diff --git a/core/src/com/cloud/agent/api/SetupAnswer.java b/core/src/com/cloud/agent/api/SetupAnswer.java index 6965071c314b..cde753d22f34 100644 --- a/core/src/com/cloud/agent/api/SetupAnswer.java +++ b/core/src/com/cloud/agent/api/SetupAnswer.java @@ -21,12 +21,12 @@ public class SetupAnswer extends Answer { // indicate if agent reconnect is needed after setup command - private boolean _reconnect; + private Boolean _reconnect; public SetupAnswer() { } - public SetupAnswer(SetupCommand cmd, boolean reconnect) { + public SetupAnswer(SetupCommand cmd, Boolean reconnect) { super(cmd, true, null); _reconnect = reconnect; } @@ -36,7 +36,7 @@ public SetupAnswer(SetupCommand cmd, String details) { _reconnect = true; } - public boolean needReconnect() { + public Boolean needReconnect() { return _reconnect; } diff --git a/core/src/com/cloud/agent/api/SetupCommand.java b/core/src/com/cloud/agent/api/SetupCommand.java index c3c98474c81f..c94b0fd930d4 100644 --- a/core/src/com/cloud/agent/api/SetupCommand.java +++ b/core/src/com/cloud/agent/api/SetupCommand.java @@ -24,14 +24,14 @@ public class SetupCommand extends Command { HostEnvironment env; - boolean multipath; - boolean needSetup; + Boolean multipath; + Boolean needSetup; - public boolean needSetup() { + public Boolean needSetup() { return needSetup; } - public void setNeedSetup(boolean setup) { + public void setNeedSetup(Boolean setup) { this.needSetup = setup; } @@ -52,12 +52,12 @@ public void setMultipathOn() { this.multipath = true; } - public boolean useMultipath() { + public Boolean useMultipath() { return multipath; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java index 0f53daa7e984..a0fafa69b00f 100644 --- a/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java +++ b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java @@ -27,8 +27,8 @@ public class SetupGuestNetworkCommand extends NetworkElementCommand { String networkDomain; String defaultDns1 = null; String defaultDns2 = null; - boolean isRedundant = false; - boolean add = true; + Boolean isRedundant = false; + Boolean add = true; NicTO nic; public NicTO getNic() { @@ -47,19 +47,19 @@ public String getNetworkDomain() { return networkDomain; } - public boolean isAdd() { + public Boolean isAdd() { return add; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } protected SetupGuestNetworkCommand() { } - public SetupGuestNetworkCommand(final String dhcpRange, final String networkDomain, final boolean isRedundant, final String defaultDns1, final String defaultDns2, final boolean add, + public SetupGuestNetworkCommand(final String dhcpRange, final String networkDomain, final Boolean isRedundant, final String defaultDns1, final String defaultDns2, final Boolean add, final NicTO nic) { this.dhcpRange = dhcpRange; this.networkDomain = networkDomain; diff --git a/core/src/com/cloud/agent/api/ShutdownCommand.java b/core/src/com/cloud/agent/api/ShutdownCommand.java index 3c0571c156c3..628cad8d49f8 100644 --- a/core/src/com/cloud/agent/api/ShutdownCommand.java +++ b/core/src/com/cloud/agent/api/ShutdownCommand.java @@ -53,7 +53,7 @@ public String getDetail() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/SnapshotCommand.java b/core/src/com/cloud/agent/api/SnapshotCommand.java index cf4eeb5da58c..9cd31f72f4ab 100644 --- a/core/src/com/cloud/agent/api/SnapshotCommand.java +++ b/core/src/com/cloud/agent/api/SnapshotCommand.java @@ -120,7 +120,7 @@ public void setVolumePath(final String path) { * {@inheritDoc} */ @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/StartCommand.java b/core/src/com/cloud/agent/api/StartCommand.java index 24b0ac3787b5..24549aa25138 100644 --- a/core/src/com/cloud/agent/api/StartCommand.java +++ b/core/src/com/cloud/agent/api/StartCommand.java @@ -27,7 +27,7 @@ public class StartCommand extends Command { VirtualMachineTO vm; String hostIp; - boolean executeInSequence = false; + Boolean executeInSequence = false; String secondaryStorage; public VirtualMachineTO getVirtualMachine() { @@ -35,7 +35,7 @@ public VirtualMachineTO getVirtualMachine() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { //VR start doesn't go through queue if (vm.getName() != null && vm.getName().startsWith("r-")) { return false; @@ -46,7 +46,7 @@ public boolean executeInSequence() { protected StartCommand() { } - public StartCommand(VirtualMachineTO vm, Host host, boolean executeInSequence) { + public StartCommand(VirtualMachineTO vm, Host host, Boolean executeInSequence) { this.vm = vm; this.hostIp = host.getPrivateIpAddress(); this.executeInSequence = executeInSequence; diff --git a/core/src/com/cloud/agent/api/StartupAnswer.java b/core/src/com/cloud/agent/api/StartupAnswer.java index 71652269b66f..1336527fc123 100644 --- a/core/src/com/cloud/agent/api/StartupAnswer.java +++ b/core/src/com/cloud/agent/api/StartupAnswer.java @@ -20,13 +20,13 @@ package com.cloud.agent.api; public class StartupAnswer extends Answer { - long hostId; - int pingInterval; + Long hostId = 0l; + Integer pingInterval = 3000; protected StartupAnswer() { } - public StartupAnswer(StartupCommand cmd, long hostId, int pingInterval) { + public StartupAnswer(StartupCommand cmd, Long hostId, Integer pingInterval) { super(cmd); this.hostId = hostId; this.pingInterval = pingInterval; @@ -36,11 +36,11 @@ public StartupAnswer(StartupCommand cmd, String details) { super(cmd, false, details); } - public long getHostId() { + public Long getHostId() { return hostId; } - public int getPingInterval() { + public Integer getPingInterval() { return pingInterval; } } diff --git a/core/src/com/cloud/agent/api/StartupCommand.java b/core/src/com/cloud/agent/api/StartupCommand.java index 1de51ad0f6f8..6950d06a49c8 100644 --- a/core/src/com/cloud/agent/api/StartupCommand.java +++ b/core/src/com/cloud/agent/api/StartupCommand.java @@ -282,7 +282,7 @@ public void setGatewayIpAddress(String gatewayIpAddress) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/StartupProxyCommand.java b/core/src/com/cloud/agent/api/StartupProxyCommand.java index 3a65d70cedb5..7814867b1e1a 100644 --- a/core/src/com/cloud/agent/api/StartupProxyCommand.java +++ b/core/src/com/cloud/agent/api/StartupProxyCommand.java @@ -22,8 +22,8 @@ import com.cloud.host.Host; public class StartupProxyCommand extends StartupCommand { - private int proxyPort; - private long proxyVmId; + private Integer proxyPort; + private Long proxyVmId; public StartupProxyCommand() { super(Host.Type.ConsoleProxy); @@ -31,23 +31,23 @@ public StartupProxyCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } - public int getProxyPort() { + public Integer getProxyPort() { return proxyPort; } - public void setProxyPort(int proxyPort) { + public void setProxyPort(Integer proxyPort) { this.proxyPort = proxyPort; } - public long getProxyVmId() { + public Long getProxyVmId() { return proxyVmId; } - public void setProxyVmId(long proxyVmId) { + public void setProxyVmId(Long proxyVmId) { this.proxyVmId = proxyVmId; } } diff --git a/core/src/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/com/cloud/agent/api/StartupRoutingCommand.java index c4138367b7de..bac028513fb8 100644 --- a/core/src/com/cloud/agent/api/StartupRoutingCommand.java +++ b/core/src/com/cloud/agent/api/StartupRoutingCommand.java @@ -29,12 +29,12 @@ import com.cloud.network.Networks.RouterPrivateIpStrategy; public class StartupRoutingCommand extends StartupCommand { - Integer cpuSockets; - int cpus; - long speed; - long memory; - long dom0MinMemory; - boolean poolSync; + Integer cpuSockets = 0; + Integer cpus = 0; + Long speed = 0l; + Long memory = 0l; + Long dom0MinMemory = 0l; + Boolean poolSync = Boolean.FALSE; String caps; @@ -52,7 +52,7 @@ public StartupRoutingCommand() { } - public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, final String caps, final HypervisorType hypervisorType, + public StartupRoutingCommand(Integer cpus, Long speed, Long memory, Long dom0MinMemory, final String caps, final HypervisorType hypervisorType, final Map hostDetails) { super(Host.Type.Routing); this.cpus = cpus; @@ -65,14 +65,14 @@ public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemo this.poolSync = false; } - public StartupRoutingCommand(int cpus, long speed, long memory, long dom0MinMemory, String caps, HypervisorType hypervisorType, + public StartupRoutingCommand(Integer cpus, Long speed, Long memory, Long dom0MinMemory, String caps, HypervisorType hypervisorType, RouterPrivateIpStrategy privIpStrategy) { this(cpus, speed, memory, dom0MinMemory, caps, hypervisorType); getHostDetails().put(RouterPrivateIpStrategy.class.getCanonicalName(), privIpStrategy.toString()); } - public StartupRoutingCommand(int cpus2, long speed2, long memory2, long dom0MinMemory2, String caps2, HypervisorType hypervisorType2) { + public StartupRoutingCommand(Integer cpus2, Long speed2, Long memory2, Long dom0MinMemory2, String caps2, HypervisorType hypervisorType2) { this(cpus2, speed2, memory2, dom0MinMemory2, caps2, hypervisorType2, new HashMap()); } @@ -81,7 +81,7 @@ public Integer getCpuSockets() { return cpuSockets; } - public int getCpus() { + public Integer getCpus() { return cpus; } @@ -89,19 +89,19 @@ public String getCapabilities() { return caps; } - public long getSpeed() { + public Long getSpeed() { return speed; } - public long getMemory() { + public Long getMemory() { return memory; } - public long getDom0MinMemory() { + public Long getDom0MinMemory() { return dom0MinMemory; } - public void setSpeed(long speed) { + public void setSpeed(Long speed) { this.speed = speed; } @@ -109,15 +109,15 @@ public void setCpuSockets(Integer cpuSockets) { this.cpuSockets = cpuSockets; } - public void setCpus(int cpus) { + public void setCpus(Integer cpus) { this.cpus = cpus; } - public void setMemory(long memory) { + public void setMemory(Long memory) { this.memory = memory; } - public void setDom0MinMemory(long dom0MinMemory) { + public void setDom0MinMemory(Long dom0MinMemory) { this.dom0MinMemory = dom0MinMemory; } @@ -133,11 +133,11 @@ public void setPool(String pool) { this.pool = pool; } - public boolean isPoolSync() { + public Boolean isPoolSync() { return poolSync; } - public void setPoolSync(boolean poolSync) { + public void setPoolSync(Boolean poolSync) { this.poolSync = poolSync; } diff --git a/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java b/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java index b480d3ce5c5d..7888a363eb13 100644 --- a/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java +++ b/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java @@ -29,7 +29,7 @@ public StartupSecondaryStorageCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/StartupStorageCommand.java b/core/src/com/cloud/agent/api/StartupStorageCommand.java index 12a60a12c8c2..1e26b59cdd99 100644 --- a/core/src/com/cloud/agent/api/StartupStorageCommand.java +++ b/core/src/com/cloud/agent/api/StartupStorageCommand.java @@ -31,7 +31,7 @@ public class StartupStorageCommand extends StartupCommand { String parent; Map templateInfo; - long totalSize; + Long totalSize; StoragePoolInfo poolInfo; Storage.StorageResourceType resourceType; StoragePoolType fsType; @@ -42,7 +42,7 @@ public StartupStorageCommand() { super(Host.Type.Storage); } - public StartupStorageCommand(String parent, StoragePoolType fsType, long totalSize, Map info) { + public StartupStorageCommand(String parent, StoragePoolType fsType, Long totalSize, Map info) { super(Host.Type.Storage); this.parent = parent; this.totalSize = totalSize; @@ -76,7 +76,7 @@ public String getNfsShare() { return nfsShare; } - public long getTotalSize() { + public Long getTotalSize() { return totalSize; } diff --git a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java index 7c9ad1ab3ff0..e07701057404 100644 --- a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java +++ b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java @@ -28,7 +28,7 @@ public class StartupVMMAgentCommand extends Command { Host.Type type; - long dataCenter; + Long dataCenter; Long pod; String clusterName; String guid; @@ -40,7 +40,7 @@ public StartupVMMAgentCommand() { } - public StartupVMMAgentCommand(long dataCenter, Long pod, String clusterName, String guid, String managementServerIP, String port, String version) { + public StartupVMMAgentCommand(Long dataCenter, Long pod, String clusterName, String guid, String managementServerIP, String port, String version) { super(); this.dataCenter = dataCenter; this.pod = pod; @@ -51,7 +51,7 @@ public StartupVMMAgentCommand(long dataCenter, Long pod, String clusterName, Str this.port = port; } - public long getDataCenter() { + public Long getDataCenter() { return dataCenter; } @@ -80,7 +80,7 @@ public void setVersion(String version) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } \ No newline at end of file diff --git a/core/src/com/cloud/agent/api/StopAnswer.java b/core/src/com/cloud/agent/api/StopAnswer.java index 9713cd965dc2..db8b061f3435 100644 --- a/core/src/com/cloud/agent/api/StopAnswer.java +++ b/core/src/com/cloud/agent/api/StopAnswer.java @@ -26,12 +26,12 @@ public class StopAnswer extends RebootAnswer { protected StopAnswer() { } - public StopAnswer(StopCommand cmd, String details, String platform, boolean success) { + public StopAnswer(StopCommand cmd, String details, String platform, Boolean success) { super(cmd, details, success); this.platform = platform; } - public StopAnswer(StopCommand cmd, String details, boolean success) { + public StopAnswer(StopCommand cmd, String details, Boolean success) { super(cmd, details, success); this.platform = null; } diff --git a/core/src/com/cloud/agent/api/StopCommand.java b/core/src/com/cloud/agent/api/StopCommand.java index c4948cd631b1..63da41a47461 100644 --- a/core/src/com/cloud/agent/api/StopCommand.java +++ b/core/src/com/cloud/agent/api/StopCommand.java @@ -23,17 +23,17 @@ import com.cloud.vm.VirtualMachine; public class StopCommand extends RebootCommand { - private boolean isProxy = false; + private Boolean isProxy = false; private String urlPort = null; private String publicConsoleProxyIpAddress = null; - boolean executeInSequence = false; + Boolean executeInSequence = false; private GPUDeviceTO gpuDevice; - boolean checkBeforeCleanup = false; + Boolean checkBeforeCleanup = false; protected StopCommand() { } - public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String publicConsoleProxyIpAddress, boolean executeInSequence, boolean checkBeforeCleanup) { + public StopCommand(VirtualMachine vm, Boolean isProxy, String urlPort, String publicConsoleProxyIpAddress, Boolean executeInSequence, Boolean checkBeforeCleanup) { super(vm); this.isProxy = isProxy; this.urlPort = urlPort; @@ -42,20 +42,20 @@ public StopCommand(VirtualMachine vm, boolean isProxy, String urlPort, String pu this.checkBeforeCleanup = checkBeforeCleanup; } - public StopCommand(VirtualMachine vm, boolean executeInSequence, boolean checkBeforeCleanup) { + public StopCommand(VirtualMachine vm, Boolean executeInSequence, Boolean checkBeforeCleanup) { super(vm); this.executeInSequence = executeInSequence; this.checkBeforeCleanup = checkBeforeCleanup; } - public StopCommand(String vmName, boolean executeInSequence, boolean checkBeforeCleanup) { + public StopCommand(String vmName, Boolean executeInSequence, Boolean checkBeforeCleanup) { super(vmName); this.executeInSequence = executeInSequence; this.checkBeforeCleanup = checkBeforeCleanup; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { //VR stop doesn't go through queue if (vmName != null && vmName.startsWith("r-")) { return false; @@ -63,7 +63,7 @@ public boolean executeInSequence() { return executeInSequence; } - public boolean isProxy() { + public Boolean isProxy() { return this.isProxy; } @@ -83,7 +83,7 @@ public void setGpuDevice(GPUDeviceTO gpuDevice) { this.gpuDevice = gpuDevice; } - public boolean checkBeforeCleanup() { + public Boolean checkBeforeCleanup() { return this.checkBeforeCleanup; } } diff --git a/core/src/com/cloud/agent/api/TransferAgentCommand.java b/core/src/com/cloud/agent/api/TransferAgentCommand.java index ab74d9bcf852..85d40825cd41 100644 --- a/core/src/com/cloud/agent/api/TransferAgentCommand.java +++ b/core/src/com/cloud/agent/api/TransferAgentCommand.java @@ -22,26 +22,26 @@ import com.cloud.host.Status.Event; public class TransferAgentCommand extends Command { - protected long agentId; - protected long futureOwner; - protected long currentOwner; + protected Long agentId; + protected Long futureOwner; + protected Long currentOwner; Event event; protected TransferAgentCommand() { } - public TransferAgentCommand(long agentId, long currentOwner, long futureOwner, Event event) { + public TransferAgentCommand(Long agentId, Long currentOwner, Long futureOwner, Event event) { this.agentId = agentId; this.currentOwner = currentOwner; this.futureOwner = futureOwner; this.event = event; } - public long getAgentId() { + public Long getAgentId() { return agentId; } - public long getFutureOwner() { + public Long getFutureOwner() { return futureOwner; } @@ -49,12 +49,12 @@ public Event getEvent() { return event; } - public long getCurrentOwner() { + public Long getCurrentOwner() { return currentOwner; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/UnPlugNicAnswer.java b/core/src/com/cloud/agent/api/UnPlugNicAnswer.java index 7e438d05b390..dca2ef4885c9 100644 --- a/core/src/com/cloud/agent/api/UnPlugNicAnswer.java +++ b/core/src/com/cloud/agent/api/UnPlugNicAnswer.java @@ -23,7 +23,7 @@ public class UnPlugNicAnswer extends Answer { public UnPlugNicAnswer() { } - public UnPlugNicAnswer(UnPlugNicCommand cmd, boolean success, String result) { + public UnPlugNicAnswer(UnPlugNicCommand cmd, Boolean success, String result) { super(cmd, success, result); } } diff --git a/core/src/com/cloud/agent/api/UnPlugNicCommand.java b/core/src/com/cloud/agent/api/UnPlugNicCommand.java index 984a0a4a44e9..156bc56389b1 100644 --- a/core/src/com/cloud/agent/api/UnPlugNicCommand.java +++ b/core/src/com/cloud/agent/api/UnPlugNicCommand.java @@ -30,7 +30,7 @@ public NicTO getNic() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/UnregisterNicCommand.java b/core/src/com/cloud/agent/api/UnregisterNicCommand.java index f3c03832298c..0fb26c6072dc 100644 --- a/core/src/com/cloud/agent/api/UnregisterNicCommand.java +++ b/core/src/com/cloud/agent/api/UnregisterNicCommand.java @@ -51,7 +51,7 @@ public String getTrafficLabel() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/UnregisterVMCommand.java b/core/src/com/cloud/agent/api/UnregisterVMCommand.java index 16eb4bac0e86..7353d8eb33ea 100644 --- a/core/src/com/cloud/agent/api/UnregisterVMCommand.java +++ b/core/src/com/cloud/agent/api/UnregisterVMCommand.java @@ -21,14 +21,14 @@ public class UnregisterVMCommand extends Command { String vmName; - boolean cleanupVmFiles = false; + Boolean cleanupVmFiles = false; public UnregisterVMCommand(String vmName) { this.vmName = vmName; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -36,11 +36,11 @@ public String getVmName() { return vmName; } - public void setCleanupVmFiles(boolean cleanupVmFiles) { + public void setCleanupVmFiles(Boolean cleanupVmFiles) { this.cleanupVmFiles = cleanupVmFiles; } - public boolean getCleanupVmFiles() { + public Boolean getCleanupVmFiles() { return this.cleanupVmFiles; } } diff --git a/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java b/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java index 1a75168176c3..1dd7eb81ebc8 100644 --- a/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java +++ b/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java @@ -57,7 +57,7 @@ public String getHostIp() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } \ No newline at end of file diff --git a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java index 8b9f0211fb5f..1a1d8827991f 100644 --- a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java +++ b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java @@ -62,7 +62,7 @@ public void setVmName(String vmName) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/VMSnapshotTO.java b/core/src/com/cloud/agent/api/VMSnapshotTO.java index cb679e7270b1..09290f6e6d59 100644 --- a/core/src/com/cloud/agent/api/VMSnapshotTO.java +++ b/core/src/com/cloud/agent/api/VMSnapshotTO.java @@ -34,7 +34,7 @@ public class VMSnapshotTO { private String description; private VMSnapshotTO parent; private List volumes; - private boolean quiescevm; + private Boolean quiescevm; public Long getId() { return id; @@ -44,7 +44,7 @@ public void setId(Long id) { this.id = id; } - public VMSnapshotTO(Long id, String snapshotName, VMSnapshot.Type type, Long createTime, String description, Boolean current, VMSnapshotTO parent, boolean quiescevm) { + public VMSnapshotTO(Long id, String snapshotName, VMSnapshot.Type type, Long createTime, String description, Boolean current, VMSnapshotTO parent, Boolean quiescevm) { super(); this.id = id; this.snapshotName = snapshotName; @@ -116,11 +116,11 @@ public void setVolumes(List volumes) { this.volumes = volumes; } - public boolean getQuiescevm() { + public Boolean getQuiescevm() { return this.quiescevm; } - public void setQuiescevm(boolean quiescevm) { + public void setQuiescevm(Boolean quiescevm) { this.quiescevm = quiescevm; } } diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java b/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java index a4e661f6f7e0..01cea6f6a5b5 100644 --- a/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java +++ b/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java @@ -28,7 +28,7 @@ protected ValidateSnapshotAnswer() { } - public ValidateSnapshotAnswer(ValidateSnapshotCommand cmd, boolean success, String result, String expectedSnapshotBackupUuid, String actualSnapshotBackupUuid, + public ValidateSnapshotAnswer(ValidateSnapshotCommand cmd, Boolean success, String result, String expectedSnapshotBackupUuid, String actualSnapshotBackupUuid, String actualSnapshotUuid) { super(cmd, success, result); this.expectedSnapshotBackupUuid = expectedSnapshotBackupUuid; diff --git a/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java b/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java index a3b6521a7702..325cdbbc6b51 100644 --- a/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java +++ b/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java @@ -76,7 +76,7 @@ public String getTemplateUuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java index ead1e80b414b..73e2ed279343 100644 --- a/core/src/com/cloud/agent/api/VmDiskStatsEntry.java +++ b/core/src/com/cloud/agent/api/VmDiskStatsEntry.java @@ -25,15 +25,15 @@ public class VmDiskStatsEntry implements VmDiskStats { String vmName; String path; - long ioRead = 0; - long ioWrite = 0; - long bytesWrite = 0; - long bytesRead = 0; + Long ioRead = 0l; + Long ioWrite = 0l; + Long bytesWrite = 0l; + Long bytesRead = 0l; public VmDiskStatsEntry() { } - public VmDiskStatsEntry(String vmName, String path, long ioWrite, long ioRead, long bytesWrite, long bytesRead) { + public VmDiskStatsEntry(String vmName, String path, Long ioWrite, Long ioRead, Long bytesWrite, Long bytesRead) { this.ioRead = ioRead; this.ioWrite = ioWrite; this.bytesRead = bytesRead; @@ -58,39 +58,39 @@ public String getPath() { return path; } - public void setBytesRead(long bytesRead) { + public void setBytesRead(Long bytesRead) { this.bytesRead = bytesRead; } @Override - public long getBytesRead() { + public Long getBytesRead() { return bytesRead; } - public void setBytesWrite(long bytesWrite) { + public void setBytesWrite(Long bytesWrite) { this.bytesWrite = bytesWrite; } @Override - public long getBytesWrite() { + public Long getBytesWrite() { return bytesWrite; } - public void setIORead(long ioRead) { + public void setIORead(Long ioRead) { this.ioRead = ioRead; } @Override - public long getIORead() { + public Long getIORead() { return ioRead; } - public void setIOWrite(long ioWrite) { + public void setIOWrite(Long ioWrite) { this.ioWrite = ioWrite; } @Override - public long getIOWrite() { + public Long getIOWrite() { return ioWrite; } diff --git a/core/src/com/cloud/agent/api/VmStatsEntry.java b/core/src/com/cloud/agent/api/VmStatsEntry.java index 0f30b6af5302..b5e139cc114a 100644 --- a/core/src/com/cloud/agent/api/VmStatsEntry.java +++ b/core/src/com/cloud/agent/api/VmStatsEntry.java @@ -23,20 +23,20 @@ public class VmStatsEntry implements VmStats { - double cpuUtilization; - double networkReadKBs; - double networkWriteKBs; - double diskReadIOs; - double diskWriteIOs; - double diskReadKBs; - double diskWriteKBs; - int numCPUs; + Double cpuUtilization; + Double networkReadKBs; + Double networkWriteKBs; + Double diskReadIOs; + Double diskWriteIOs; + Double diskReadKBs; + Double diskWriteKBs; + Integer 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, Integer numCPUs, String entityType) { this.cpuUtilization = cpuUtilization; this.networkReadKBs = networkReadKBs; this.networkWriteKBs = networkWriteKBs; @@ -44,7 +44,7 @@ public VmStatsEntry(double cpuUtilization, double networkReadKBs, double network this.entityType = entityType; } - public VmStatsEntry(double cpuUtilization, double networkReadKBs, double networkWriteKBs, double diskReadKBs, double diskWriteKBs, int numCPUs, String entityType) { + public VmStatsEntry(Double cpuUtilization, Double networkReadKBs, Double networkWriteKBs, Double diskReadKBs, Double diskWriteKBs, Integer numCPUs, String entityType) { this.cpuUtilization = cpuUtilization; this.networkReadKBs = networkReadKBs; this.networkWriteKBs = networkWriteKBs; @@ -55,73 +55,73 @@ public VmStatsEntry(double cpuUtilization, double networkReadKBs, double network } @Override - public double getCPUUtilization() { + public Double getCPUUtilization() { return cpuUtilization; } - public void setCPUUtilization(double cpuUtilization) { + public void setCPUUtilization(Double cpuUtilization) { this.cpuUtilization = cpuUtilization; } @Override - public double getNetworkReadKBs() { + public Double getNetworkReadKBs() { return networkReadKBs; } - public void setNetworkReadKBs(double networkReadKBs) { + public void setNetworkReadKBs(Double networkReadKBs) { this.networkReadKBs = networkReadKBs; } @Override - public double getNetworkWriteKBs() { + public Double getNetworkWriteKBs() { return networkWriteKBs; } - public void setNetworkWriteKBs(double networkWriteKBs) { + public void setNetworkWriteKBs(Double networkWriteKBs) { this.networkWriteKBs = networkWriteKBs; } @Override - public double getDiskReadIOs() { + public Double getDiskReadIOs() { return diskReadIOs; } - public void setDiskReadIOs(double diskReadIOs) { + public void setDiskReadIOs(Double diskReadIOs) { this.diskReadIOs = diskReadIOs; } @Override - public double getDiskWriteIOs() { + public Double getDiskWriteIOs() { return diskWriteIOs; } - public void setDiskWriteIOs(double diskWriteIOs) { + public void setDiskWriteIOs(Double diskWriteIOs) { this.diskWriteIOs = diskWriteIOs; } @Override - public double getDiskReadKBs() { + public Double getDiskReadKBs() { return diskReadKBs; } - public void setDiskReadKBs(double diskReadKBs) { + public void setDiskReadKBs(Double diskReadKBs) { this.diskReadKBs = diskReadKBs; } @Override - public double getDiskWriteKBs() { + public Double getDiskWriteKBs() { return diskWriteKBs; } - public void setDiskWriteKBs(double diskWriteKBs) { + public void setDiskWriteKBs(Double diskWriteKBs) { this.diskWriteKBs = diskWriteKBs; } - public int getNumCPUs() { + public Integer getNumCPUs() { return numCPUs; } - public void setNumCPUs(int numCPUs) { + public void setNumCPUs(Integer numCPUs) { this.numCPUs = numCPUs; } diff --git a/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java b/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java index 81b365260fb8..78e59ec389b3 100644 --- a/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java +++ b/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java @@ -37,7 +37,7 @@ public IpmISetBootDevCommand(BootDev dev) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java b/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java index 1ba24ee8636e..8a69d2b67bba 100644 --- a/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java +++ b/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java @@ -24,7 +24,7 @@ public class IpmiBootorResetCommand extends Command { @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java b/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java index f6e80c5b1fb4..9cfe3b2d450e 100644 --- a/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java +++ b/core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java @@ -30,7 +30,7 @@ public class PrepareCreateTemplateCommand extends Command { String template; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java index b4da7eed9dcb..7a3530d2af9d 100644 --- a/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java +++ b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java @@ -33,7 +33,7 @@ public class PreparePxeServerCommand extends Command { String hostName; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/check/CheckSshCommand.java b/core/src/com/cloud/agent/api/check/CheckSshCommand.java index 750d211feddf..c556459abe69 100644 --- a/core/src/com/cloud/agent/api/check/CheckSshCommand.java +++ b/core/src/com/cloud/agent/api/check/CheckSshCommand.java @@ -23,16 +23,16 @@ public class CheckSshCommand extends Command { String ip; - int port; - int interval; - int retries; + Integer port; + Integer interval; + Integer retries; String name; protected CheckSshCommand() { super(); } - public CheckSshCommand(String instanceName, String ip, int port) { + public CheckSshCommand(String instanceName, String ip, Integer port) { super(); this.ip = ip; this.port = port; @@ -49,20 +49,20 @@ public String getIp() { return ip; } - public int getPort() { + public Integer getPort() { return port; } - public int getInterval() { + public Integer getInterval() { return interval; } - public int getRetries() { + public Integer getRetries() { return retries; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java index 6190485810c7..47ea03e6d9c8 100644 --- a/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java +++ b/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java @@ -24,22 +24,23 @@ */ public class CheckConsoleProxyLoadCommand extends ProxyCommand { - private long proxyVmId; + private Long proxyVmId; private String proxyVmName; private String proxyManagementIp; - private int proxyCmdPort; + private Integer proxyCmdPort; public CheckConsoleProxyLoadCommand() { + this(0l,null,null,0); } - public CheckConsoleProxyLoadCommand(long proxyVmId, String proxyVmName, String proxyManagementIp, int proxyCmdPort) { + public CheckConsoleProxyLoadCommand(Long proxyVmId, String proxyVmName, String proxyManagementIp, Integer proxyCmdPort) { this.proxyVmId = proxyVmId; this.proxyVmName = proxyVmName; this.proxyManagementIp = proxyManagementIp; this.proxyCmdPort = proxyCmdPort; } - public long getProxyVmId() { + public Long getProxyVmId() { return proxyVmId; } @@ -51,12 +52,12 @@ public String getProxyManagementIp() { return proxyManagementIp; } - public int getProxyCmdPort() { + public Integer getProxyCmdPort() { return proxyCmdPort; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java index 0869003cff70..a26fa69a70d8 100644 --- a/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java +++ b/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java @@ -24,20 +24,20 @@ public class ConsoleProxyLoadAnswer extends Answer { - private long proxyVmId; + private Long proxyVmId; private String proxyVmName; protected ConsoleProxyLoadAnswer() { } - public ConsoleProxyLoadAnswer(Command command, long proxyVmId, String proxyVmName, boolean success, String details) { + 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() { + public Long getProxyVmId() { return proxyVmId; } diff --git a/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java b/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java index 223cf8adae28..9adc598d68cb 100644 --- a/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java +++ b/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java @@ -25,7 +25,7 @@ public class StartConsoleProxyAgentHttpHandlerCommand extends Command { @LogLevel(Log4jLevel.Off) - private byte[] keystoreBits; + private Byte[] keystoreBits; @LogLevel(Log4jLevel.Off) private String keystorePassword; @LogLevel(Log4jLevel.Off) @@ -35,21 +35,21 @@ public StartConsoleProxyAgentHttpHandlerCommand() { super(); } - public StartConsoleProxyAgentHttpHandlerCommand(byte[] ksBits, String ksPassword) { + public StartConsoleProxyAgentHttpHandlerCommand(Byte[] ksBits, String ksPassword) { this.keystoreBits = ksBits; this.keystorePassword = ksPassword; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } - public byte[] getKeystoreBits() { + public Byte[] getKeystoreBits() { return keystoreBits; } - public void setKeystoreBits(byte[] keystoreBits) { + public void setKeystoreBits(Byte[] keystoreBits) { this.keystoreBits = keystoreBits; } diff --git a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java index 55d04592c3fa..dc2cacba799c 100644 --- a/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java +++ b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java @@ -23,13 +23,13 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCommand { - private long proxyVmId; + private Long proxyVmId; private String proxyVmName; private String proxyManagementIp; - private int proxyCmdPort; - int interval; + private Integer proxyCmdPort; + Integer interval; - public WatchConsoleProxyLoadCommand(int interval, long proxyVmId, String proxyVmName, String proxyManagementIp, int proxyCmdPort) { + public WatchConsoleProxyLoadCommand(Integer interval, Long proxyVmId, String proxyVmName, String proxyManagementIp, Integer proxyCmdPort) { this.interval = interval; this.proxyVmId = proxyVmId; this.proxyVmName = proxyVmName; @@ -40,7 +40,7 @@ public WatchConsoleProxyLoadCommand(int interval, long proxyVmId, String proxyVm protected WatchConsoleProxyLoadCommand() { } - public long getProxyVmId() { + public Long getProxyVmId() { return proxyVmId; } @@ -52,17 +52,17 @@ public String getProxyManagementIp() { return proxyManagementIp; } - public int getProxyCmdPort() { + public Integer getProxyCmdPort() { return proxyCmdPort; } @Override - public int getInterval() { + public Integer getInterval() { return interval; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java index b94280641c09..6ae761290467 100644 --- a/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java +++ b/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java @@ -33,19 +33,19 @@ public class DhcpEntryCommand extends NetworkElementCommand { String vmIp6Address; String ip6Gateway; String duid; - private boolean isDefault; - boolean executeInSequence = false; + private Boolean isDefault; + Boolean executeInSequence = false; protected DhcpEntryCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } - public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address, boolean executeInSequence) { + public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address, Boolean executeInSequence) { this.vmMac = vmMac; this.vmIpAddress = vmIpAddress; this.vmName = vmName; @@ -54,7 +54,7 @@ public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String this.executeInSequence = executeInSequence; } - public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address, String dns, String gateway, String ip6Gateway, boolean executeInSequence) { + public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address, String dns, String gateway, String ip6Gateway, Boolean executeInSequence) { this(vmMac, vmIpAddress, vmName, vmIp6Address, executeInSequence); this.dns = dns; this.gateway = gateway; @@ -136,11 +136,11 @@ public void setVmIp6Address(String ip6Address) { this.vmIp6Address = ip6Address; } - public boolean isDefault() { + public Boolean isDefault() { return isDefault; } - public void setDefault(boolean isDefault) { + public void setDefault(Boolean isDefault) { this.isDefault = isDefault; } } diff --git a/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java b/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java index 0fc0a653f355..a1586aaf9737 100644 --- a/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java +++ b/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java @@ -29,7 +29,7 @@ protected GetRouterAlertsCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -42,7 +42,7 @@ public String getPreviousAlertTimeStamp() { } @Override - public boolean isQuery() { + public Boolean isQuery() { return true; } } diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java index 4999ef37fddb..9c62cf15412e 100644 --- a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java +++ b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java @@ -23,7 +23,7 @@ public class GlobalLoadBalancerConfigAnswer extends Answer { - public GlobalLoadBalancerConfigAnswer(boolean success, String details) { + public GlobalLoadBalancerConfigAnswer(Boolean success, String details) { this.result = success; this.details = details; } diff --git a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java index 94e5c46ab804..3eac4c1a7397 100644 --- a/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java +++ b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java @@ -41,15 +41,15 @@ public class GlobalLoadBalancerConfigCommand extends Command { String persistenceType; // unique Id given per gslb rule, that is uniquely represents glsb rule on all participant sites - long gslbId; + Long gslbId; // true if global load balancer rule is being deleted - boolean revoked; + Boolean revoked; // list of the site details that are participating in the GSLB service List siteLoadBalancers; - public GlobalLoadBalancerConfigCommand(String domainName, String lbMethod, String persistenceType, String serviceType, long gslbId, boolean revoked) { + public GlobalLoadBalancerConfigCommand(String domainName, String lbMethod, String persistenceType, String serviceType, Long gslbId, Boolean revoked) { this.domainName = domainName; this.serviceType = serviceType; this.lbMethod = lbMethod; @@ -78,7 +78,7 @@ public String getPersistenceType() { return persistenceType; } - public long getGslbId() { + public Long getGslbId() { return this.gslbId; } @@ -86,16 +86,16 @@ public String getDomainName() { return domainName; } - public boolean isForRevoke() { + public Boolean isForRevoke() { return revoked; } - public void setForRevoke(boolean revoke) { + public void setForRevoke(Boolean revoke) { this.revoked = revoke; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/com/cloud/agent/api/routing/GroupAnswer.java b/core/src/com/cloud/agent/api/routing/GroupAnswer.java index accb911a9172..3af3187457ac 100644 --- a/core/src/com/cloud/agent/api/routing/GroupAnswer.java +++ b/core/src/com/cloud/agent/api/routing/GroupAnswer.java @@ -29,7 +29,7 @@ protected GroupAnswer() { super(); } - public GroupAnswer(Command cmd, boolean success, int rulesCount, String[] results) { + public GroupAnswer(Command cmd, Boolean success, int rulesCount, String[] results) { super(cmd, success, null); assert (rulesCount == results.length) : "Results' count should match requests' count!"; diff --git a/core/src/com/cloud/agent/api/routing/IpAssocCommand.java b/core/src/com/cloud/agent/api/routing/IpAssocCommand.java index 0c9fb62cfbad..ae19d95e8092 100644 --- a/core/src/com/cloud/agent/api/routing/IpAssocCommand.java +++ b/core/src/com/cloud/agent/api/routing/IpAssocCommand.java @@ -33,7 +33,7 @@ public IpAssocCommand(IpAddressTO[] ips) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java index d8cc74817d7b..b70f666828fd 100644 --- a/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java +++ b/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java @@ -37,7 +37,7 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand { public String lbStatsUri = "/admin?stats"; public String maxconn = ""; public String lbProtocol; - public boolean keepAliveEnabled = false; + public Boolean keepAliveEnabled = false; NicTO nic; Long vpcId; @@ -50,7 +50,7 @@ public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers, Long vpcId) { } public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers, String publicIp, String guestIp, String privateIp, NicTO nic, Long vpcId, String maxconn, - boolean keepAliveEnabled) { + Boolean keepAliveEnabled) { this.loadBalancers = loadBalancers; this.lbStatsPublicIP = publicIp; this.lbStatsPrivateIP = privateIp; diff --git a/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java index 6e62e816ecea..c21a1f2c3538 100644 --- a/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java +++ b/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java @@ -54,7 +54,7 @@ public String getAccessDetail(final String name) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -70,7 +70,7 @@ public int getAnswersCount() { return 1; } - public boolean isQuery() { + public Boolean isQuery() { return false; } } diff --git a/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java index c7dabe5b14d8..18254b9cee81 100644 --- a/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java +++ b/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java @@ -21,8 +21,8 @@ public class RemoteAccessVpnCfgCommand extends NetworkElementCommand { - boolean create; - private boolean vpcEnabled; + Boolean create; + private Boolean vpcEnabled; String vpnServerIp; String ipRange; String presharedKey; @@ -34,16 +34,16 @@ protected RemoteAccessVpnCfgCommand() { this.create = false; } - public boolean isCreate() { + public Boolean isCreate() { return create; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } - public RemoteAccessVpnCfgCommand(boolean create, String vpnServerAddress, String localIp, String ipRange, String ipsecPresharedKey, boolean vpcEnabled) { + public RemoteAccessVpnCfgCommand(Boolean create, String vpnServerAddress, String localIp, String ipRange, String ipsecPresharedKey, Boolean vpcEnabled) { this.vpnServerIp = vpnServerAddress; this.ipRange = ipRange; this.presharedKey = ipsecPresharedKey; @@ -85,11 +85,11 @@ public String getLocalIp() { return localIp; } - public boolean isVpcEnabled() { + public Boolean isVpcEnabled() { return vpcEnabled; } - public void setVpcEnabled(boolean vpcEnabled) { + public void setVpcEnabled(Boolean vpcEnabled) { this.vpcEnabled = vpcEnabled; } diff --git a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java index 8bb72e4e702c..09a5f9553a0a 100644 --- a/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java +++ b/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java @@ -24,17 +24,17 @@ public class SavePasswordCommand extends NetworkElementCommand { String password; String vmIpAddress; String vmName; - boolean executeInSequence = false; + Boolean executeInSequence = false; protected SavePasswordCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } - public SavePasswordCommand(String password, String vmIpAddress, String vmName, boolean executeInSequence) { + public SavePasswordCommand(String password, String vmIpAddress, String vmName, Boolean executeInSequence) { this.password = password; this.vmIpAddress = vmIpAddress; this.vmName = vmName; diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java index a96f121cf099..c2fe73f421b4 100644 --- a/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java +++ b/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java @@ -27,7 +27,7 @@ public class SetFirewallRulesAnswer extends Answer { protected SetFirewallRulesAnswer() { } - public SetFirewallRulesAnswer(SetFirewallRulesCommand cmd, boolean success, String[] results) { + 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; diff --git a/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java b/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java index 547ec55a2d6b..f85b101dcbe7 100644 --- a/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java +++ b/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java @@ -27,7 +27,7 @@ public class SetNetworkACLAnswer extends Answer { protected SetNetworkACLAnswer() { } - public SetNetworkACLAnswer(SetNetworkACLCommand cmd, boolean success, String[] results) { + 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; diff --git a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java index 731cbfa2b16a..f04cd3dbea4c 100644 --- a/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java +++ b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java @@ -28,7 +28,7 @@ protected SetPortForwardingRulesAnswer() { super(); } - public SetPortForwardingRulesAnswer(SetPortForwardingRulesCommand cmd, String[] results, boolean success) { + 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?"; diff --git a/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java b/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java index 9606e46bd2e6..1e8b3125f054 100644 --- a/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java +++ b/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java @@ -25,7 +25,7 @@ public class SetSourceNatAnswer extends Answer { public SetSourceNatAnswer() { } - public SetSourceNatAnswer(SetSourceNatCommand cmd, boolean success, String result) { + public SetSourceNatAnswer(SetSourceNatCommand cmd, Boolean success, String result) { super(cmd, success, result); } } diff --git a/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java b/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java index 06c833425a99..fbeb756cdf7e 100644 --- a/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java +++ b/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java @@ -23,18 +23,18 @@ public class SetSourceNatCommand extends NetworkElementCommand { IpAddressTO ipAddress; - boolean add; + Boolean add; protected SetSourceNatCommand() { } - public SetSourceNatCommand(IpAddressTO ip, boolean add) { + public SetSourceNatCommand(IpAddressTO ip, Boolean add) { this.ipAddress = ip; this.add = add; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java index 68786f764cee..06efdc10d49e 100644 --- a/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java +++ b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java @@ -28,7 +28,7 @@ protected SetStaticNatRulesAnswer() { super(); } - public SetStaticNatRulesAnswer(SetStaticNatRulesCommand cmd, String[] results, boolean success) { + public SetStaticNatRulesAnswer(SetStaticNatRulesCommand cmd, String[] results, Boolean success) { super(cmd, success, null); assert (cmd.getRules().length == results.length) : "Shouldn't the results match the commands?"; diff --git a/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java b/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java index 56f2dcec07d6..c8b7b510f5c2 100644 --- a/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java +++ b/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java @@ -29,7 +29,7 @@ public class SetStaticRouteAnswer extends Answer { protected SetStaticRouteAnswer() { } - public SetStaticRouteAnswer(SetStaticRouteCommand cmd, boolean success, String[] results) { + public SetStaticRouteAnswer(SetStaticRouteCommand cmd, Boolean success, String[] results) { super(cmd, success, null); if (results != null) { assert (cmd.getStaticRoutes().length == results.length) : "Static routes and their results should be the same length"; diff --git a/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java b/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java index 68b38091a940..6943e5b413b6 100644 --- a/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java +++ b/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java @@ -21,7 +21,7 @@ public class Site2SiteVpnCfgCommand extends NetworkElementCommand { - private boolean create; + private Boolean create; private String localPublicIp; private String localGuestCidr; private String localPublicGateway; @@ -30,13 +30,13 @@ public class Site2SiteVpnCfgCommand extends NetworkElementCommand { private String ipsecPsk; private String ikePolicy; private String espPolicy; - private long ikeLifetime; - private long espLifetime; - private boolean dpd; - private boolean passive; + private Long ikeLifetime; + private Long espLifetime; + private Boolean dpd; + private Boolean passive; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } @@ -44,8 +44,8 @@ public Site2SiteVpnCfgCommand() { this.create = false; } - public Site2SiteVpnCfgCommand(boolean create, String localPublicIp, String localPublicGateway, String localGuestCidr, String peerGatewayIp, String peerGuestCidrList, - String ikePolicy, String espPolicy, String ipsecPsk, Long ikeLifetime, Long espLifetime, Boolean dpd, boolean passive) { + public Site2SiteVpnCfgCommand(Boolean create, String localPublicIp, String localPublicGateway, String localGuestCidr, String peerGatewayIp, String peerGuestCidrList, + String ikePolicy, String espPolicy, String ipsecPsk, Long ikeLifetime, Long espLifetime, Boolean dpd, Boolean passive) { this.create = create; this.setLocalPublicIp(localPublicIp); this.setLocalPublicGateway(localPublicGateway); @@ -61,11 +61,11 @@ public Site2SiteVpnCfgCommand(boolean create, String localPublicIp, String local this.passive = passive; } - public boolean isCreate() { + public Boolean isCreate() { return create; } - public void setCreate(boolean create) { + public void setCreate(Boolean create) { this.create = create; } @@ -93,19 +93,19 @@ public void setEspPolicy(String espPolicy) { this.espPolicy = espPolicy; } - public long getIkeLifetime() { + public Long getIkeLifetime() { return ikeLifetime; } - public void setikeLifetime(long ikeLifetime) { + public void setikeLifetime(Long ikeLifetime) { this.ikeLifetime = ikeLifetime; } - public long getEspLifetime() { + public Long getEspLifetime() { return espLifetime; } - public void setEspLifetime(long espLifetime) { + public void setEspLifetime(Long espLifetime) { this.espLifetime = espLifetime; } @@ -157,11 +157,11 @@ public void setPeerGuestCidrList(String peerGuestCidrList) { this.peerGuestCidrList = peerGuestCidrList; } - public boolean isPassive() { + public Boolean isPassive() { return passive; } - public void setPassive(boolean passive) { + public void setPassive(Boolean passive) { this.passive = passive; } } diff --git a/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java b/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java index a908c08de821..42788fb9f7e3 100644 --- a/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java +++ b/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java @@ -24,10 +24,10 @@ public class SiteLoadBalancerConfig { // true if the site details are local to the zone receiving 'GlobalLoadBalancerConfigCommand' - boolean local; + Boolean local; // true if the site needs to be removed from GSLB service - boolean revoked; + Boolean revoked; // service type of the 'site load balanced' service String serviceType; @@ -45,12 +45,12 @@ public class SiteLoadBalancerConfig { String gslbProviderPublicIp; // zone id in which site is located - long dataCenterId; + Long dataCenterId; // wight corresponding to this site - long weight = 1; + Long weight = 1l; - public SiteLoadBalancerConfig(boolean revoked, String serviceType, String servicePublicIp, String servicePort, long dataCenterId) { + public SiteLoadBalancerConfig(Boolean revoked, String serviceType, String servicePublicIp, String servicePort, Long dataCenterId) { this.revoked = revoked; this.serviceType = serviceType; this.servicePublicIp = servicePublicIp; @@ -58,8 +58,8 @@ public SiteLoadBalancerConfig(boolean revoked, String serviceType, String servic this.dataCenterId = dataCenterId; } - public SiteLoadBalancerConfig(String gslbProviderPublicIP, String gslbProviderPrivateIp, boolean local, boolean revoked, String serviceType, String servicePublicIp, - String port, long dataCenterId) { + public SiteLoadBalancerConfig(String gslbProviderPublicIP, String gslbProviderPrivateIp, Boolean local, Boolean revoked, String serviceType, String servicePublicIp, + String port, Long dataCenterId) { this(revoked, serviceType, servicePublicIp, port, dataCenterId); this.gslbProviderPrivateIp = gslbProviderPrivateIp; this.gslbProviderPublicIp = gslbProviderPublicIP; @@ -102,7 +102,7 @@ public String getGslbProviderPublicIp() { return gslbProviderPublicIp; } - public long getDataCenterId() { + public Long getDataCenterId() { return dataCenterId; } @@ -110,24 +110,24 @@ public void setGslbProviderPublicIp(String publicIp) { this.gslbProviderPublicIp = publicIp; } - public boolean isLocal() { + public Boolean isLocal() { return local; } - public void setLocal(boolean local) { + public void setLocal(Boolean local) { this.local = local; } - public boolean forRevoke() { + public Boolean forRevoke() { return revoked; } - public void setWeight(long weight) { + public void setWeight(Long weight) { assert (weight >= 1 && weight <= 100); this.weight = weight; } - public long getWeight() { + public Long getWeight() { return weight; } diff --git a/core/src/com/cloud/agent/api/routing/UserDataCommand.java b/core/src/com/cloud/agent/api/routing/UserDataCommand.java index c04bb170510e..cbdd6ba17257 100644 --- a/core/src/com/cloud/agent/api/routing/UserDataCommand.java +++ b/core/src/com/cloud/agent/api/routing/UserDataCommand.java @@ -25,18 +25,18 @@ public class UserDataCommand extends NetworkElementCommand { String vmIpAddress; String routerPrivateIpAddress; String vmName; - boolean executeInSequence = false; + Boolean executeInSequence = false; protected UserDataCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } - public UserDataCommand(String userData, String vmIpAddress, String routerPrivateIpAddress, String vmName, boolean executeInSequence) { + public UserDataCommand(String userData, String vmIpAddress, String routerPrivateIpAddress, String vmName, Boolean executeInSequence) { this.userData = userData; this.vmIpAddress = vmIpAddress; this.routerPrivateIpAddress = routerPrivateIpAddress; diff --git a/core/src/com/cloud/agent/api/routing/VmDataCommand.java b/core/src/com/cloud/agent/api/routing/VmDataCommand.java index c74c7cf7d884..e03e516a89e4 100644 --- a/core/src/com/cloud/agent/api/routing/VmDataCommand.java +++ b/core/src/com/cloud/agent/api/routing/VmDataCommand.java @@ -31,17 +31,17 @@ public class VmDataCommand extends NetworkElementCommand { String vmName; @LogLevel(Log4jLevel.Trace) List vmData; - boolean executeInSequence = false; + Boolean executeInSequence = false; protected VmDataCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } - public VmDataCommand(String vmIpAddress, boolean executeInSequence) { + public VmDataCommand(String vmIpAddress, Boolean executeInSequence) { this(vmIpAddress, null, executeInSequence); } @@ -49,7 +49,7 @@ public String getVmName() { return vmName; } - public VmDataCommand(String vmIpAddress, String vmName, boolean executeInSequence) { + public VmDataCommand(String vmIpAddress, String vmName, Boolean executeInSequence) { this.vmName = vmName; this.vmIpAddress = vmIpAddress; this.vmData = new ArrayList(); diff --git a/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java b/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java index 3510d14fad52..435eadb5244a 100644 --- a/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java +++ b/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java @@ -30,13 +30,13 @@ public static class UsernamePassword { private String username; @LogLevel(Log4jLevel.Off) private String password; - boolean add = true; + Boolean add = true; - public boolean isAdd() { + public Boolean isAdd() { return add; } - public void setAdd(boolean add) { + public void setAdd(Boolean add) { this.add = add; } @@ -62,7 +62,7 @@ public UsernamePassword(String username, String password) { this.password = password; } - public UsernamePassword(String username, String password, boolean add) { + public UsernamePassword(String username, String password, Boolean add) { super(); this.username = username; this.password = password; @@ -96,7 +96,7 @@ public VpnUsersCfgCommand(List addUsers, List removeUsers) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java b/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java index 0670eefd9449..e7cf2ed5e298 100644 --- a/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java +++ b/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java @@ -25,7 +25,7 @@ public abstract class AbstractDownloadCommand extends SsCommand { private String url; private ImageFormat format; - private long accountId; + private Long accountId; private String name; protected AbstractDownloadCommand() { @@ -63,12 +63,12 @@ public ImageFormat getFormat() { return format; } - public long getAccountId() { + public Long getAccountId() { return accountId; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java b/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java index b8e28ae04e4c..7432979eb583 100644 --- a/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java +++ b/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java @@ -25,13 +25,13 @@ public class AbstractUploadCommand extends StorageCommand { private String url; private ImageFormat format; - private long accountId; + private Long accountId; private String name; protected AbstractUploadCommand() { } - protected AbstractUploadCommand(String name, String url, ImageFormat format, long accountId) { + protected AbstractUploadCommand(String name, String url, ImageFormat format, Long accountId) { this.url = url; this.format = format; this.accountId = accountId; @@ -54,12 +54,12 @@ public ImageFormat getFormat() { return format; } - public long getAccountId() { + public Long getAccountId() { return accountId; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java index 4d84310c2e41..4e0f497c0d76 100644 --- a/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java +++ b/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java @@ -30,7 +30,7 @@ protected CopyVolumeAnswer() { super(); } - public CopyVolumeAnswer(Command command, boolean success, String details, String volumeFolder, String volumePath) { + public CopyVolumeAnswer(Command command, Boolean success, String details, String volumeFolder, String volumePath) { super(command, success, details); this.volumeFolder = volumeFolder; this.volumePath = volumePath; diff --git a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java index 43c84ee2bc0b..da0fb412da71 100644 --- a/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java +++ b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java @@ -25,19 +25,19 @@ public class CopyVolumeCommand extends Command { - long volumeId; + Long volumeId; String volumePath; StorageFilerTO pool; String secondaryStorageURL; - boolean toSecondaryStorage; + Boolean toSecondaryStorage; String vmName; - boolean executeInSequence = false; + Boolean executeInSequence = false; public CopyVolumeCommand() { } - public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait, - boolean executeInSequence) { + public CopyVolumeCommand(Long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, Boolean toSecondaryStorage, Integer wait, + Boolean executeInSequence) { this.volumeId = volumeId; this.volumePath = volumePath; this.pool = new StorageFilerTO(pool); @@ -48,7 +48,7 @@ public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, Str } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } @@ -56,7 +56,7 @@ public String getVolumePath() { return volumePath; } - public long getVolumeId() { + public Long getVolumeId() { return volumeId; } @@ -68,7 +68,7 @@ public String getSecondaryStorageURL() { return secondaryStorageURL; } - public boolean toSecondaryStorage() { + public Boolean toSecondaryStorage() { return toSecondaryStorage; } diff --git a/core/src/com/cloud/agent/api/storage/CreateAnswer.java b/core/src/com/cloud/agent/api/storage/CreateAnswer.java index acefb51bb2c3..e73366a25082 100644 --- a/core/src/com/cloud/agent/api/storage/CreateAnswer.java +++ b/core/src/com/cloud/agent/api/storage/CreateAnswer.java @@ -24,7 +24,7 @@ public class CreateAnswer extends Answer { VolumeTO volume; - boolean requestTemplateReload = false; + Boolean requestTemplateReload = false; protected CreateAnswer() { super(); @@ -39,7 +39,7 @@ public CreateAnswer(CreateCommand cmd, String details) { super(cmd, false, details); } - public CreateAnswer(CreateCommand cmd, String details, boolean requestTemplateReload) { + public CreateAnswer(CreateCommand cmd, String details, Boolean requestTemplateReload) { super(cmd, false, details); this.requestTemplateReload = requestTemplateReload; } @@ -52,7 +52,7 @@ public VolumeTO getVolume() { return volume; } - public boolean templateReloadRequested() { + public Boolean templateReloadRequested() { return requestTemplateReload; } } diff --git a/core/src/com/cloud/agent/api/storage/CreateCommand.java b/core/src/com/cloud/agent/api/storage/CreateCommand.java index 76480abb11ad..b47cdbc1b1ec 100644 --- a/core/src/com/cloud/agent/api/storage/CreateCommand.java +++ b/core/src/com/cloud/agent/api/storage/CreateCommand.java @@ -25,11 +25,11 @@ import com.cloud.vm.DiskProfile; public class CreateCommand extends Command { - private long volId; + private Long volId; private StorageFilerTO pool; private DiskProfile diskCharacteristics; private String templateUrl; - boolean executeInSequence = false; + Boolean executeInSequence = false; protected CreateCommand() { super(); @@ -44,7 +44,7 @@ protected CreateCommand() { * @param vol * @param vm */ - public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StorageFilerTO pool, boolean executeInSequence) { + public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StorageFilerTO pool, Boolean executeInSequence) { this(diskCharacteristics, pool, executeInSequence); this.templateUrl = templateUrl; this.executeInSequence = executeInSequence; @@ -58,7 +58,7 @@ public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, Storag * @param vol * @param vm */ - public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool, boolean executeInSequence) { + public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool, Boolean executeInSequence) { this.volId = diskCharacteristics.getVolumeId(); this.diskCharacteristics = diskCharacteristics; this.pool = pool; @@ -66,17 +66,17 @@ public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool, boole this.executeInSequence = executeInSequence; } - public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StoragePool pool, boolean executeInSequence) { + public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StoragePool pool, Boolean executeInSequence) { this(diskCharacteristics, templateUrl, new StorageFilerTO(pool), executeInSequence); } - public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool, boolean executeInSequence) { + public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool, Boolean executeInSequence) { this(diskCharacteristics, new StorageFilerTO(pool), executeInSequence); this.executeInSequence = executeInSequence; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } @@ -92,7 +92,7 @@ public DiskProfile getDiskCharacteristics() { return diskCharacteristics; } - public long getVolumeId() { + public Long getVolumeId() { return volId; } diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java index cdcb3c0445af..ab5d774e90d4 100644 --- a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java +++ b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java @@ -24,11 +24,11 @@ public class CreateEntityDownloadURLAnswer extends Answer { String resultString; - short resultCode; + Short resultCode; public static final short RESULT_SUCCESS = 1; public static final short RESULT_FAILURE = 0; - public CreateEntityDownloadURLAnswer(String resultString, short resultCode) { + public CreateEntityDownloadURLAnswer(String resultString, Short resultCode) { super(); this.resultString = resultString; this.resultCode = resultCode; diff --git a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java index c84eceb0ca2f..5189e9b4ee70 100644 --- a/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java +++ b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java @@ -55,7 +55,7 @@ public void setData(DataTO data) { private DataTO data; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java index e04537f2b302..49dc58a95d41 100644 --- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java +++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java @@ -25,8 +25,8 @@ public class CreatePrivateTemplateAnswer extends Answer { private String _path; - private long _virtualSize; - private long _physicalSize; + private Long _virtualSize; + private Long _physicalSize; private String _uniqueName; private ImageFormat _format; @@ -34,7 +34,7 @@ public CreatePrivateTemplateAnswer() { super(); } - public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, long physicalSize, String uniqueName, + public CreatePrivateTemplateAnswer(Command cmd, Boolean success, String result, String path, Long virtualSize, Long physicalSize, String uniqueName, ImageFormat format) { super(cmd, success, result); _path = path; @@ -44,7 +44,7 @@ public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, _format = format; } - public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result) { + public CreatePrivateTemplateAnswer(Command cmd, Boolean success, String result) { super(cmd, success, result); } @@ -56,19 +56,19 @@ public void setPath(String path) { _path = path; } - public long getVirtualSize() { + public Long getVirtualSize() { return _virtualSize; } - public void setVirtualSize(long virtualSize) { + public void setVirtualSize(Long virtualSize) { _virtualSize = virtualSize; } - public void setphysicalSize(long physicalSize) { + public void setphysicalSize(Long physicalSize) { this._physicalSize = physicalSize; } - public long getphysicalSize() { + public Long getphysicalSize() { return _physicalSize; } diff --git a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java index b636dabea43e..cd461a67a14f 100644 --- a/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java +++ b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java @@ -25,8 +25,8 @@ public class CreatePrivateTemplateCommand extends StorageCommand { private String _userFolder; private String _userSpecifiedName; private String _uniqueName; - private long _templateId; - private long _accountId; + private Long _templateId; + private Long _accountId; // For XenServer private String _secondaryStorageURL; @@ -35,8 +35,8 @@ public class CreatePrivateTemplateCommand extends StorageCommand { public CreatePrivateTemplateCommand() { } - public CreatePrivateTemplateCommand(String secondaryStorageURL, long templateId, long accountId, String userSpecifiedName, String uniqueName, String snapshotFolder, - String snapshotPath, String snapshotName, String userFolder) { + public CreatePrivateTemplateCommand(String secondaryStorageURL, Long templateId, Long accountId, String userSpecifiedName, + String uniqueName, String snapshotFolder, String snapshotPath, String snapshotName, String userFolder) { _secondaryStorageURL = secondaryStorageURL; _templateId = templateId; _accountId = accountId; @@ -49,7 +49,7 @@ public CreatePrivateTemplateCommand(String secondaryStorageURL, long templateId, } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -81,15 +81,15 @@ public String getUserFolder() { return _userFolder; } - public long getTemplateId() { + public Long getTemplateId() { return _templateId; } - public long getAccountId() { + public Long getAccountId() { return _accountId; } - public void setTemplateId(long templateId) { + public void setTemplateId(Long templateId) { _templateId = templateId; } } diff --git a/core/src/com/cloud/agent/api/storage/DestroyAnswer.java b/core/src/com/cloud/agent/api/storage/DestroyAnswer.java index 4af320a3904f..a25aa3faec67 100644 --- a/core/src/com/cloud/agent/api/storage/DestroyAnswer.java +++ b/core/src/com/cloud/agent/api/storage/DestroyAnswer.java @@ -22,7 +22,7 @@ import com.cloud.agent.api.Answer; public class DestroyAnswer extends Answer { - public DestroyAnswer(DestroyCommand cmd, boolean result, String details) { + public DestroyAnswer(DestroyCommand cmd, Boolean result, String details) { super(cmd, result, details); } diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java index dea8190ef12d..b243a7109b3d 100644 --- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java +++ b/core/src/com/cloud/agent/api/storage/DestroyCommand.java @@ -52,7 +52,7 @@ public String getVmName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/storage/DownloadAnswer.java b/core/src/com/cloud/agent/api/storage/DownloadAnswer.java index fdc47b4c99f3..2185d390ef83 100644 --- a/core/src/com/cloud/agent/api/storage/DownloadAnswer.java +++ b/core/src/com/cloud/agent/api/storage/DownloadAnswer.java @@ -28,20 +28,20 @@ public class DownloadAnswer extends Answer { private String jobId; - private int downloadPct; + private Integer downloadPct; private String errorString; private VMTemplateStorageResourceAssoc.Status downloadStatus; private String downloadPath; private String installPath; - private long templateSize = 0L; - private long templatePhySicalSize = 0L; + private Long templateSize = 0L; + private Long templatePhySicalSize = 0L; private String checkSum; public String getCheckSum() { return checkSum; } - public int getDownloadPct() { + public Integer getDownloadPct() { return downloadPct; } @@ -81,8 +81,8 @@ public DownloadAnswer(String errorString, Status status) { this.details = errorString; } - public DownloadAnswer(String jobId, int downloadPct, String errorString, Status downloadStatus, String fileSystemPath, String installPath, long templateSize, - long templatePhySicalSize, String checkSum) { + public DownloadAnswer(String jobId, Integer downloadPct, String errorString, Status downloadStatus, String fileSystemPath, + String installPath, Long templateSize, Long templatePhySicalSize, String checkSum) { super(); this.jobId = jobId; this.downloadPct = downloadPct; @@ -96,7 +96,8 @@ public DownloadAnswer(String jobId, int downloadPct, String errorString, Status this.checkSum = checkSum; } - public DownloadAnswer(String jobId, int downloadPct, Command command, Status downloadStatus, String fileSystemPath, String installPath) { + public DownloadAnswer(String jobId, Integer downloadPct, Command command, Status downloadStatus, String fileSystemPath, + String installPath) { super(command); this.jobId = jobId; this.downloadPct = downloadPct; @@ -130,7 +131,7 @@ public void setInstallPath(String installPath) { this.installPath = fixPath(installPath); } - public void setTemplateSize(long templateSize) { + public void setTemplateSize(Long templateSize) { this.templateSize = templateSize; } @@ -138,11 +139,11 @@ public Long getTemplateSize() { return templateSize; } - public void setTemplatePhySicalSize(long templatePhySicalSize) { + public void setTemplatePhySicalSize(Long templatePhySicalSize) { this.templatePhySicalSize = templatePhySicalSize; } - public long getTemplatePhySicalSize() { + public Long getTemplatePhySicalSize() { return templatePhySicalSize; } diff --git a/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java b/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java index 855095280d7d..c95ecd31a158 100644 --- a/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java +++ b/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java @@ -31,20 +31,14 @@ public ListTemplateCommand() { public ListTemplateCommand(DataStoreTO store) { this.store = store; -// this.secUrl = url; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } public DataStoreTO getDataStore() { return store; } - - // public String getSecUrl() { - // return secUrl; - // } - } diff --git a/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java b/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java index 355060951ac8..a7cf0aa87dca 100644 --- a/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java +++ b/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java @@ -35,7 +35,7 @@ public ListVolumeCommand(DataStoreTO store, String secUrl) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java index c1a71d21c553..8ea694fc3f0e 100644 --- a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java +++ b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java @@ -28,7 +28,7 @@ protected ManageVolumeAvailabilityAnswer() { super(); } - public ManageVolumeAvailabilityAnswer(Command command, boolean success, String details) { + public ManageVolumeAvailabilityAnswer(Command command, Boolean success, String details) { super(command, success, details); } diff --git a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java index 0cd402c938d1..d304e54e3727 100644 --- a/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java +++ b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java @@ -23,25 +23,25 @@ public class ManageVolumeAvailabilityCommand extends Command { - boolean attach; + Boolean attach; String primaryStorageSRUuid; String volumeUuid; public ManageVolumeAvailabilityCommand() { } - public ManageVolumeAvailabilityCommand(boolean attach, String primaryStorageSRUuid, String volumeUuid) { + public ManageVolumeAvailabilityCommand(Boolean attach, String primaryStorageSRUuid, String volumeUuid) { this.attach = attach; this.primaryStorageSRUuid = primaryStorageSRUuid; this.volumeUuid = volumeUuid; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } - public boolean getAttach() { + public Boolean getAttach() { return attach; } diff --git a/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java index 5e7200add13b..61a057a78f09 100644 --- a/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java +++ b/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java @@ -26,7 +26,7 @@ public class MigrateVolumeAnswer extends Answer { private String volumePath; private String volumeChain; - public MigrateVolumeAnswer(Command command, boolean success, String details, String volumePath) { + public MigrateVolumeAnswer(Command command, Boolean success, String details, String volumePath) { super(command, success, details); this.volumePath = volumePath; } diff --git a/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java b/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java index b409944b77f1..1a14897b681a 100644 --- a/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java +++ b/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java @@ -26,20 +26,20 @@ public class MigrateVolumeCommand extends Command { - long volumeId; + Long volumeId; String volumePath; StorageFilerTO pool; String attachedVmName; Volume.Type volumeType; - public MigrateVolumeCommand(long volumeId, String volumePath, StoragePool pool, int timeout) { + public MigrateVolumeCommand(Long volumeId, String volumePath, StoragePool pool, Integer timeout) { this.volumeId = volumeId; this.volumePath = volumePath; this.pool = new StorageFilerTO(pool); this.setWait(timeout); } - public MigrateVolumeCommand(long volumeId, String volumePath, StoragePool pool, String attachedVmName, Volume.Type volumeType, int timeout) { + public MigrateVolumeCommand(Long volumeId, String volumePath, StoragePool pool, String attachedVmName, Volume.Type volumeType, Integer timeout) { this.volumeId = volumeId; this.volumePath = volumePath; this.pool = new StorageFilerTO(pool); @@ -49,7 +49,7 @@ public MigrateVolumeCommand(long volumeId, String volumePath, StoragePool pool, } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } @@ -57,7 +57,7 @@ public String getVolumePath() { return volumePath; } - public long getVolumeId() { + public Long getVolumeId() { return volumeId; } diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java index bde1188a733d..d92ead7847f3 100644 --- a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java +++ b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java @@ -23,7 +23,7 @@ public class PrimaryStorageDownloadAnswer extends Answer { private String installPath; - private long templateSize = 0L; + private Long templateSize = 0L; protected PrimaryStorageDownloadAnswer() { super(); @@ -33,7 +33,7 @@ public PrimaryStorageDownloadAnswer(String detail) { super(null, false, detail); } - public PrimaryStorageDownloadAnswer(String installPath, long templateSize) { + public PrimaryStorageDownloadAnswer(String installPath, Long templateSize) { super(null); this.installPath = installPath; this.templateSize = templateSize; @@ -47,7 +47,7 @@ public void setInstallPath(String installPath) { this.installPath = installPath; } - public void setTemplateSize(long templateSize) { + public void setTemplateSize(Long templateSize) { this.templateSize = templateSize; } diff --git a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java index ce8ed217a562..74a5c13b16a2 100644 --- a/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java +++ b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java @@ -29,7 +29,7 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand { String localPath; String poolUuid; - long poolId; + Long poolId; StorageFilerTO primaryPool; @@ -39,7 +39,7 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand { protected PrimaryStorageDownloadCommand() { } - public PrimaryStorageDownloadCommand(final String name, final String url, final ImageFormat format, final long accountId, final StoragePool pool, final int wait) { + public PrimaryStorageDownloadCommand(final String name, final String url, final ImageFormat format, final Long accountId, final StoragePool pool, final Integer wait) { super(name, url, format, accountId); poolId = pool.getId(); poolUuid = pool.getUuid(); @@ -51,7 +51,7 @@ public String getPoolUuid() { return poolUuid; } - public long getPoolId() { + public Long getPoolId() { return poolId; } @@ -84,7 +84,7 @@ public String getPrimaryStorageUrl() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java index bf3e69290e86..49e1f330b7a3 100644 --- a/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java +++ b/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java @@ -22,22 +22,22 @@ import com.cloud.agent.api.Answer; public class ResizeVolumeAnswer extends Answer { - private long newSize; + private Long newSize; protected ResizeVolumeAnswer() { super(); } - public ResizeVolumeAnswer(ResizeVolumeCommand cmd, boolean result, String details, long newSize) { + public ResizeVolumeAnswer(ResizeVolumeCommand cmd, Boolean result, String details, Long newSize) { super(cmd, result, details); this.newSize = newSize; } - public ResizeVolumeAnswer(ResizeVolumeCommand cmd, boolean result, String details) { + public ResizeVolumeAnswer(ResizeVolumeCommand cmd, Boolean result, String details) { super(cmd, result, details); } - public long getNewSize() { + public Long getNewSize() { return newSize; } } diff --git a/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java b/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java index 3b121e1a54df..eed11240d9e9 100644 --- a/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java +++ b/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java @@ -28,13 +28,13 @@ public class ResizeVolumeCommand extends Command { private String vmInstance; private Long newSize; private Long currentSize; - private boolean shrinkOk; + private Boolean shrinkOk; protected ResizeVolumeCommand() { } - public ResizeVolumeCommand(String path, StorageFilerTO pool, Long currentSize, Long newSize, boolean shrinkOk, String vmInstance) { + public ResizeVolumeCommand(String path, StorageFilerTO pool, Long currentSize, Long newSize, Boolean shrinkOk, String vmInstance) { this.path = path; this.pool = pool; this.vmInstance = vmInstance; @@ -55,15 +55,15 @@ public StorageFilerTO getPool() { return pool; } - public long getNewSize() { + public Long getNewSize() { return newSize; } - public long getCurrentSize() { + public Long getCurrentSize() { return currentSize; } - public boolean getShrinkOk() { + public Boolean getShrinkOk() { return shrinkOk; } @@ -75,7 +75,7 @@ public String getInstanceName() { * {@inheritDoc} */ @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/com/cloud/agent/api/storage/SsCommand.java b/core/src/com/cloud/agent/api/storage/SsCommand.java index 187ae03be4cb..e509a614d19e 100644 --- a/core/src/com/cloud/agent/api/storage/SsCommand.java +++ b/core/src/com/cloud/agent/api/storage/SsCommand.java @@ -36,7 +36,7 @@ public SsCommand(String secUrl) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java b/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java index d57625b9aaed..b842f7f5a33c 100644 --- a/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java +++ b/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java @@ -28,7 +28,7 @@ public UpgradeDiskAnswer() { super(); } - public UpgradeDiskAnswer(Command cmd, boolean success, String details) { + public UpgradeDiskAnswer(Command cmd, Boolean success, String details) { super(cmd, success, details); } } diff --git a/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java b/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java index 49d63becc8ed..8092278d8421 100644 --- a/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java +++ b/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java @@ -49,7 +49,7 @@ public void setNewSize(String newSize) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/core/src/com/cloud/agent/api/storage/UploadAnswer.java b/core/src/com/cloud/agent/api/storage/UploadAnswer.java index 6acbdbe2410c..b99e2440afeb 100644 --- a/core/src/com/cloud/agent/api/storage/UploadAnswer.java +++ b/core/src/com/cloud/agent/api/storage/UploadAnswer.java @@ -28,14 +28,14 @@ public class UploadAnswer extends Answer { private String jobId; - private int uploadPct; + private Integer uploadPct; private String errorString; private Upload.Status uploadStatus; private String uploadPath; private String installPath; public Long templateSize = 0L; - public int getUploadPct() { + public Integer getUploadPct() { return uploadPct; } @@ -71,7 +71,7 @@ public void setJobId(String jobId) { this.jobId = jobId; } - public UploadAnswer(String jobId, int uploadPct, String errorString, Upload.Status uploadStatus, String fileSystemPath, String installPath, long templateSize) { + public UploadAnswer(String jobId, Integer uploadPct, String errorString, Upload.Status uploadStatus, String fileSystemPath, String installPath, Long templateSize) { super(); this.jobId = jobId; this.uploadPct = uploadPct; @@ -83,7 +83,7 @@ public UploadAnswer(String jobId, int uploadPct, String errorString, Upload.Stat this.templateSize = templateSize; } - public UploadAnswer(String jobId, int uploadPct, Command command, Upload.Status uploadStatus, String fileSystemPath, String installPath) { + public UploadAnswer(String jobId, Integer uploadPct, Command command, Upload.Status uploadStatus, String fileSystemPath, String installPath) { super(command); this.jobId = jobId; this.uploadPct = uploadPct; @@ -117,7 +117,7 @@ public void setInstallPath(String installPath) { this.installPath = fixPath(installPath); } - public void setTemplateSize(long templateSize) { + public void setTemplateSize(Long templateSize) { this.templateSize = templateSize; } diff --git a/core/src/com/cloud/agent/api/storage/UploadCommand.java b/core/src/com/cloud/agent/api/storage/UploadCommand.java index 6160f2ea2f99..d6aa5ed339a2 100644 --- a/core/src/com/cloud/agent/api/storage/UploadCommand.java +++ b/core/src/com/cloud/agent/api/storage/UploadCommand.java @@ -30,15 +30,15 @@ public class UploadCommand extends AbstractUploadCommand implements InternalIden private TemplateTO template; private String url; private String installPath; - private boolean hvm; + private Boolean hvm; private String description; private String checksum; private PasswordAuth auth; - private long templateSizeInBytes; - private long id; + private Long templateSizeInBytes; + private Long id; private Type type; - public UploadCommand(VirtualMachineTemplate template, String url, String installPath, long sizeInBytes) { + public UploadCommand(VirtualMachineTemplate template, String url, String installPath, Long sizeInBytes) { this.template = new TemplateTO(template); this.url = url; @@ -49,7 +49,7 @@ public UploadCommand(VirtualMachineTemplate template, String url, String install } - public UploadCommand(String url, long id, long sizeInBytes, String installPath, Type type) { + public UploadCommand(String url, Long id, Long sizeInBytes, String installPath, Type type) { template = null; this.url = url; this.installPath = installPath; @@ -91,11 +91,11 @@ public void setUrl(String url) { this.url = url; } - public boolean isHvm() { + public Boolean isHvm() { return hvm; } - public void setHvm(boolean hvm) { + public void setHvm(Boolean hvm) { this.hvm = hvm; } @@ -116,11 +116,11 @@ public void setTemplateSizeInBytes(Long templateSizeInBytes) { } @Override - public long getId() { + public Long getId() { return id; } - public void setId(long id) { + public void setId(Long id) { this.id = id; } diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java b/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java index 0543094795c4..0eb9aea7dd6b 100644 --- a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java @@ -42,13 +42,13 @@ public FirewallRule() { // Empty constructor for (de)serialization } - public FirewallRule(long id, String srcVlanTag, String srcIp, String protocol, int[] srcPortRange, boolean revoked, boolean alreadyAdded, List sourceCidrList, + public FirewallRule(long id, String srcVlanTag, String srcIp, String protocol, Integer[] srcPortRange, boolean revoked, boolean alreadyAdded, List sourceCidrList, String purpose, Integer icmpType, Integer icmpCode, String trafficType, String guestCidr, boolean defaultEgressPolicy) { this.id = id; this.srcVlanTag = srcVlanTag; this.srcIp = srcIp; this.protocol = protocol; - this.srcPortRange = srcPortRange; + this.srcPortRange = new int[] {srcPortRange[0], srcPortRange[1]}; this.revoked = revoked; this.alreadyAdded = alreadyAdded; this.sourceCidrList = sourceCidrList; diff --git a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java b/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java deleted file mode 100644 index aff28a455a4b..000000000000 --- a/core/src/com/cloud/agent/transport/ArrayTypeAdaptor.java +++ /dev/null @@ -1,87 +0,0 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - -package com.cloud.agent.transport; - -import java.lang.reflect.Array; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; - -import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; - -import com.cloud.utils.exception.CloudRuntimeException; - -public class ArrayTypeAdaptor implements JsonDeserializer, JsonSerializer { - - protected Gson _gson = null; - - public ArrayTypeAdaptor() { - } - - public void initGson(Gson gson) { - _gson = gson; - } - - @Override - public JsonElement serialize(T[] src, Type typeOfSrc, JsonSerializationContext context) { - JsonArray array = new JsonArray(); - for (T cmd : src) { - JsonObject obj = new JsonObject(); - obj.add(cmd.getClass().getName(), _gson.toJsonTree(cmd)); - array.add(obj); - } - - return array; - } - - @Override - @SuppressWarnings("unchecked") - public T[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - JsonArray array = json.getAsJsonArray(); - Iterator it = array.iterator(); - ArrayList cmds = new ArrayList(); - while (it.hasNext()) { - JsonObject element = (JsonObject)it.next(); - Map.Entry entry = element.entrySet().iterator().next(); - - String name = entry.getKey(); - Class clazz; - try { - clazz = Class.forName(name); - } catch (ClassNotFoundException e) { - throw new CloudRuntimeException("can't find " + name); - } - T cmd = (T)_gson.fromJson(entry.getValue(), clazz); - cmds.add(cmd); - } - Class type = ((Class)typeOfT).getComponentType(); - T[] ts = (T[])Array.newInstance(type, cmds.size()); - return cmds.toArray(ts); - } -} \ No newline at end of file diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java index 7b8dd0dc0c0f..6ee65de6ec7b 100644 --- a/core/src/com/cloud/agent/transport/Request.java +++ b/core/src/com/cloud/agent/transport/Request.java @@ -225,7 +225,7 @@ public void setVia(long viaId) { _via = viaId; } - public boolean executeInSequence() { + public Boolean executeInSequence() { return (_flags & FLAG_IN_SEQUENCE) > 0; } diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java index 610190ae7cca..73da02808cdf 100644 --- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java +++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java @@ -222,7 +222,7 @@ private DirectNetworkUsageAnswer getPublicIpBytesSentAndReceived(DirectNetworkUs String publicIp = st.nextToken(); Long bytesSent = new Long(st.nextToken()); Long bytesRcvd = new Long(st.nextToken()); - long[] bytesSentAndReceived = new long[2]; + Long[] bytesSentAndReceived = new Long[2]; bytesSentAndReceived[0] = bytesSent; bytesSentAndReceived[1] = bytesRcvd; answer.put(publicIp, bytesSentAndReceived); diff --git a/core/src/com/cloud/serializer/GsonHelper.java b/core/src/com/cloud/serializer/GsonHelper.java index 7ac85d393178..3b25417a0a62 100644 --- a/core/src/com/cloud/serializer/GsonHelper.java +++ b/core/src/com/cloud/serializer/GsonHelper.java @@ -21,8 +21,12 @@ import java.util.List; +import org.apache.cloudstack.agent.transport.AnswerArrayTypeAdaptor; +import org.apache.cloudstack.agent.transport.CommandArrayTypeAdaptor; +import org.apache.cloudstack.agent.transport.CommandTypeAdaptor; import org.apache.log4j.Logger; +import com.google.gson.ExclusionStrategy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; @@ -32,7 +36,6 @@ import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig; import com.cloud.agent.api.to.DataStoreTO; import com.cloud.agent.api.to.DataTO; -import com.cloud.agent.transport.ArrayTypeAdaptor; import com.cloud.agent.transport.InterfaceTypeAdaptor; import com.cloud.agent.transport.LoggingExclusionStrategy; import com.cloud.agent.transport.Request.NwGroupsCommandTypeAdaptor; @@ -44,13 +47,15 @@ public class GsonHelper { protected static final Gson s_gson; protected static final Gson s_gogger; + private static final ExclusionStrategy excluder; static { GsonBuilder gsonBuilder = new GsonBuilder(); s_gson = setDefaultGsonConfig(gsonBuilder); GsonBuilder loggerBuilder = new GsonBuilder(); loggerBuilder.disableHtmlEscaping(); - loggerBuilder.setExclusionStrategies(new LoggingExclusionStrategy(s_logger)); + excluder = new LoggingExclusionStrategy(s_logger); + loggerBuilder.setExclusionStrategies(getExcluder()); s_gogger = setDefaultGsonConfig(loggerBuilder); s_logger.info("Default Builder inited."); } @@ -61,10 +66,12 @@ static Gson setDefaultGsonConfig(GsonBuilder builder) { builder.registerTypeAdapter(DataStoreTO.class, dsAdaptor); InterfaceTypeAdaptor dtAdaptor = new InterfaceTypeAdaptor(); builder.registerTypeAdapter(DataTO.class, dtAdaptor); - ArrayTypeAdaptor cmdAdaptor = new ArrayTypeAdaptor(); - builder.registerTypeAdapter(Command[].class, cmdAdaptor); - ArrayTypeAdaptor ansAdaptor = new ArrayTypeAdaptor(); - builder.registerTypeAdapter(Answer[].class, ansAdaptor); + CommandArrayTypeAdaptor cmdsAdaptor = new CommandArrayTypeAdaptor(); + builder.registerTypeAdapter(Command[].class, cmdsAdaptor); + CommandTypeAdaptor cmdAdaptor = new CommandTypeAdaptor(); + builder.registerTypeAdapter(Command.class, cmdAdaptor); + AnswerArrayTypeAdaptor anssAdaptor = new AnswerArrayTypeAdaptor(); + builder.registerTypeAdapter(Answer[].class, anssAdaptor); builder.registerTypeAdapter(new TypeToken>() { }.getType(), new PortConfigListTypeAdaptor()); builder.registerTypeAdapter(new TypeToken>() { @@ -72,8 +79,9 @@ static Gson setDefaultGsonConfig(GsonBuilder builder) { Gson gson = builder.create(); dsAdaptor.initGson(gson); dtAdaptor.initGson(gson); + cmdsAdaptor.initGson(gson); cmdAdaptor.initGson(gson); - ansAdaptor.initGson(gson); + anssAdaptor.initGson(gson); return gson; } @@ -88,4 +96,8 @@ public final static Gson getGsonLogger() { public final static Logger getLogger() { return s_logger; } + + public static ExclusionStrategy getExcluder() { + return excluder; + } } diff --git a/core/src/com/cloud/storage/template/LocalTemplateDownloader.java b/core/src/com/cloud/storage/template/LocalTemplateDownloader.java index 3d33a214276a..564eba3d5ee1 100644 --- a/core/src/com/cloud/storage/template/LocalTemplateDownloader.java +++ b/core/src/com/cloud/storage/template/LocalTemplateDownloader.java @@ -38,7 +38,7 @@ public class LocalTemplateDownloader extends TemplateDownloaderBase implements T public LocalTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, long maxTemplateSizeInBytes, DownloadCompleteCallback callback) { super(storageLayer, downloadUrl, toDir, maxTemplateSizeInBytes, callback); - String filename = downloadUrl.substring(downloadUrl.lastIndexOf(File.separator)); + String filename = new File(downloadUrl).getName(); _toFile = toDir.endsWith(File.separator) ? (toDir + filename) : (toDir + File.separator + filename); } diff --git a/core/src/org/apache/cloudstack/agent/transport/AnswerArrayTypeAdaptor.java b/core/src/org/apache/cloudstack/agent/transport/AnswerArrayTypeAdaptor.java new file mode 100644 index 000000000000..c618e127d33b --- /dev/null +++ b/core/src/org/apache/cloudstack/agent/transport/AnswerArrayTypeAdaptor.java @@ -0,0 +1,38 @@ +package org.apache.cloudstack.agent.transport; + +import java.io.IOException; +import java.lang.reflect.Array; + +import com.cloud.agent.api.Answer; +import com.cloud.serializer.GsonHelper; +import com.google.gson.ExclusionStrategy; +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonWriter; + +public class AnswerArrayTypeAdaptor extends GenericArrayTypeAdaptor { + + @Override + protected Answer[] newArray(int size) { + Answer[] answers = (Answer[])Array.newInstance(Answer.class, size); + return answers; + } + public void initGson(Gson gson) { + _gson = gson; + _adaptor = _gson.getAdapter(Answer.class); + } + TypeAdapter _adaptor; + + @Override + protected void writeElement(JsonWriter out, Answer elem) throws IOException { + // get the gsonHelper. + ExclusionStrategy excluder = GsonHelper.getExcluder(); + if (!excluder.shouldSkipClass(elem.getClass())) { + out.beginObject(); + out.name(elem.getClass().getCanonicalName()); + _adaptor.write(out,elem); + out.endObject(); + } + } + +} diff --git a/core/src/org/apache/cloudstack/agent/transport/CommandArrayTypeAdaptor.java b/core/src/org/apache/cloudstack/agent/transport/CommandArrayTypeAdaptor.java new file mode 100644 index 000000000000..9d03d23a3c15 --- /dev/null +++ b/core/src/org/apache/cloudstack/agent/transport/CommandArrayTypeAdaptor.java @@ -0,0 +1,37 @@ +package org.apache.cloudstack.agent.transport; + +import java.io.IOException; +import java.lang.reflect.Array; + +import com.cloud.agent.api.Command; +import com.cloud.serializer.GsonHelper; +import com.google.gson.ExclusionStrategy; +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonWriter; + +public class CommandArrayTypeAdaptor extends GenericArrayTypeAdaptor { + + @Override + protected Command[] newArray(int size) { + Command[] commands = (Command[])Array.newInstance(Command.class, size); + return commands; + } + public void initGson(Gson gson) { + _gson = gson; + _adaptor = _gson.getAdapter(Command.class); + } + TypeAdapter _adaptor; + + @Override + protected void writeElement(JsonWriter out, Command elem) throws IOException { + // get the gsonHelper. + ExclusionStrategy excluder = GsonHelper.getExcluder(); + if (!excluder.shouldSkipClass(elem.getClass())) { + out.beginObject(); + _adaptor.write(out,elem); + out.endObject(); + } + } + +} diff --git a/core/src/org/apache/cloudstack/agent/transport/CommandTypeAdaptor.java b/core/src/org/apache/cloudstack/agent/transport/CommandTypeAdaptor.java new file mode 100644 index 000000000000..dd8641518e58 --- /dev/null +++ b/core/src/org/apache/cloudstack/agent/transport/CommandTypeAdaptor.java @@ -0,0 +1,52 @@ +package org.apache.cloudstack.agent.transport; + +import java.io.IOException; + +import com.cloud.agent.api.Command; +import com.cloud.utils.exception.CloudRuntimeException; +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; + +public class CommandTypeAdaptor extends TypeAdapter { + protected Gson _gson = null; + + public void initGson(Gson gson) { + _gson = gson; + } + + @Override + public void write(JsonWriter out, Command cmd) throws IOException { + // TODO Auto-generated method stub + String data = _gson.toJson(cmd); + out.name(cmd.getClass().getCanonicalName()); + if(data != null && !data.equals("null")) { + out.jsonValue(data); + } else { + out.nullValue(); + } + } + + @Override + public Command read(JsonReader in) throws IOException { + if (in.peek() == JsonToken.NULL) { + in.nextNull(); + return null; + } + in.beginObject(); + String tiep = in.nextName(); + Command cmd; + try { + @SuppressWarnings("unchecked") + Class clz = (Class)Class.forName(tiep); + cmd = _gson.fromJson(in, clz); + } catch (ClassNotFoundException e) { + throw new CloudRuntimeException("deserializing json failed, couldn't load " + tiep, e); + } + in.endObject(); + return cmd; + } + +} diff --git a/core/src/org/apache/cloudstack/agent/transport/GenericArrayTypeAdaptor.java b/core/src/org/apache/cloudstack/agent/transport/GenericArrayTypeAdaptor.java new file mode 100644 index 000000000000..fb0bc2b52f68 --- /dev/null +++ b/core/src/org/apache/cloudstack/agent/transport/GenericArrayTypeAdaptor.java @@ -0,0 +1,64 @@ +package org.apache.cloudstack.agent.transport; + +import java.io.IOException; +import java.util.ArrayList; + +import com.cloud.utils.exception.CloudRuntimeException; +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; + +public abstract class GenericArrayTypeAdaptor extends TypeAdapter { + protected Gson _gson = null; + + public GenericArrayTypeAdaptor() { + } + + public void initGson(Gson gson) { + _gson = gson; + } + + @Override + public void write(JsonWriter out, T[] value) throws IOException { + if (value == null) { + out.nullValue(); + return; + } + out.beginArray(); + for (T elem : (T[])value) { + writeElement(out, elem); + } + out.endArray(); + } + + @Override + public T[] read(JsonReader in) throws IOException { + if (in.peek() == JsonToken.NULL) { + in.nextNull(); + return null; + } + ArrayList arry = new ArrayList(); + in.beginArray(); + while (in.hasNext()) { + in.beginObject(); + String tiep = in.nextName(); + try { + @SuppressWarnings("unchecked") + Class clz = (Class)Class.forName(tiep); + T t = _gson.fromJson(in, clz); + arry.add(t); + } catch (ClassNotFoundException e) { + throw new CloudRuntimeException("deserializing json failed, couldn't load " + tiep, e); + } + in.endObject(); + } + in.endArray(); + T[] result = newArray(arry.size()); + result = arry.toArray(result); + return result; + } + abstract protected T[] newArray(int size); + abstract protected void writeElement(JsonWriter out, T elem) throws IOException; +} diff --git a/core/src/org/apache/cloudstack/storage/command/AttachCommand.java b/core/src/org/apache/cloudstack/storage/command/AttachCommand.java index 34aaac927785..4a3fa70f8d4d 100644 --- a/core/src/org/apache/cloudstack/storage/command/AttachCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/AttachCommand.java @@ -24,7 +24,7 @@ public final class AttachCommand extends StorageSubSystemCommand { private DiskTO disk; private String vmName; - private boolean inSeq; + private Boolean inSeq; public AttachCommand(final DiskTO disk, final String vmName) { super(); @@ -33,7 +33,7 @@ public AttachCommand(final DiskTO disk, final String vmName) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -54,7 +54,7 @@ public void setVmName(final String vmName) { } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { this.inSeq = inSeq; } } diff --git a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java index 0c1f1708578e..529732667d82 100644 --- a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java +++ b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreAnswer.java @@ -24,8 +24,8 @@ public class AttachPrimaryDataStoreAnswer extends Answer { private String uuid; - private long capacity; - private long avail; + private Long capacity; + private Long avail; public AttachPrimaryDataStoreAnswer(Command cmd) { super(cmd); @@ -39,19 +39,19 @@ public String getUuid() { return uuid; } - public void setCapacity(long capacity) { + public void setCapacity(Long capacity) { this.capacity = capacity; } - public long getCapacity() { + public Long getCapacity() { return capacity; } - public void setAvailable(long avail) { + public void setAvailable(Long avail) { this.avail = avail; } - public long getAvailable() { + public Long getAvailable() { return avail; } } diff --git a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java index 9f4d14eb7ab8..348edf7c35c4 100644 --- a/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java +++ b/core/src/org/apache/cloudstack/storage/command/AttachPrimaryDataStoreCmd.java @@ -22,7 +22,7 @@ public final class AttachPrimaryDataStoreCmd extends StorageSubSystemCommand { @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { } @@ -38,7 +38,7 @@ public String getDataStore() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/core/src/org/apache/cloudstack/storage/command/CopyCommand.java b/core/src/org/apache/cloudstack/storage/command/CopyCommand.java index f1895a4ae519..e737a2d67916 100644 --- a/core/src/org/apache/cloudstack/storage/command/CopyCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/CopyCommand.java @@ -28,11 +28,11 @@ public final class CopyCommand extends StorageSubSystemCommand { private DataTO srcTO; private DataTO destTO; private DataTO cacheTO; - private boolean executeInSequence = false; + private Boolean executeInSequence = false; private Map options = new HashMap(); private Map options2 = new HashMap(); - public CopyCommand(final DataTO srcData, final DataTO destData, final int timeout, final boolean executeInSequence) { + public CopyCommand(final DataTO srcData, final DataTO destData, final Integer timeout, final Boolean executeInSequence) { super(); srcTO = srcData; destTO = destData; @@ -57,7 +57,7 @@ public DataTO getSrcTO() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return executeInSequence; } @@ -69,7 +69,7 @@ public void setCacheTO(final DataTO cacheTO) { this.cacheTO = cacheTO; } - public int getWaitInMillSeconds() { + public Integer getWaitInMillSeconds() { return getWait() * 1000; } @@ -90,7 +90,7 @@ public Map getOptions2() { } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { executeInSequence = inSeq; } } diff --git a/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java b/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java index 88a582d03167..113e1266071d 100644 --- a/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/CreateObjectCommand.java @@ -34,7 +34,7 @@ protected CreateObjectCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -43,7 +43,7 @@ public DataTO getData() { } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { } } diff --git a/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java b/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java index b1f32a9d3213..96f388b6d8cb 100644 --- a/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java +++ b/core/src/org/apache/cloudstack/storage/command/CreatePrimaryDataStoreCmd.java @@ -33,12 +33,12 @@ public String getDataStore() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { } } diff --git a/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java b/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java index 6f82fa97818d..b198e4026be0 100644 --- a/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/DeleteCommand.java @@ -34,7 +34,7 @@ protected DeleteCommand() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -43,7 +43,7 @@ public DataTO getData() { } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { } } diff --git a/core/src/org/apache/cloudstack/storage/command/DettachCommand.java b/core/src/org/apache/cloudstack/storage/command/DettachCommand.java index 8d89dd501e9b..ec8400cbd034 100644 --- a/core/src/org/apache/cloudstack/storage/command/DettachCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/DettachCommand.java @@ -24,10 +24,10 @@ public class DettachCommand extends StorageSubSystemCommand { private DiskTO disk; private String vmName; - private boolean _managed; + private Boolean _managed; private String _iScsiName; private String _storageHost; - private int _storagePort; + private Integer _storagePort; public DettachCommand(final DiskTO disk, final String vmName) { super(); @@ -36,7 +36,7 @@ public DettachCommand(final DiskTO disk, final String vmName) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @@ -56,11 +56,11 @@ public void setVmName(final String vmName) { this.vmName = vmName; } - public void setManaged(final boolean managed) { + public void setManaged(final Boolean managed) { _managed = managed; } - public boolean isManaged() { + public Boolean isManaged() { return _managed; } @@ -84,12 +84,12 @@ public void setStoragePort(final int storagePort) { _storagePort = storagePort; } - public int getStoragePort() { + public Integer getStoragePort() { return _storagePort; } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { } } diff --git a/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java b/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java index 5dfc22e785b8..53494ac7ebb8 100644 --- a/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java @@ -36,13 +36,13 @@ public static enum ResourceType { VOLUME, TEMPLATE } - private boolean hvm; + private Boolean hvm; private String description; private String checksum; private PasswordAuth auth; private Proxy _proxy; private Long maxDownloadSizeInBytes = null; - private long id; + private Long id; private ResourceType resourceType = ResourceType.TEMPLATE; private String installPath; private DataStoreTO _store; @@ -97,15 +97,15 @@ public DownloadCommand(VolumeObjectTO volume, Long maxDownloadSizeInBytes, Strin } @Override - public long getId() { + public Long getId() { return id; } - public void setHvm(boolean hvm) { + public void setHvm(Boolean hvm) { this.hvm = hvm; } - public boolean isHvm() { + public Boolean isHvm() { return hvm; } @@ -126,7 +126,7 @@ public void setChecksum(String checksum) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java b/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java index c47ee882c916..1f322f83c533 100644 --- a/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java +++ b/core/src/org/apache/cloudstack/storage/command/ForgetObjectCmd.java @@ -33,12 +33,12 @@ public DataTO getDataTO() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { } } diff --git a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java index 8c3bc5e5cc7e..6fbf5e6c993f 100644 --- a/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java +++ b/core/src/org/apache/cloudstack/storage/command/IntroduceObjectCmd.java @@ -33,12 +33,12 @@ public DataTO getDataTO() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } @Override - public void setExecuteInSequence(final boolean inSeq) { + public void setExecuteInSequence(final Boolean inSeq) { } } diff --git a/core/src/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java b/core/src/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java index 1a4403b3baff..9f9a7e893bbb 100644 --- a/core/src/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/RevertSnapshotCommand.java @@ -38,12 +38,12 @@ public SnapshotObjectTO getData() { } @Override - public void setExecuteInSequence(final boolean executeInSequence) { + public void setExecuteInSequence(final Boolean executeInSequence) { _executeInSequence = executeInSequence; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return _executeInSequence; } } diff --git a/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java b/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java index 0a1a84d4fc3d..d0ffa9e3755c 100644 --- a/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java @@ -47,12 +47,12 @@ public Map getDestDetails() { } @Override - public void setExecuteInSequence(final boolean executeInSequence) { + public void setExecuteInSequence(final Boolean executeInSequence) { _executeInSequence = executeInSequence; } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return _executeInSequence; } } diff --git a/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java b/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java index f50a5fb5759a..4f3b30a566f5 100644 --- a/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/StorageSubSystemCommand.java @@ -22,5 +22,5 @@ import com.cloud.agent.api.Command; public abstract class StorageSubSystemCommand extends Command { - public abstract void setExecuteInSequence(boolean inSeq); + public abstract void setExecuteInSequence(Boolean inSeq); } \ No newline at end of file diff --git a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java b/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java index 5d1e56bd7733..99516534940d 100644 --- a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java @@ -21,7 +21,7 @@ public class TemplateOrVolumePostUploadCommand { - long entityId; + Long entityId; String entityUUID; @@ -35,7 +35,7 @@ public class TemplateOrVolumePostUploadCommand { String localPath; - boolean requiresHvm; + Boolean requiresHvm; String imageFormat; @@ -51,10 +51,10 @@ public class TemplateOrVolumePostUploadCommand { private String defaultMaxAccountSecondaryStorage; - private long accountId; + private Long accountId; - public TemplateOrVolumePostUploadCommand(long entityId, String entityUUID, String absolutePath, String checksum, String type, String name, String imageFormat, String dataTo, - String dataToRole) { + public TemplateOrVolumePostUploadCommand(Long entityId, String entityUUID, String absolutePath, String checksum, String type, + String name, String imageFormat, String dataTo, String dataToRole) { this.entityId = entityId; this.entityUUID = entityUUID; this.absolutePath = absolutePath; @@ -101,11 +101,11 @@ public void setLocalPath(String localPath) { this.localPath = localPath; } - public boolean getRequiresHvm() { + public Boolean getRequiresHvm() { return requiresHvm; } - public void setRequiresHvm(boolean requiresHvm) { + public void setRequiresHvm(Boolean requiresHvm) { this.requiresHvm = requiresHvm; } @@ -117,11 +117,11 @@ public void setImageFormat(String imageFormat) { this.imageFormat = imageFormat; } - public long getEntityId() { + public Long getEntityId() { return entityId; } - public void setEntityId(long entityId) { + public void setEntityId(Long entityId) { this.entityId = entityId; } @@ -189,11 +189,11 @@ public String getDefaultMaxAccountSecondaryStorage() { return defaultMaxAccountSecondaryStorage; } - public void setAccountId(long accountId) { + public void setAccountId(Long accountId) { this.accountId = accountId; } - public long getAccountId() { + public Long getAccountId() { return accountId; } } diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java b/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java index 1825b5a03d6a..434974d50db7 100644 --- a/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java +++ b/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java @@ -27,10 +27,10 @@ public static enum UploadStatus { } private UploadStatus status; - private long virtualSize = 0; - private long physicalSize = 0; + private Long virtualSize = 0L; + private Long physicalSize = 0L; private String installPath = null; - private int downloadPercent = 0; + private Integer downloadPercent = 0; protected UploadStatusAnswer() { } @@ -62,11 +62,11 @@ public void setVirtualSize(long virtualSize) { this.virtualSize = virtualSize; } - public long getPhysicalSize() { + public Long getPhysicalSize() { return physicalSize; } - public void setPhysicalSize(long physicalSize) { + public void setPhysicalSize(Long physicalSize) { this.physicalSize = physicalSize; } @@ -78,11 +78,11 @@ public void setInstallPath(String installPath) { this.installPath = installPath; } - public int getDownloadPercent() { + public Integer getDownloadPercent() { return downloadPercent; } - public void setDownloadPercent(int downloadPercent) { + public void setDownloadPercent(Integer downloadPercent) { this.downloadPercent = downloadPercent; } } diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java index 9e6b76e467ff..bd60abf04c7f 100644 --- a/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java +++ b/core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java @@ -46,7 +46,7 @@ public EntityType getEntityType() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java index a69f35706da7..921947bf1f34 100644 --- a/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java +++ b/core/src/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java @@ -42,11 +42,11 @@ public class PrimaryDataStoreTO implements DataStoreTO { private final String uuid; private final String name; private String type; - private final long id; + private final Long id; private StoragePoolType poolType; private String host; private String path; - private int port; + private Integer port; private final String url; private Map details; private static final String pathSeparator = "/"; @@ -63,7 +63,7 @@ public PrimaryDataStoreTO(PrimaryDataStore dataStore) { this.details = dataStore.getDetails(); } - public long getId() { + public Long getId() { return this.id; } @@ -118,11 +118,11 @@ public void setPath(String path) { this.path = path; } - public int getPort() { + public Integer getPort() { return port; } - public void setPort(int port) { + public void setPort(Integer port) { this.port = port; } diff --git a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java index c62110b179ec..cbbc2f4fd4ef 100644 --- a/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java +++ b/core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java @@ -38,8 +38,8 @@ public class SnapshotObjectTO implements DataTO { private String vmName; private String name; private HypervisorType hypervisorType; - private long id; - private boolean quiescevm; + private Long id; + private Boolean quiescevm; private String[] parents; private Long physicalSize = (long) 0; @@ -131,11 +131,11 @@ public void setVmName(String vmName) { } @Override - public long getId() { + public Long getId() { return id; } - public void setId(long id) { + public void setId(Long id) { this.id = id; } @@ -156,11 +156,11 @@ public void setHypervisorType(HypervisorType hypervisorType) { this.hypervisorType = hypervisorType; } - public boolean getquiescevm() { + public Boolean getquiescevm() { return this.quiescevm; } - public void setQuiescevm(boolean quiescevm) { + public void setQuiescevm(Boolean quiescevm) { this.quiescevm = quiescevm; } diff --git a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java index 9ee90b72dddd..586ede86cf15 100644 --- a/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java +++ b/core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java @@ -32,11 +32,11 @@ public class TemplateObjectTO implements DataTO { private String path; private String origUrl; private String uuid; - private long id; + private Long id; private ImageFormat format; - private long accountId; + private Long accountId; private String checksum; - private boolean hvm; + private Boolean hvm; private String displayText; private DataStoreTO imageDataStore; private String name; @@ -89,11 +89,11 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } - public void setId(long id) { + public void setId(Long id) { this.id = id; } @@ -101,7 +101,7 @@ public ImageFormat getFormat() { return format; } - public long getAccountId() { + public Long getAccountId() { return accountId; } @@ -109,11 +109,11 @@ public String getChecksum() { return checksum; } - public boolean isRequiresHvm() { + public Boolean isRequiresHvm() { return hvm; } - public void setRequiresHvm(boolean hvm) { + public void setRequiresHvm(Boolean hvm) { this.hvm = hvm; } @@ -179,7 +179,7 @@ public void setFormat(ImageFormat format) { this.format = format; } - public void setAccountId(long accountId) { + public void setAccountId(Long accountId) { this.accountId = accountId; } diff --git a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java index 509cc3a1be9e..6491d0f1ba63 100644 --- a/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java +++ b/core/src/org/apache/cloudstack/storage/to/VolumeObjectTO.java @@ -38,11 +38,11 @@ public class VolumeObjectTO implements DataTO { private String path; private Long volumeId; private String vmName; - private long accountId; + private Long accountId; private String chainInfo; private Storage.ImageFormat format; private Storage.ProvisioningType provisioningType; - private long id; + private Long id; private Long deviceId; private Long bytesReadRate; @@ -135,7 +135,7 @@ public void setName(String name) { this.name = name; } - public void setSize(long size) { + public void setSize(Long size) { this.size = size; } @@ -151,11 +151,11 @@ public void setVolumeId(Long volumeId) { this.volumeId = volumeId; } - public long getAccountId() { + public Long getAccountId() { return accountId; } - public void setAccountId(long accountId) { + public void setAccountId(Long accountId) { this.accountId = accountId; } @@ -176,11 +176,11 @@ public void setChainInfo(String chainInfo) { } @Override - public long getId() { + public Long getId() { return id; } - public void setId(long id) { + public void setId(Long id) { this.id = id; } diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java b/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java index b13c10cb1dbc..afbc10cf7f22 100644 --- a/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java +++ b/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java @@ -272,9 +272,9 @@ protected DeleteIpAliasCommand generateDeleteIpAliasCommand() { protected IpAssocVpcCommand generateIpAssocVpcCommand() { final List ips = new ArrayList(); - ips.add(new IpAddressTO(1, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); - ips.add(new IpAddressTO(2, "64.1.1.11", false, false, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); - ips.add(new IpAddressTO(3, "65.1.1.11", true, false, false, "vlan://65", "65.1.1.1", "255.255.255.0", "11:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(1l, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(2l, "64.1.1.11", false, false, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(3l, "65.1.1.11", true, false, false, "vlan://65", "65.1.1.1", "255.255.255.0", "11:23:45:67:89:AB", 1000, false)); final IpAddressTO[] ipArray = ips.toArray(new IpAddressTO[ips.size()]); final IpAssocVpcCommand cmd = new IpAssocVpcCommand(ipArray); diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java index 5942a171871c..d5d1064be761 100644 --- a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java +++ b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java @@ -331,9 +331,9 @@ private ExecutionResult prepareNetworkElementCommand(final IpAssocCommand cmd) { protected IpAssocCommand generateIpAssocCommand() { final List ips = new ArrayList<>(); - ips.add(new IpAddressTO(1, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); - ips.add(new IpAddressTO(2, "64.1.1.11", false, false, false, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); - ips.add(new IpAddressTO(3, "65.1.1.11", true, false, false, "vlan://65", "65.1.1.1", "255.255.255.0", "11:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(1l, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(2l, "64.1.1.11", false, false, false, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(3l, "65.1.1.11", true, false, false, "vlan://65", "65.1.1.1", "255.255.255.0", "11:23:45:67:89:AB", 1000, false)); final IpAddressTO[] ipArray = ips.toArray(new IpAddressTO[ips.size()]); final IpAssocCommand cmd = new IpAssocCommand(ipArray); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, ROUTERNAME); @@ -364,9 +364,9 @@ private ExecutionResult prepareNetworkElementCommand(final IpAssocVpcCommand cmd protected IpAssocVpcCommand generateIpAssocVpcCommand() { final List ips = new ArrayList(); - ips.add(new IpAddressTO(1, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); - ips.add(new IpAddressTO(2, "64.1.1.11", false, false, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); - ips.add(new IpAddressTO(3, "65.1.1.11", true, false, false, "vlan://65", "65.1.1.1", "255.255.255.0", "11:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(1l, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(2l, "64.1.1.11", false, false, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false)); + ips.add(new IpAddressTO(3l, "65.1.1.11", true, false, false, "vlan://65", "65.1.1.1", "255.255.255.0", "11:23:45:67:89:AB", 1000, false)); final IpAddressTO[] ipArray = ips.toArray(new IpAddressTO[ips.size()]); final IpAssocVpcCommand cmd = new IpAssocVpcCommand(ipArray); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, ROUTERNAME); @@ -435,7 +435,7 @@ private ExecutionResult prepareNetworkElementCommand(final SetSourceNatCommand c } protected SetSourceNatCommand generateSetSourceNatCommand() { - final IpAddressTO ip = new IpAddressTO(1, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false); + final IpAddressTO ip = new IpAddressTO(1l, "64.1.1.10", true, true, true, "vlan://64", "64.1.1.1", "255.255.255.0", "01:23:45:67:89:AB", 1000, false); final SetSourceNatCommand cmd = new SetSourceNatCommand(ip, true); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, ROUTERNAME); return cmd; @@ -464,9 +464,9 @@ protected SetNetworkACLCommand generateSetNetworkACLCommand() { final List cidrs = new ArrayList<>(); cidrs.add("192.168.0.1/24"); cidrs.add("192.168.0.2/24"); - acls.add(new NetworkACLTO(1, "64", "TCP", 20, 80, false, false, cidrs, 0, 0, TrafficType.Ingress, true, 1)); - acls.add(new NetworkACLTO(2, "64", "ICMP", 0, 0, false, false, cidrs, -1, -1, TrafficType.Ingress, false, 2)); - acls.add(new NetworkACLTO(3, "65", "ALL", 0, 0, false, false, cidrs, -1, -1, TrafficType.Egress, true, 3)); + acls.add(new NetworkACLTO(1l, "64", "TCP", 20, 80, false, false, cidrs, 0, 0, TrafficType.Ingress, true, 1)); + acls.add(new NetworkACLTO(2l, "64", "ICMP", 0, 0, false, false, cidrs, -1, -1, TrafficType.Ingress, false, 2)); + acls.add(new NetworkACLTO(3l, "65", "ALL", 0, 0, false, false, cidrs, -1, -1, TrafficType.Egress, true, 3)); final NicTO nic = new NicTO(); nic.setMac("01:23:45:67:89:AB"); nic.setIp("192.168.1.1"); @@ -667,9 +667,9 @@ protected SetFirewallRulesCommand generateSetFirewallRulesCommand() { final List sourceCidrs = new ArrayList<>(); sourceCidrs.add("10.10.1.1/24"); sourceCidrs.add("10.10.1.2/24"); - rules.add(new FirewallRuleTO(1, "64.10.10.10", "TCP", 22, 80, false, false, Purpose.Firewall, sourceCidrs, 0, 0)); - rules.add(new FirewallRuleTO(2, "64.10.10.10", "ICMP", 0, 0, false, false, Purpose.Firewall, sourceCidrs, -1, -1)); - rules.add(new FirewallRuleTO(3, "64.10.10.10", "ICMP", 0, 0, true, true, Purpose.Firewall, sourceCidrs, -1, -1)); + rules.add(new FirewallRuleTO(1l, "64.10.10.10", "TCP", 22, 80, false, false, Purpose.Firewall, sourceCidrs, 0, 0)); + rules.add(new FirewallRuleTO(2l, "64.10.10.10", "ICMP", 0, 0, false, false, Purpose.Firewall, sourceCidrs, -1, -1)); + rules.add(new FirewallRuleTO(3l, "64.10.10.10", "ICMP", 0, 0, true, true, Purpose.Firewall, sourceCidrs, -1, -1)); final SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rules); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, ROUTERNAME); diff --git a/core/test/com/cloud/agent/transport/RequestTest.java b/core/test/com/cloud/agent/transport/RequestTest.java index ee3b0822558e..ed0727336b53 100644 --- a/core/test/com/cloud/agent/transport/RequestTest.java +++ b/core/test/com/cloud/agent/transport/RequestTest.java @@ -61,12 +61,12 @@ public class RequestTest extends TestCase { public void testSerDeser() { s_logger.info("Testing serializing and deserializing works as expected"); - s_logger.info("UpdateHostPasswordCommand should have two parameters that doesn't show in logging"); + s_logger.info("UpdateHostPasswordCommand should have two parameters that don't show in logging"); UpdateHostPasswordCommand cmd1 = new UpdateHostPasswordCommand("abc", "def"); s_logger.info("SecStorageFirewallCfgCommand has a context map that shouldn't show up in debug level"); SecStorageFirewallCfgCommand cmd2 = new SecStorageFirewallCfgCommand(); s_logger.info("GetHostStatsCommand should not show up at all in debug level"); - GetHostStatsCommand cmd3 = new GetHostStatsCommand("hostguid", "hostname", 101); + GetHostStatsCommand cmd3 = new GetHostStatsCommand("hostguid", "hostname", 101L); cmd2.addPortConfig("abc", "24", true, "eth0"); cmd2.addPortConfig("127.0.0.1", "44", false, "eth1"); Request sreq = new Request(2, 3, new Command[] {cmd1, cmd2, cmd3}, true, true); @@ -77,32 +77,32 @@ public void testSerDeser() { logger.setLevel(Level.DEBUG); String log = sreq.log("Debug", true, Level.DEBUG); - assert (log.contains(UpdateHostPasswordCommand.class.getSimpleName())); - assert (log.contains(SecStorageFirewallCfgCommand.class.getSimpleName())); - assert (!log.contains(GetHostStatsCommand.class.getSimpleName())); - assert (!log.contains("username")); - assert (!log.contains("password")); + assertTrue (log.contains(UpdateHostPasswordCommand.class.getSimpleName())); + assertTrue (log.contains(SecStorageFirewallCfgCommand.class.getSimpleName())); + assertFalse("Did not expect GetHostStatsCommand in message", log.contains(GetHostStatsCommand.class.getSimpleName())); + assertFalse (log.contains("username")); + assertFalse (log.contains("password")); logger.setLevel(Level.TRACE); log = sreq.log("Trace", true, Level.TRACE); - assert (log.contains(UpdateHostPasswordCommand.class.getSimpleName())); - assert (log.contains(SecStorageFirewallCfgCommand.class.getSimpleName())); - assert (log.contains(GetHostStatsCommand.class.getSimpleName())); - assert (!log.contains("username")); - assert (!log.contains("password")); + assertFalse (log.contains("username")); + assertFalse (log.contains("password")); + assertTrue (log.contains(UpdateHostPasswordCommand.class.getSimpleName())); + assertTrue (log.contains(SecStorageFirewallCfgCommand.class.getSimpleName())); + assertTrue (log.contains(GetHostStatsCommand.class.getSimpleName())); logger.setLevel(Level.INFO); log = sreq.log("Info", true, Level.INFO); - assert (log == null); + assertNull(log); logger.setLevel(level); byte[] bytes = sreq.getBytes(); - assert Request.getSequence(bytes) == 892403717; - assert Request.getManagementServerId(bytes) == 3; - assert Request.getAgentId(bytes) == 2; - assert Request.getViaAgentId(bytes) == 2; + assertEquals(Request.getSequence(bytes), 892403717); + assertEquals(Request.getManagementServerId(bytes), 3); + assertEquals(Request.getAgentId(bytes), 2); + assertEquals(Request.getViaAgentId(bytes), 2); Request creq = null; try { creq = Request.parse(bytes); @@ -112,7 +112,7 @@ public void testSerDeser() { s_logger.error("Unable to parse bytes: ", e); } - assert creq != null : "Couldn't get the request back"; + assertNotNull("Couldn't get the request back", creq); compareRequest(creq, sreq); @@ -130,7 +130,7 @@ public void testSerDeser() { s_logger.error("Unable to parse bytes: ", e); } - assert sresp != null : "Couldn't get the response back"; + assertNotNull("Couldn't get the response back", sresp); compareRequest(cresp, sresp); } @@ -146,10 +146,10 @@ public void testSerDeserTO() { byte[] bytes = sreq.getBytes(); - assert Request.getSequence(bytes) == 892403718; - assert Request.getManagementServerId(bytes) == 3; - assert Request.getAgentId(bytes) == 2; - assert Request.getViaAgentId(bytes) == 2; + assertEquals(Request.getSequence(bytes), 892403718); + assertEquals(Request.getManagementServerId(bytes), 3); + assertEquals(Request.getAgentId(bytes), 2); + assertEquals(Request.getViaAgentId(bytes), 2); Request creq = null; try { creq = Request.parse(bytes); @@ -159,7 +159,7 @@ public void testSerDeserTO() { s_logger.error("Unable to parse bytes: ", e); } - assert creq != null : "Couldn't get the request back"; + assertNotNull("Couldn't get the request back", creq); compareRequest(creq, sreq); assertEquals("nfs://192.168.56.10/opt/storage/secondary", ((NfsTO)((ListTemplateCommand)creq.getCommand()).getDataStore()).getUrl()); @@ -184,7 +184,7 @@ public void testDownload() { req.logD("Debug for Download"); - DownloadAnswer answer = new DownloadAnswer("jobId", 50, "errorString", Status.ABANDONED, "filesystempath", "installpath", 10000000, 20000000, "chksum"); + DownloadAnswer answer = new DownloadAnswer("jobId", 50, "errorString", Status.ABANDONED, "filesystempath", "installpath", 10000000L, 20000000L, "chksum"); Response resp = new Response(req, answer); resp.logD("Debug for Download"); @@ -212,41 +212,44 @@ public void testCompress() { public void testLogging() { s_logger.info("Testing Logging"); - GetHostStatsCommand cmd3 = new GetHostStatsCommand("hostguid", "hostname", 101); + GetHostStatsCommand cmd3 = new GetHostStatsCommand("hostguid", "hostname", 101L); Request sreq = new Request(2, 3, new Command[] {cmd3}, true, true); sreq.setSequence(1); Logger logger = Logger.getLogger(GsonHelper.class); Level level = logger.getLevel(); + String log; + logger.setLevel(Level.DEBUG); - String log = sreq.log("Debug", true, Level.DEBUG); - assert (log == null); + log = sreq.log("Debug", true, Level.DEBUG); + assertNull("did not expect a string for this level." + log , log); log = sreq.log("Debug", false, Level.DEBUG); - assert (log != null); + assertNotNull (log); logger.setLevel(Level.TRACE); log = sreq.log("Trace", true, Level.TRACE); - assert (log.contains(GetHostStatsCommand.class.getSimpleName())); + assertNotNull (log); + assertTrue(log.contains(GetHostStatsCommand.class.getSimpleName())); s_logger.debug(log); logger.setLevel(level); } protected void compareRequest(Request req1, Request req2) { - assert req1.getSequence() == req2.getSequence(); - assert req1.getAgentId() == req2.getAgentId(); - assert req1.getManagementServerId() == req2.getManagementServerId(); - assert req1.isControl() == req2.isControl(); - assert req1.isFromServer() == req2.isFromServer(); - assert req1.executeInSequence() == req2.executeInSequence(); - assert req1.stopOnError() == req2.stopOnError(); - assert req1.getVersion().equals(req2.getVersion()); - assert req1.getViaAgentId() == req2.getViaAgentId(); + assertEquals(req1.getSequence(), req2.getSequence()); + assertEquals(req1.getAgentId(), req2.getAgentId()); + assertEquals(req1.getManagementServerId(), req2.getManagementServerId()); + assertEquals(req1.isControl(), req2.isControl()); + assertEquals(req1.isFromServer(), req2.isFromServer()); + assertEquals(req1.executeInSequence(), req2.executeInSequence()); + assertEquals(req1.stopOnError(), req2.stopOnError()); + assertEquals(req1.getVersion(), req2.getVersion()); + assertEquals(req1.getViaAgentId(), req2.getViaAgentId()); Command[] cmd1 = req1.getCommands(); Command[] cmd2 = req2.getCommands(); for (int i = 0; i < cmd1.length; i++) { - assert cmd1[i].getClass().equals(cmd2[i].getClass()); + assertEquals(cmd1[i].getClass(), cmd2[i].getClass()); } } diff --git a/core/test/com/cloud/serializer/GsonHelperTest.java b/core/test/com/cloud/serializer/GsonHelperTest.java new file mode 100644 index 000000000000..cff55347f5d9 --- /dev/null +++ b/core/test/com/cloud/serializer/GsonHelperTest.java @@ -0,0 +1,66 @@ +package com.cloud.serializer; + +import org.apache.log4j.Logger; + +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.Command; +import com.cloud.agent.api.GetHostStatsAnswer; +import com.cloud.agent.api.GetHostStatsCommand; +import com.cloud.agent.api.UpdateHostPasswordCommand; +import com.google.gson.Gson; + +import junit.framework.TestCase; + +public class GsonHelperTest extends TestCase { + private static final Logger s_logger = Logger.getLogger(GsonHelperTest.class); + public void testCommandAdaptors() { + final Gson gson = GsonHelper.getGson(); + s_logger.info("Testing gson"); + Command cmd_in; + Command cmd_out; + String json; + String hostguid = "hostguid"; + String hostname = "hostname"; + Long hostId = 101l; + + cmd_in = new GetHostStatsCommand(hostguid, hostname, hostId); + json = gson.toJson(cmd_in, GetHostStatsCommand.class); + cmd_out = gson.fromJson(json, GetHostStatsCommand.class); + + assertEquals(((GetHostStatsCommand)cmd_out).getHostGuid(),hostguid); + assertEquals(((GetHostStatsCommand)cmd_out).getHostName(),hostname); + assertEquals(((GetHostStatsCommand)cmd_out).getHostId(),hostId); + + String username = "abc"; + String password = "def"; + cmd_in = new UpdateHostPasswordCommand(username, password); + json = gson.toJson(cmd_in, UpdateHostPasswordCommand.class); + cmd_out = gson.fromJson(json, UpdateHostPasswordCommand.class); + + assertEquals(((UpdateHostPasswordCommand)cmd_out).getUsername(), username); + assertEquals(((UpdateHostPasswordCommand)cmd_out).getNewPassword(), password); + } + + public void testAnswerAdaptors() { + final Gson gson = GsonHelper.getGson(); + s_logger.info("Testing gson"); + Answer ans_in; + Answer ans_out; + String json; + String hostGuid = "hostguid"; + String hostName = "hostname"; + long hostId = 101l; + double cpuUtilization = 1.1; + double freeMemoryKBs = 2.2; + double totalMemoryKBs = 3.3; + double networkReadKBs = 4.4; + double networkWriteKBs = 5.5; + String entityType = "bla"; + + ans_in = new GetHostStatsAnswer(new GetHostStatsCommand(hostGuid, hostName, hostId),cpuUtilization,freeMemoryKBs,totalMemoryKBs,networkReadKBs,networkWriteKBs,entityType); + json = gson.toJson(ans_in, GetHostStatsAnswer.class); + ans_out = gson.fromJson(json, GetHostStatsAnswer.class); + + assertEquals(((GetHostStatsAnswer)ans_out).getCpuUtilization(),cpuUtilization); + } +} diff --git a/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java b/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java index 74d1adc3c581..566bbe9ec701 100644 --- a/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java +++ b/core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.fail; import java.io.File; +import java.net.MalformedURLException; import org.junit.Test; @@ -29,9 +30,9 @@ public class LocalTemplateDownloaderTest { @Test - public void localTemplateDownloaderTest() { - String url = "file://" + new File("pom.xml").getAbsolutePath(); - TemplateDownloader td = new LocalTemplateDownloader(null, url, "/tmp", TemplateDownloader.DEFAULT_MAX_TEMPLATE_SIZE_IN_BYTES, null); + public void localTemplateDownloaderTest() throws MalformedURLException { + String url = new File("pom.xml").toURI().toURL().toString(); + TemplateDownloader td = new LocalTemplateDownloader(null, url, System.getProperty("java.io.tmpdir"), TemplateDownloader.DEFAULT_MAX_TEMPLATE_SIZE_IN_BYTES, null); long bytes = td.download(true, null); if (!(bytes > 0)) { fail("Failed download"); diff --git a/core/test/com/cloud/storage/template/OVAProcessorTest.java b/core/test/com/cloud/storage/template/OVAProcessorTest.java index f2f0f4712dca..3ff7cd2d3631 100644 --- a/core/test/com/cloud/storage/template/OVAProcessorTest.java +++ b/core/test/com/cloud/storage/template/OVAProcessorTest.java @@ -19,10 +19,10 @@ package com.cloud.storage.template; -import com.cloud.exception.InternalErrorException; -import com.cloud.storage.Storage; -import com.cloud.storage.StorageLayer; -import com.cloud.utils.script.Script; +import java.io.File; +import java.util.HashMap; +import java.util.Map; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -33,9 +33,10 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import java.io.File; -import java.util.HashMap; -import java.util.Map; +import com.cloud.exception.InternalErrorException; +import com.cloud.storage.Storage; +import com.cloud.storage.StorageLayer; +import com.cloud.utils.script.Script; @RunWith(PowerMockRunner.class) @PrepareForTest(OVAProcessor.class) @@ -55,7 +56,7 @@ public void setUp() throws Exception { @Test(expected = InternalErrorException.class) public void testProcessWhenUntarFails() throws Exception { - String templatePath = "/tmp"; + String templatePath = System.getProperty("java.io.tmpdir"); String templateName = "template"; Mockito.when(mockStorageLayer.exists(Mockito.anyString())).thenReturn(true); @@ -69,7 +70,7 @@ public void testProcessWhenUntarFails() throws Exception { @Test(expected = InternalErrorException.class) public void testProcessWhenVirtualSizeThrowsException() throws Exception { - String templatePath = "/tmp"; + String templatePath = System.getProperty("java.io.tmpdir"); String templateName = "template"; Mockito.when(mockStorageLayer.exists(Mockito.anyString())).thenReturn(true); @@ -85,7 +86,7 @@ public void testProcessWhenVirtualSizeThrowsException() throws Exception { @Test public void testProcess() throws Exception { - String templatePath = "/tmp"; + String templatePath = System.getProperty("java.io.tmpdir"); String templateName = "template"; long virtualSize = 2000; long actualSize = 1000; @@ -107,9 +108,8 @@ public void testProcess() throws Exception { @Test public void testGetVirtualSizeWhenVirtualSizeThrowsException() throws Exception { - long virtualSize = 2000; long actualSize = 1000; - String templatePath = "/tmp"; + String templatePath = System.getProperty("java.io.tmpdir"); String templateName = "template"; File mockFile = Mockito.mock(File.class); Mockito.when(mockFile.length()).thenReturn(actualSize); @@ -124,7 +124,7 @@ public void testGetVirtualSizeWhenVirtualSizeThrowsException() throws Exception public void testGetVirtualSize() throws Exception { long virtualSize = 2000; long actualSize = 1000; - String templatePath = "/tmp"; + String templatePath = System.getProperty("java.io.tmpdir"); String templateName = "template"; File mockFile = Mockito.mock(File.class); Mockito.when(mockFile.length()).thenReturn(actualSize); diff --git a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java index bdcda38f3f06..fa9a0f842cea 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java @@ -39,7 +39,7 @@ public class BackupSnapshotCommandTest { public StoragePool pool = new StoragePool() { @Override - public long getId() { + public Long getId() { return 1L; }; diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java index d6f0bfc3b189..915fa86460f3 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java @@ -78,7 +78,7 @@ public static class ResizeVolumeCommandTest { public StoragePool dummypool = new StoragePool() { @Override - public long getId() { + public Long getId() { return 1L; }; diff --git a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java index 72ec83a41f7a..a66bdbd54f54 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java @@ -44,7 +44,7 @@ public Status getState() { }; @Override - public long getId() { + public Long getId() { return 101L; }; @@ -128,7 +128,7 @@ public Long getPodId() { }; @Override - public long getDataCenterId() { + public Long getDataCenterId() { return 17L; }; @@ -164,7 +164,7 @@ public String getVersion() { }; @Override - public long getTotalSize() { + public Long getTotalSize() { return 100000000000L; }; @@ -174,7 +174,7 @@ public String getCapabilities() { }; @Override - public long getLastPinged() { + public Long getLastPinged() { return 1L; }; @@ -250,7 +250,7 @@ public String getHypervisorVersion() { }; @Override - public boolean isInMaintenanceStates() { + public Boolean isInMaintenanceStates() { return false; }; diff --git a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java index 629669abdd08..cc4361317b48 100644 --- a/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java +++ b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java @@ -40,7 +40,7 @@ public class SnapshotCommandTest { public StoragePool pool = new StoragePool() { @Override - public long getId() { + public Long getId() { return 1L; }; diff --git a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java index 7891b90e2aa2..809cc2001cbc 100644 --- a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java @@ -44,7 +44,7 @@ public interface CloudStackEntity { /** * @return the id which is often the database id. */ - long getId(); + Long getId(); /** * @return current state for the entity diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java index c57b01ce8b02..f31074e8f720 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataObject.java @@ -23,7 +23,7 @@ import com.cloud.agent.api.to.DataTO; public interface DataObject { - long getId(); + Long getId(); String getUri(); diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java index e9a8f50e1059..da0e629e5911 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStore.java @@ -24,7 +24,7 @@ public interface DataStore { DataStoreRole getRole(); - long getId(); + Long getId(); String getUuid(); diff --git a/engine/components-api/src/com/cloud/network/addr/PublicIp.java b/engine/components-api/src/com/cloud/network/addr/PublicIp.java index 49cae4baccf4..ccc743ec1a07 100644 --- a/engine/components-api/src/com/cloud/network/addr/PublicIp.java +++ b/engine/components-api/src/com/cloud/network/addr/PublicIp.java @@ -156,7 +156,7 @@ public VlanType getVlanType() { } @Override - public long getId() { + public Long getId() { return _addr.getId(); } diff --git a/engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java b/engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java index d21159bdff6a..4a437f669cf7 100644 --- a/engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java +++ b/engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java @@ -85,7 +85,7 @@ public long getNetworkId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java index ef8a373e269e..b5e07f8f43be 100644 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1146,7 +1146,7 @@ protected void connectAgent(final Link link, final Command[] cmds, final Request cmd = cmds[i]; if (cmd instanceof StartupRoutingCommand || cmd instanceof StartupProxyCommand || cmd instanceof StartupSecondaryStorageCommand || cmd instanceof StartupStorageCommand) { - answers[i] = new StartupAnswer((StartupCommand)cmds[i], 0, getPingInterval()); + answers[i] = new StartupAnswer((StartupCommand)cmds[i], 0l, getPingInterval()); break; } } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java index 706748f4f75a..ed003e173da1 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java @@ -88,7 +88,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return vmEntityVO.getId(); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java index a5416c0df432..e85906b1afbf 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java @@ -98,7 +98,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return clusterVO.getId(); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java index 5f94834d9d8a..7c67c63d3adc 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java @@ -99,7 +99,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return hostVO.getId(); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java index 3e5c0e29309a..16c4478a1f41 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java @@ -92,7 +92,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return podVO.getId(); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java index ee434bb2291c..9848b0ce426c 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java @@ -52,7 +52,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return dataCenterVO.getId(); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java index 0c34e3c52858..1777966b7dfd 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java @@ -49,7 +49,7 @@ public class EngineClusterVO implements EngineCluster, Identity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - long id; + Long id; @Column(name = "name") String name; @@ -126,7 +126,7 @@ public EngineClusterVO(long dataCenterId, long podId, String name) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java index ca9ad50b3c1c..9b21a3ca82c8 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java @@ -50,7 +50,7 @@ public class EngineDataCenterVO implements EngineDataCenter, Identity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - private long id; + private Long id; @Column(name = "name") private String name = null; @@ -322,7 +322,7 @@ protected EngineDataCenterVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java index 684b882fe8a7..4117c9c44d65 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java @@ -44,7 +44,7 @@ public class EngineHostPodVO implements EnginePod, Identity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - long id; + Long id; @Column(name = "name") private String name = null; @@ -119,7 +119,7 @@ protected EngineHostPodVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java index efa34dfec981..8b902047d60d 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java @@ -57,7 +57,7 @@ public class EngineHostVO implements EngineHost, Identity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") - private long id; + private Long id; @Column(name = "disconnected") @Temporal(value = TemporalType.TIMESTAMP) @@ -541,7 +541,7 @@ public void setManagementServerId(Long managementServerId) { } @Override - public long getLastPinged() { + public Long getLastPinged() { return lastPinged; } @@ -551,7 +551,7 @@ public String getParent() { } @Override - public long getTotalSize() { + public Long getTotalSize() { return totalSize; } @@ -580,7 +580,7 @@ public void setType(Type type) { } @Override - public long getId() { + public Long getId() { return id; } @@ -595,7 +595,7 @@ public Status getStatus() { } @Override - public long getDataCenterId() { + public Long getDataCenterId() { return dataCenterId; } @@ -721,7 +721,7 @@ public void setResourceState(ResourceState state) { } @Override - public boolean isInMaintenanceStates() { + public Boolean isInMaintenanceStates() { return (getResourceState() == ResourceState.Maintenance || getResourceState() == ResourceState.ErrorInMaintenance || getResourceState() == ResourceState.PrepareForMaintenance); } diff --git a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java index 865b0662ec05..73146bb4ab1d 100644 --- a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java +++ b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java @@ -271,8 +271,9 @@ public void testScaleVM2() throws Exception { doReturn(1L).when(hostVO).getClusterId(); when(CapacityManager.CpuOverprovisioningFactor.valueIn(1L)).thenReturn(1.0f); ScaleVmCommand reconfigureCmd = - new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), newServiceOffering.getSpeed(), newServiceOffering.getRamSize(), - newServiceOffering.getRamSize(), newServiceOffering.getLimitCpuUse()); + new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), + newServiceOffering.getSpeed(), new Long(newServiceOffering.getRamSize()), + new Long(newServiceOffering.getRamSize()), newServiceOffering.getLimitCpuUse()); new ScaleVmAnswer(reconfigureCmd, true, "details"); when(_agentMgr.send(2l, reconfigureCmd)).thenReturn(null); _vmMgr.reConfigureVm(_vmInstance.getUuid(), getSvcoffering(256), false); diff --git a/engine/schema/src/com/cloud/alert/AlertVO.java b/engine/schema/src/com/cloud/alert/AlertVO.java index 70ef469f52b8..c591e1a601c1 100644 --- a/engine/schema/src/com/cloud/alert/AlertVO.java +++ b/engine/schema/src/com/cloud/alert/AlertVO.java @@ -81,7 +81,7 @@ public AlertVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/capacity/CapacityVO.java b/engine/schema/src/com/cloud/capacity/CapacityVO.java index 8df5c861cda4..a8989490d479 100644 --- a/engine/schema/src/com/cloud/capacity/CapacityVO.java +++ b/engine/schema/src/com/cloud/capacity/CapacityVO.java @@ -100,7 +100,7 @@ public CapacityVO(Long dataCenterId, Long podId, Long clusterId, short capacityT } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/certificate/CertificateVO.java b/engine/schema/src/com/cloud/certificate/CertificateVO.java index 11bf8e887807..2c2b32db75aa 100644 --- a/engine/schema/src/com/cloud/certificate/CertificateVO.java +++ b/engine/schema/src/com/cloud/certificate/CertificateVO.java @@ -44,7 +44,7 @@ public CertificateVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java b/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java index 8d28b8ee2b81..83bfd14bccbd 100644 --- a/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java +++ b/engine/schema/src/com/cloud/cluster/agentlb/HostTransferMapVO.java @@ -89,7 +89,7 @@ public void setState(HostTransferState state) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/configuration/ResourceCountVO.java b/engine/schema/src/com/cloud/configuration/ResourceCountVO.java index ae8f3822704c..1ab04688e59b 100644 --- a/engine/schema/src/com/cloud/configuration/ResourceCountVO.java +++ b/engine/schema/src/com/cloud/configuration/ResourceCountVO.java @@ -62,7 +62,7 @@ public ResourceCountVO(ResourceType type, long count, long ownerId, ResourceOwne } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java b/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java index 392170919757..ff5397e1950d 100644 --- a/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java +++ b/engine/schema/src/com/cloud/configuration/ResourceLimitVO.java @@ -62,7 +62,7 @@ public ResourceLimitVO(ResourceCount.ResourceType type, Long max, long ownerId, } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java b/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java index 6461a9634fd8..6d26f703a265 100644 --- a/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java +++ b/engine/schema/src/com/cloud/dc/AccountVlanMapVO.java @@ -52,7 +52,7 @@ public AccountVlanMapVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java b/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java index 6eb9e7466a7e..2cd9dffbc4db 100644 --- a/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java +++ b/engine/schema/src/com/cloud/dc/ClusterDetailsVO.java @@ -69,7 +69,7 @@ public void setValue(String value) { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/dc/ClusterVO.java b/engine/schema/src/com/cloud/dc/ClusterVO.java index b701542fbdb8..17a137b8377a 100644 --- a/engine/schema/src/com/cloud/dc/ClusterVO.java +++ b/engine/schema/src/com/cloud/dc/ClusterVO.java @@ -95,7 +95,7 @@ public ClusterVO(long dataCenterId, long podId, String name) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java b/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java index 5e08fac58eeb..550a95f206cb 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterDetailVO.java @@ -66,7 +66,7 @@ public String getValue() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java b/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java index 70b4df166543..581dd6fff1c2 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterIpAddressVO.java @@ -78,7 +78,7 @@ public DataCenterIpAddressVO(String ipAddress, long dataCenterId, long podId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java b/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java index 31d124c80ef1..94e7f1062b56 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterLinkLocalIpAddressVO.java @@ -67,7 +67,7 @@ public DataCenterLinkLocalIpAddressVO(String ipAddress, long dataCenterId, long } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterVO.java b/engine/schema/src/com/cloud/dc/DataCenterVO.java index 42ea34a4704e..5d16b3bb6284 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterVO.java @@ -295,7 +295,7 @@ protected DataCenterVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java b/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java index d3959df8af8e..ef170058a839 100644 --- a/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java +++ b/engine/schema/src/com/cloud/dc/DataCenterVnetVO.java @@ -76,7 +76,7 @@ public DataCenterVnetVO(String vnet, long dcId, long physicalNetworkId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/HostPodVO.java b/engine/schema/src/com/cloud/dc/HostPodVO.java index d9971815f5e6..2486e3ce41e6 100644 --- a/engine/schema/src/com/cloud/dc/HostPodVO.java +++ b/engine/schema/src/com/cloud/dc/HostPodVO.java @@ -90,7 +90,7 @@ protected HostPodVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/PodVlanMapVO.java b/engine/schema/src/com/cloud/dc/PodVlanMapVO.java index 5f84cf28f686..a81d9fb344eb 100644 --- a/engine/schema/src/com/cloud/dc/PodVlanMapVO.java +++ b/engine/schema/src/com/cloud/dc/PodVlanMapVO.java @@ -49,7 +49,7 @@ public PodVlanMapVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/PodVlanVO.java b/engine/schema/src/com/cloud/dc/PodVlanVO.java index 01668d9701fd..2791340fa65a 100644 --- a/engine/schema/src/com/cloud/dc/PodVlanVO.java +++ b/engine/schema/src/com/cloud/dc/PodVlanVO.java @@ -70,7 +70,7 @@ public PodVlanVO(String vlan, long dataCenterId, long podId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java b/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java index d7191428fdb9..521c757054d0 100644 --- a/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java +++ b/engine/schema/src/com/cloud/dc/StorageNetworkIpAddressVO.java @@ -67,7 +67,7 @@ protected StorageNetworkIpAddressVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java b/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java index 9b84ac7d23d8..a2ebbc94465d 100644 --- a/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java +++ b/engine/schema/src/com/cloud/dc/StorageNetworkIpRangeVO.java @@ -92,7 +92,7 @@ protected StorageNetworkIpRangeVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/dc/VlanVO.java b/engine/schema/src/com/cloud/dc/VlanVO.java index 50106e07fc97..18c267132b44 100644 --- a/engine/schema/src/com/cloud/dc/VlanVO.java +++ b/engine/schema/src/com/cloud/dc/VlanVO.java @@ -104,7 +104,7 @@ public VlanVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/domain/DomainVO.java b/engine/schema/src/com/cloud/domain/DomainVO.java index f6494b3a230e..d3a5ec5d5dd5 100644 --- a/engine/schema/src/com/cloud/domain/DomainVO.java +++ b/engine/schema/src/com/cloud/domain/DomainVO.java @@ -99,7 +99,7 @@ public DomainVO(String name, long owner, Long parentId, String networkDomain, St } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/event/EventVO.java b/engine/schema/src/com/cloud/event/EventVO.java index 9be37ddb9660..a22803987334 100644 --- a/engine/schema/src/com/cloud/event/EventVO.java +++ b/engine/schema/src/com/cloud/event/EventVO.java @@ -91,7 +91,7 @@ public EventVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/event/UsageEventVO.java b/engine/schema/src/com/cloud/event/UsageEventVO.java index 2278103b82e7..971d0cca7d19 100644 --- a/engine/schema/src/com/cloud/event/UsageEventVO.java +++ b/engine/schema/src/com/cloud/event/UsageEventVO.java @@ -144,7 +144,7 @@ public UsageEventVO(String usageType, long accountId, long zoneId, long vmId, lo } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/gpu/HostGpuGroupsVO.java b/engine/schema/src/com/cloud/gpu/HostGpuGroupsVO.java index 1c186a162e3c..91fd0d533c49 100644 --- a/engine/schema/src/com/cloud/gpu/HostGpuGroupsVO.java +++ b/engine/schema/src/com/cloud/gpu/HostGpuGroupsVO.java @@ -64,7 +64,7 @@ public void setGroupName(String groupName) { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/gpu/VGPUTypesVO.java b/engine/schema/src/com/cloud/gpu/VGPUTypesVO.java index fa6674c2c7e7..d26d4d1004ea 100644 --- a/engine/schema/src/com/cloud/gpu/VGPUTypesVO.java +++ b/engine/schema/src/com/cloud/gpu/VGPUTypesVO.java @@ -149,7 +149,7 @@ public void setMaxCapacity(long maxCapacity) { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/host/DetailVO.java b/engine/schema/src/com/cloud/host/DetailVO.java index 1c781c68407a..28d9f8fd11bd 100644 --- a/engine/schema/src/com/cloud/host/DetailVO.java +++ b/engine/schema/src/com/cloud/host/DetailVO.java @@ -68,7 +68,7 @@ public void setValue(String value) { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/host/HostTagVO.java b/engine/schema/src/com/cloud/host/HostTagVO.java index 6b8b754849cc..027c49ee5028 100644 --- a/engine/schema/src/com/cloud/host/HostTagVO.java +++ b/engine/schema/src/com/cloud/host/HostTagVO.java @@ -60,7 +60,7 @@ public void setTag(String tag) { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java index c5938d652206..c643dc04c1dd 100644 --- a/engine/schema/src/com/cloud/host/HostVO.java +++ b/engine/schema/src/com/cloud/host/HostVO.java @@ -531,7 +531,7 @@ public void setManagementServerId(Long managementServerId) { } @Override - public long getLastPinged() { + public Long getLastPinged() { return lastPinged; } @@ -541,7 +541,7 @@ public String getParent() { } @Override - public long getTotalSize() { + public Long getTotalSize() { return totalSize; } @@ -570,7 +570,7 @@ public void setType(Type type) { } @Override - public long getId() { + public Long getId() { return id; } @@ -585,7 +585,7 @@ public Status getStatus() { } @Override - public long getDataCenterId() { + public Long getDataCenterId() { return dataCenterId; } @@ -709,7 +709,7 @@ public void setResourceState(ResourceState state) { } @Override - public boolean isInMaintenanceStates() { + public Boolean isInMaintenanceStates() { return (getResourceState() == ResourceState.Maintenance || getResourceState() == ResourceState.ErrorInMaintenance || getResourceState() == ResourceState.PrepareForMaintenance); } diff --git a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java index 2deeb2e2e348..ce122bc386ee 100644 --- a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java +++ b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java @@ -153,7 +153,7 @@ public boolean isStorageMotionSupported() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java index 72dbf5cbdccd..e74a3a584920 100644 --- a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java +++ b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java @@ -124,7 +124,7 @@ public int getUnhealthThresshold() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java index 397c7b3b319e..2ce39eb16aa5 100644 --- a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java +++ b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java @@ -104,7 +104,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/VpnUserVO.java b/engine/schema/src/com/cloud/network/VpnUserVO.java index d6c4b603529b..a707a6e71b18 100644 --- a/engine/schema/src/com/cloud/network/VpnUserVO.java +++ b/engine/schema/src/com/cloud/network/VpnUserVO.java @@ -71,7 +71,7 @@ public VpnUserVO(long accountId, long domainId, String userName, String password } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java index 834422f10656..e3f7aea2551e 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java @@ -49,7 +49,7 @@ public AutoScalePolicyConditionMapVO(long policyId, long conditionId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java index 1842533000fd..cf6bd138ed34 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java @@ -92,7 +92,7 @@ public String toString() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java index b2753641e22a..cb497783d2bd 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java @@ -52,7 +52,7 @@ public AutoScaleVmGroupPolicyMapVO(long vmgroupId, long policyId, boolean revoke } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java index d32e7f873a0b..4f9121f9f91e 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java @@ -117,7 +117,7 @@ public String toString() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java index 038f0d768250..bd462acae55f 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java @@ -47,7 +47,7 @@ public AutoScaleVmGroupVmMapVO(long vmGroupId, long instanceId) { this.instanceId = instanceId; } - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java index 69e4c8190f4f..cad58a3499d6 100644 --- a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java +++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java @@ -202,7 +202,7 @@ public long getDomainId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/ConditionVO.java b/engine/schema/src/com/cloud/network/as/ConditionVO.java index 5035f731b576..2328828e9090 100644 --- a/engine/schema/src/com/cloud/network/as/ConditionVO.java +++ b/engine/schema/src/com/cloud/network/as/ConditionVO.java @@ -85,7 +85,7 @@ public Date getCreated() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/as/CounterVO.java b/engine/schema/src/com/cloud/network/as/CounterVO.java index 2ba71f0ced35..c4bb6d6d733e 100644 --- a/engine/schema/src/com/cloud/network/as/CounterVO.java +++ b/engine/schema/src/com/cloud/network/as/CounterVO.java @@ -93,7 +93,7 @@ public Source getSource() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java index 4234c73441fe..282a79c65d52 100644 --- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java @@ -60,7 +60,7 @@ public AccountGuestVlanMapVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java index 141eb530fd07..2fdbeb91dfef 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java @@ -98,7 +98,7 @@ public ExternalFirewallDeviceVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java index 80bec1b8152f..9b280e5215ff 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java @@ -136,7 +136,7 @@ public ExternalLoadBalancerDeviceVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java index ce50e170c64f..e9e7fae89a52 100644 --- a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java +++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java @@ -48,7 +48,7 @@ public FirewallRulesCidrsVO(long firewallRuleId, String sourceCidrList) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java index 0be781b500b5..e5a978b87b3e 100644 --- a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java @@ -273,7 +273,7 @@ public String toString() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java index 3bfb076c7f4e..f2f385825b01 100644 --- a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java @@ -48,7 +48,7 @@ public InlineLoadBalancerNicMapVO(String publicIpAddress, long nicId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java index 9628a32ae4c4..921f71ef6893 100644 --- a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java +++ b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java @@ -112,7 +112,7 @@ public List> getParams() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java index f95c61733f28..5ce82db4dbfc 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java @@ -59,7 +59,7 @@ public LoadBalancerCertMapVO(Long lbId, Long certId, boolean revoke) { // Getters @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java index 08b918475c34..d9ebb506cde8 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java @@ -70,7 +70,7 @@ public LoadBalancerVMMapVO(long loadBalancerId, long instanceId, String vmIp, bo } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java index 01fba00d0ba1..18d2d3b62b7f 100644 --- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java +++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java @@ -70,7 +70,7 @@ protected MonitoringServiceVO() { String uuid = UUID.randomUUID().toString(); @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java index 208d13075d50..049cdfe8c805 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java @@ -53,7 +53,7 @@ public NetworkAccountVO(long networkId, long accountId, boolean owner) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java b/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java index e6cad17210dd..617a3cdeb91d 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java @@ -56,7 +56,7 @@ public NetworkDetailVO(long networkId, String name, String value, boolean displa } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java index 99cbb50953a8..2c6d84899072 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java @@ -53,7 +53,7 @@ public NetworkDomainVO(long networkId, long domainId, Boolean subdomainAccess) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java index 9cf9a6158da0..46cdb8f40e64 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java @@ -68,7 +68,7 @@ public NetworkExternalFirewallVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java index 6ba5c8fd8b86..d9bc934ebb00 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java @@ -69,7 +69,7 @@ public NetworkExternalLoadBalancerVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java index ea381166b07c..f4690360df64 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java @@ -51,7 +51,7 @@ public NetworkOpVO(long id, boolean gc) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigVO.java b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigVO.java index e87d656f53d8..db140fbea9c2 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigVO.java @@ -56,7 +56,7 @@ public NetworkRuleConfigVO(long securityGroupId, String publicPort, String priva } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java index 4e1e9aff4561..f87fc57de745 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java @@ -52,7 +52,7 @@ public class NetworkServiceMapVO implements InternalIdentity { Date created; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java index 34d5aa7420ea..e0eb8149a7cc 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java @@ -304,7 +304,7 @@ public long getRelated() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java index c2882fc4eaf7..07847f9d70d9 100644 --- a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java +++ b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java @@ -50,7 +50,7 @@ public OpRouterMonitorServiceVO(long vmId, String name, String lastAlertTimestam @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java index 65d776ed5b85..884a868cb194 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java @@ -55,7 +55,7 @@ protected PhysicalNetworkIsolationMethodVO(long physicalNetworkId, String isolat } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java index 415b513b405a..1a11bece8c2e 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java @@ -110,7 +110,7 @@ public PhysicalNetworkServiceProviderVO(long physicalNetworkId, String name) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java index df9030aacf6d..bfe436d007b5 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java @@ -55,7 +55,7 @@ protected PhysicalNetworkTagVO(long physicalNetworkId, String tag) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java index a5eff2aeab90..ae97ed068803 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java @@ -87,7 +87,7 @@ public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficT } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkVO.java index 52ebe7596a41..7eb55b7c4f9c 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkVO.java @@ -127,7 +127,7 @@ public void setState(State state) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileVO.java b/engine/schema/src/com/cloud/network/dao/PortProfileVO.java index 94ea0891057a..5809f20bc16e 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileVO.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileVO.java @@ -89,7 +89,7 @@ public enum PortMode { // Accessor methods @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java index fdb98b9dd9d8..582d43ef0f3a 100644 --- a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java +++ b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnVO.java @@ -139,7 +139,7 @@ public Long getNetworkId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java b/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java index db86cfa26b07..699ba515f0cc 100644 --- a/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java +++ b/engine/schema/src/com/cloud/network/dao/RouterNetworkVO.java @@ -69,7 +69,7 @@ public Network.GuestType getGuestType() { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java index 5bcf361836f6..7f736d490557 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java @@ -99,7 +99,7 @@ public Site2SiteCustomerGatewayVO(String name, long accountId, long domainId, St } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java index 85643fc04377..461a7b4d7291 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java @@ -87,7 +87,7 @@ public Site2SiteVpnConnectionVO(long accountId, long domainId, long vpnGatewayId } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java index 260e5fc4c0b3..f9a8a65222ca 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java @@ -71,7 +71,7 @@ public Site2SiteVpnGatewayVO(long accountId, long domainId, long addrId, long vp } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/dao/SslCertVO.java b/engine/schema/src/com/cloud/network/dao/SslCertVO.java index 2676d611bd7d..8cc9e86d25d3 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertVO.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertVO.java @@ -77,7 +77,7 @@ public SslCertVO(String cert, String key, String password, String chain, Long ac // Getters @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/element/OvsProviderVO.java b/engine/schema/src/com/cloud/network/element/OvsProviderVO.java index 09ea59d04409..aa6802013d59 100644 --- a/engine/schema/src/com/cloud/network/element/OvsProviderVO.java +++ b/engine/schema/src/com/cloud/network/element/OvsProviderVO.java @@ -68,7 +68,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java b/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java index 17bc16536b6a..fcf5e03ef056 100644 --- a/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java +++ b/engine/schema/src/com/cloud/network/element/VirtualRouterProviderVO.java @@ -76,7 +76,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java index 169102af8c7c..65bf129e9a52 100644 --- a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java +++ b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java @@ -133,7 +133,7 @@ public long getDomainId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java index e230eae00082..676309c33558 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java @@ -90,7 +90,7 @@ public SecurityGroupRuleVO(SecurityRuleType type, long securityGroupId, int from } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java index 3ec5cec59e60..0caf19bf6ee7 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java @@ -98,7 +98,7 @@ public SecurityGroupRulesVO(long id, String name, String description, Long domai } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java index 55020ea8e027..3b029b58f0f6 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java @@ -65,7 +65,7 @@ public SecurityGroupVMMapVO(long securityGroupId, long instanceId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java index 4a4c83ae74a3..f7eccb1af2c0 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java @@ -61,7 +61,7 @@ public SecurityGroupVO(String name, String description, long domainId, long acco } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java index f646b6fdb34e..7aedecadaf08 100644 --- a/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java +++ b/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java @@ -66,7 +66,7 @@ protected SecurityGroupWorkVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java b/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java index 5d2c948ec432..01fda5bea0b6 100644 --- a/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java +++ b/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java @@ -60,7 +60,7 @@ public VmRulesetLogVO(Long instanceId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java index c366f947961a..94ccb9ef814c 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java @@ -55,7 +55,7 @@ public NetworkACLItemCidrsVO(long networkAclItemId, String cidrList) { * @see org.apache.cloudstack.api.InternalIdentity#getId() */ @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java index 6eb9cb0e991c..8a9a338ada8c 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java @@ -127,7 +127,7 @@ public List getSourceCidrList() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java index b6ed5cbd2cbb..7eecef5dc1e0 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLVO.java @@ -76,7 +76,7 @@ public Long getVpcId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java b/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java index ad17eb1c8f39..05c2abab6ce7 100644 --- a/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java +++ b/engine/schema/src/com/cloud/network/vpc/PrivateIpVO.java @@ -85,7 +85,7 @@ public Date getTakenAt() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java b/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java index 2c2d53edb29f..4462a7a62737 100644 --- a/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java +++ b/engine/schema/src/com/cloud/network/vpc/StaticRouteVO.java @@ -111,7 +111,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java b/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java index 23568b492303..68ad89e01d9f 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java @@ -132,7 +132,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java b/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java index c365ae7b441b..fedddba7b019 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcOfferingServiceMapVO.java @@ -52,7 +52,7 @@ public class VpcOfferingServiceMapVO implements InternalIdentity { Date created; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java b/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java index bd13a02d90a5..30a7370548e7 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java @@ -100,7 +100,7 @@ public VpcOfferingVO(final String name, final String displayText, final boolean } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/network/vpc/VpcVO.java b/engine/schema/src/com/cloud/network/vpc/VpcVO.java index b78f22f9f55b..3f636e340bcd 100644 --- a/engine/schema/src/com/cloud/network/vpc/VpcVO.java +++ b/engine/schema/src/com/cloud/network/vpc/VpcVO.java @@ -111,7 +111,7 @@ public VpcVO(final long zoneId, final String name, final String displayText, fin } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java index c16c5ac4bf1a..fc5530b13b36 100644 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingDetailsVO.java @@ -58,7 +58,7 @@ public NetworkOfferingDetailsVO(long offeringId, Detail detailName, String value } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java index 5171b1b8a87e..60df5e2970fb 100644 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingServiceMapVO.java @@ -53,7 +53,7 @@ public class NetworkOfferingServiceMapVO implements InternalIdentity { Date created; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java index c3d849d134c8..2f45e53216b2 100644 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java @@ -163,7 +163,7 @@ public void setKeepAliveEnabled(boolean keepAliveEnabled) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/projects/ProjectAccountVO.java b/engine/schema/src/com/cloud/projects/ProjectAccountVO.java index 8a337d620d2a..dd9f44f32dfd 100644 --- a/engine/schema/src/com/cloud/projects/ProjectAccountVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectAccountVO.java @@ -67,7 +67,7 @@ public ProjectAccountVO(Project project, long accountId, Role accountRole) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java b/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java index 9775135beabb..825be35a9186 100644 --- a/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectInvitationVO.java @@ -77,7 +77,7 @@ public ProjectInvitationVO(long projectId, Long accountId, Long domainId, String } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/projects/ProjectVO.java b/engine/schema/src/com/cloud/projects/ProjectVO.java index 77eed40d7bad..451508768c96 100644 --- a/engine/schema/src/com/cloud/projects/ProjectVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectVO.java @@ -100,7 +100,7 @@ public long getDomainId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java b/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java index a3886bc611d0..3d9bff407bb6 100644 --- a/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java +++ b/engine/schema/src/com/cloud/secstorage/CommandExecLogVO.java @@ -68,7 +68,7 @@ public CommandExecLogVO(long hostId, long instanceId, String commandName, int we } @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java index 8dfe5273b944..0825b05dd4fd 100644 --- a/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java +++ b/engine/schema/src/com/cloud/service/ServiceOfferingDetailsVO.java @@ -75,7 +75,7 @@ public String getValue() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java index 5de7f987e12f..ed68135f807f 100644 --- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java +++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java @@ -240,7 +240,7 @@ public void setState(State state) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java b/engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java index 36773e351e36..cc0e26208019 100644 --- a/engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java +++ b/engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java @@ -40,7 +40,7 @@ public class GuestOSCategoryVO implements GuestOsCategory { String uuid = UUID.randomUUID().toString(); @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/GuestOSHypervisorVO.java b/engine/schema/src/com/cloud/storage/GuestOSHypervisorVO.java index 087649b887a2..d4a20fc2b4a3 100644 --- a/engine/schema/src/com/cloud/storage/GuestOSHypervisorVO.java +++ b/engine/schema/src/com/cloud/storage/GuestOSHypervisorVO.java @@ -61,7 +61,7 @@ public class GuestOSHypervisorVO implements GuestOSHypervisor { private boolean isUserDefined; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/GuestOSVO.java b/engine/schema/src/com/cloud/storage/GuestOSVO.java index f04f9a4208c7..4b99b5f29c49 100644 --- a/engine/schema/src/com/cloud/storage/GuestOSVO.java +++ b/engine/schema/src/com/cloud/storage/GuestOSVO.java @@ -58,7 +58,7 @@ public class GuestOSVO implements GuestOS { private boolean isUserDefined; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/LaunchPermissionVO.java b/engine/schema/src/com/cloud/storage/LaunchPermissionVO.java index cc4f3fce407c..1a626bbbaf4a 100644 --- a/engine/schema/src/com/cloud/storage/LaunchPermissionVO.java +++ b/engine/schema/src/com/cloud/storage/LaunchPermissionVO.java @@ -45,7 +45,7 @@ public LaunchPermissionVO(long templateId, long accountId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java b/engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java index c78485868265..112f13d05586 100644 --- a/engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java +++ b/engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java @@ -77,7 +77,7 @@ public SnapshotPolicyVO(long volumeId, String schedule, String timezone, Interva } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java b/engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java index 80a890aacad6..8899f8fa1f2d 100644 --- a/engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java +++ b/engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java @@ -72,7 +72,7 @@ public SnapshotScheduleVO(long volumeId, long policyId, Date scheduledTimestamp) } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/SnapshotVO.java b/engine/schema/src/com/cloud/storage/SnapshotVO.java index 950c5e972914..4893c0e46067 100644 --- a/engine/schema/src/com/cloud/storage/SnapshotVO.java +++ b/engine/schema/src/com/cloud/storage/SnapshotVO.java @@ -122,7 +122,7 @@ public SnapshotVO(long dcId, long accountId, long domainId, Long volumeId, Long } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java b/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java index 53c08322e0cf..891075aa41da 100644 --- a/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java +++ b/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java @@ -72,7 +72,7 @@ public long getHostId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java b/engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java index 53155bff31dc..b4bd79f8b261 100644 --- a/engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java +++ b/engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java @@ -30,7 +30,7 @@ public class StoragePoolWorkVO implements InternalIdentity { @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/UploadVO.java b/engine/schema/src/com/cloud/storage/UploadVO.java index c49b28b6793c..e83c42e65186 100644 --- a/engine/schema/src/com/cloud/storage/UploadVO.java +++ b/engine/schema/src/com/cloud/storage/UploadVO.java @@ -93,7 +93,7 @@ public void setDataStoreId(long hostId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java b/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java index f988abab3998..4a392487b6d0 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java @@ -56,7 +56,7 @@ public VMTemplateDetailVO(long templateId, String name, String value, boolean di } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java index 4ba508858349..83ff747489e5 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java @@ -143,7 +143,7 @@ public void setDownloadState(Status downloadState) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java b/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java index 6dfe6eb3e872..32aa7ca4f116 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java @@ -139,7 +139,7 @@ public void setDownloadState(Status downloadState) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java index dd2b35aef983..98cf89370ebb 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java @@ -314,7 +314,7 @@ public void setState(State state) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java b/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java index 2f4c882a5932..53b693d1390f 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java @@ -67,7 +67,7 @@ public VMTemplateZoneVO(long zoneId, long templateId, Date lastUpdated) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java index 6723f0b8bc18..721a42f3ba49 100644 --- a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java @@ -56,7 +56,7 @@ public VolumeDetailVO(long volumeId, String name, String value, boolean display) } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/com/cloud/storage/VolumeHostVO.java index 56a9a9285cdb..dc38a5c7727d 100644 --- a/engine/schema/src/com/cloud/storage/VolumeHostVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeHostVO.java @@ -155,7 +155,7 @@ public void setDownloadState(Status downloadState) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java b/engine/schema/src/com/cloud/storage/VolumeVO.java index d8323e998f87..006b737e5079 100644 --- a/engine/schema/src/com/cloud/storage/VolumeVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeVO.java @@ -287,7 +287,7 @@ public void setRecreatable(boolean recreatable) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java index f217501a3021..ed9b2a5a2678 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDetailsVO.java @@ -78,7 +78,7 @@ public boolean isDisplay() { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/tags/ResourceTagVO.java b/engine/schema/src/com/cloud/tags/ResourceTagVO.java index cc29d8ea15ad..0f8933bfc151 100644 --- a/engine/schema/src/com/cloud/tags/ResourceTagVO.java +++ b/engine/schema/src/com/cloud/tags/ResourceTagVO.java @@ -114,7 +114,7 @@ public String toString() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java b/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java index 48e4766e7157..d6de2ad176d1 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java +++ b/engine/schema/src/com/cloud/upgrade/dao/VersionVO.java @@ -64,7 +64,7 @@ protected VersionVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java b/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java index 4337d00b04fe..faa1532ce89a 100644 --- a/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java +++ b/engine/schema/src/com/cloud/usage/ExternalPublicIpStatisticsVO.java @@ -63,7 +63,7 @@ public ExternalPublicIpStatisticsVO(long zoneId, long accountId, String publicIp } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java b/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java index 4c26d6a9d2a5..f452ee414d47 100644 --- a/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java +++ b/engine/schema/src/com/cloud/usage/UsageIPAddressVO.java @@ -93,7 +93,7 @@ public long getZoneId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageJobVO.java b/engine/schema/src/com/cloud/usage/UsageJobVO.java index d00e67a1069f..54682eca0fa4 100644 --- a/engine/schema/src/com/cloud/usage/UsageJobVO.java +++ b/engine/schema/src/com/cloud/usage/UsageJobVO.java @@ -84,7 +84,7 @@ public UsageJobVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java b/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java index d85d5ff4c120..136ae6ce6595 100644 --- a/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java +++ b/engine/schema/src/com/cloud/usage/UsageLoadBalancerPolicyVO.java @@ -75,7 +75,7 @@ public long getDomainId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java b/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java index b6eb05634f61..167e7bb57a90 100644 --- a/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java +++ b/engine/schema/src/com/cloud/usage/UsagePortForwardingRuleVO.java @@ -75,7 +75,7 @@ public long getDomainId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageStorageVO.java b/engine/schema/src/com/cloud/usage/UsageStorageVO.java index 6b1cd4e41c73..8cf331fca0ac 100644 --- a/engine/schema/src/com/cloud/usage/UsageStorageVO.java +++ b/engine/schema/src/com/cloud/usage/UsageStorageVO.java @@ -103,7 +103,7 @@ public long getDomainId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java b/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java index 1266d638fe65..ed969baf3a0e 100644 --- a/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVMSnapshotVO.java @@ -116,7 +116,7 @@ public long getVmId() { } @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/engine/schema/src/com/cloud/usage/UsageVO.java b/engine/schema/src/com/cloud/usage/UsageVO.java index c46abb3a9b5a..da7536ba0f0c 100644 --- a/engine/schema/src/com/cloud/usage/UsageVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVO.java @@ -220,7 +220,7 @@ public UsageVO(Long zoneId, Long accountId, Long domainId, String description, S } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/usage/UsageVolumeVO.java b/engine/schema/src/com/cloud/usage/UsageVolumeVO.java index 4b57aa0aa50d..0c21da3c7ae0 100644 --- a/engine/schema/src/com/cloud/usage/UsageVolumeVO.java +++ b/engine/schema/src/com/cloud/usage/UsageVolumeVO.java @@ -87,7 +87,7 @@ public long getDomainId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/user/AccountDetailVO.java b/engine/schema/src/com/cloud/user/AccountDetailVO.java index f4b356730ece..9befee68925c 100644 --- a/engine/schema/src/com/cloud/user/AccountDetailVO.java +++ b/engine/schema/src/com/cloud/user/AccountDetailVO.java @@ -71,7 +71,7 @@ public void setValue(String value) { } @Override - public long getId() { + public Long getId() { return id; } } diff --git a/engine/schema/src/com/cloud/user/AccountVO.java b/engine/schema/src/com/cloud/user/AccountVO.java index 0f5a0446e937..bbeaddd8107a 100644 --- a/engine/schema/src/com/cloud/user/AccountVO.java +++ b/engine/schema/src/com/cloud/user/AccountVO.java @@ -96,7 +96,7 @@ public boolean getNeedsCleanup() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/user/SSHKeyPairVO.java b/engine/schema/src/com/cloud/user/SSHKeyPairVO.java index fd7173ee7a80..f53b48eb7225 100644 --- a/engine/schema/src/com/cloud/user/SSHKeyPairVO.java +++ b/engine/schema/src/com/cloud/user/SSHKeyPairVO.java @@ -52,7 +52,7 @@ public class SSHKeyPairVO implements SSHKeyPair { private String privateKey; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/user/UserAccountVO.java b/engine/schema/src/com/cloud/user/UserAccountVO.java index 5ce0eb79d665..fc0d1bca2779 100644 --- a/engine/schema/src/com/cloud/user/UserAccountVO.java +++ b/engine/schema/src/com/cloud/user/UserAccountVO.java @@ -112,7 +112,7 @@ public UserAccountVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/user/UserStatisticsVO.java b/engine/schema/src/com/cloud/user/UserStatisticsVO.java index 8f71af5dd21f..5cb40ae6de3a 100644 --- a/engine/schema/src/com/cloud/user/UserStatisticsVO.java +++ b/engine/schema/src/com/cloud/user/UserStatisticsVO.java @@ -90,7 +90,7 @@ public long getAccountId() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/user/UserVO.java b/engine/schema/src/com/cloud/user/UserVO.java index da7811ecc5b6..b9173d01bfed 100644 --- a/engine/schema/src/com/cloud/user/UserVO.java +++ b/engine/schema/src/com/cloud/user/UserVO.java @@ -127,7 +127,7 @@ public UserVO(long accountId, String username, String password, String firstName } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java b/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java index eecb5b165b4c..affd3640fbfd 100644 --- a/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java +++ b/engine/schema/src/com/cloud/vm/InstanceGroupVMMapVO.java @@ -53,7 +53,7 @@ public InstanceGroupVMMapVO(long groupId, long instanceId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/InstanceGroupVO.java b/engine/schema/src/com/cloud/vm/InstanceGroupVO.java index 395751b705e2..6b7f9cb16f7f 100644 --- a/engine/schema/src/com/cloud/vm/InstanceGroupVO.java +++ b/engine/schema/src/com/cloud/vm/InstanceGroupVO.java @@ -71,7 +71,7 @@ protected InstanceGroupVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/NicDetailVO.java b/engine/schema/src/com/cloud/vm/NicDetailVO.java index 7dc72159f3fb..d0841ea27040 100644 --- a/engine/schema/src/com/cloud/vm/NicDetailVO.java +++ b/engine/schema/src/com/cloud/vm/NicDetailVO.java @@ -56,7 +56,7 @@ public NicDetailVO(long nicId, String name, String value, boolean display) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/NicVO.java b/engine/schema/src/com/cloud/vm/NicVO.java index 815429736090..e7e989edb2fb 100644 --- a/engine/schema/src/com/cloud/vm/NicVO.java +++ b/engine/schema/src/com/cloud/vm/NicVO.java @@ -234,7 +234,7 @@ public void setState(State state) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/UserVmDetailVO.java b/engine/schema/src/com/cloud/vm/UserVmDetailVO.java index 2b169a382727..94a20bdc7c97 100644 --- a/engine/schema/src/com/cloud/vm/UserVmDetailVO.java +++ b/engine/schema/src/com/cloud/vm/UserVmDetailVO.java @@ -56,7 +56,7 @@ public UserVmDetailVO(long vmId, String name, String value, boolean display) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/com/cloud/vm/VMInstanceVO.java index d4b18d078e49..a17402c32bfb 100644 --- a/engine/schema/src/com/cloud/vm/VMInstanceVO.java +++ b/engine/schema/src/com/cloud/vm/VMInstanceVO.java @@ -251,7 +251,7 @@ public long getUpdated() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java index 2f000fde8a48..3b7055aaa2b6 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasVO.java @@ -105,7 +105,7 @@ protected NicIpAliasVO() { String startIpOfSubnet; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java index f8730aac5d2b..aec0ad56a999 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java +++ b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpVO.java @@ -78,7 +78,7 @@ protected NicSecondaryIpVO() { long vmId; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java index b7a1c7bd3b15..d2ec955c2bd5 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java +++ b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java @@ -68,7 +68,7 @@ public String getValue() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java index df2966d45b66..31b674292813 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java +++ b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotVO.java @@ -156,7 +156,7 @@ public void setCreated(Date created) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java index e1357cdc2324..721af9919575 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupDomainMapVO.java @@ -54,7 +54,7 @@ public AffinityGroupDomainMapVO(long affinityGroupId, long domainId, Boolean sub } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java index 0670060419a7..d5e84536bb14 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java @@ -48,7 +48,7 @@ public AffinityGroupVMMapVO(long affinityGroupId, long instanceId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java index 03274ad4388f..33b70390afc1 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/AffinityGroupVO.java @@ -74,7 +74,7 @@ public AffinityGroupVO(String name, String type, String description, long domain } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java index ae6a807f5005..63e9a1029d46 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java @@ -53,7 +53,7 @@ public VMComputeTagVO(long vmId, String tag) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java index d7560e22bd10..c328d26cd5bb 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java @@ -233,7 +233,7 @@ public long getUpdated() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java index ef42d0716cbe..f256cebb807a 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java @@ -53,7 +53,7 @@ public VMNetworkMapVO(long vmId, long networkId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java index b934a5d6118c..c01f3fab44de 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java @@ -90,7 +90,7 @@ public VMReservationVO(long vmId, long dataCenterId, long podId, long clusterId, } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java index 533aaf7e80e9..d37f086d7c3a 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java @@ -53,7 +53,7 @@ public VMRootDiskTagVO(long vmId, String rootDiskTag) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java index 0452d0f5d74e..8e719c563311 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java @@ -61,7 +61,7 @@ public VolumeReservationVO(long vmId, long volumeId, long poolId, long vmReserva } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java index 338ec6c47c09..a07eeab0ea90 100644 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeVO.java @@ -70,7 +70,7 @@ public PortableIpRangeVO(int regionId, String vlan, String gateway, String netma } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java index 06d0508bede7..7e71e0e22bdc 100644 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpVO.java @@ -94,7 +94,7 @@ public PortableIpVO(int regionId, Long rangeId, String vlan, String gateway, Str } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java index 9445dc916d55..88184629a403 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java @@ -58,7 +58,7 @@ public GlobalLoadBalancerLbRuleMapVO(long loadBalancerId, long gslbLoadBalancerI } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java index 88cd0003a23e..6e467f24f570 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java @@ -157,7 +157,7 @@ public void setRegion(int region) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java index 9ac195a235db..42de571c27c1 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmGroupDetailVO.java @@ -56,7 +56,7 @@ public AutoScaleVmGroupDetailVO(long id, String name, String value, boolean disp } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java index d9b81a09f0f1..b03fcca68b30 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java @@ -56,7 +56,7 @@ public AutoScaleVmProfileDetailVO(long id, String name, String value, boolean di } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java index 00eb70167637..6032fc83b182 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/DiskOfferingDetailVO.java @@ -56,7 +56,7 @@ public DiskOfferingDetailVO(long id, String name, String value, boolean display) } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java index 636d889fafe8..6ad3371643a4 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java @@ -56,7 +56,7 @@ public FirewallRuleDetailVO(long id, String name, String value, boolean display) } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java index 52b30ff18b44..703a12a180e0 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/LBHealthCheckPolicyDetailVO.java @@ -52,7 +52,7 @@ public LBHealthCheckPolicyDetailVO(long id, String name, String value, boolean d } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java index caa2d90000fc..e661cbd8dd07 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/LBStickinessPolicyDetailVO.java @@ -56,7 +56,7 @@ public LBStickinessPolicyDetailVO(long id, String name, String value, boolean di } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java index d9a74ed233cc..70c4bcf130a8 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java @@ -56,7 +56,7 @@ public NetworkACLItemDetailVO(long id, String name, String value, boolean displa } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java index 49fba5ac4147..0283af7dfbba 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java @@ -56,7 +56,7 @@ public NetworkACLListDetailVO(long id, String name, String value, boolean displa } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java index 5fb01a25c2a9..eb4f543509fa 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java @@ -56,7 +56,7 @@ public RemoteAccessVpnDetailVO(long id, String name, String value, boolean displ } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java index 5c4c92d8cbb7..1b11187e7311 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteCustomerGatewayDetailVO.java @@ -56,7 +56,7 @@ public Site2SiteCustomerGatewayDetailVO(long id, String name, String value, bool } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java index 17e08f21d007..297f2e55adb8 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnConnectionDetailVO.java @@ -56,7 +56,7 @@ public Site2SiteVpnConnectionDetailVO(long id, String name, String value, boolea } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java index 7906655b909c..5be34700ca5c 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/Site2SiteVpnGatewayDetailVO.java @@ -56,7 +56,7 @@ public Site2SiteVpnGatewayDetailVO(long id, String name, String value, boolean d } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java index 2ee48e6b4e93..4be5c04df21b 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java @@ -55,7 +55,7 @@ public SnapshotPolicyDetailVO(long id, String name, String value) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserDetailVO.java index 79115a2a1f3e..b5fee069b31d 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserDetailVO.java @@ -55,7 +55,7 @@ public UserDetailVO(long id, String name, String value) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java index 80393e083b9c..c3066bcf32b5 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java @@ -56,7 +56,7 @@ public UserIpAddressDetailVO(long id, String name, String value, boolean display } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java index 1952e238a089..6175f4cb001f 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcDetailVO.java @@ -56,7 +56,7 @@ public VpcDetailVO(long id, String name, String value, boolean display) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java index 0f4b2aff4fd0..e6d44e657ca8 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/VpcGatewayDetailVO.java @@ -56,7 +56,7 @@ public VpcGatewayDetailVO(long id, String name, String value, boolean display) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java index 66014377004e..fccd4622f651 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailVO.java @@ -52,7 +52,7 @@ public ImageStoreDetailVO(long storeId, String name, String value) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java index 2d1a3eddd699..542d903a760f 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java @@ -92,7 +92,7 @@ public void setRole(DataStoreRole role) { } @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java index 5351959ea1ac..660704329ffe 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailVO.java @@ -56,7 +56,7 @@ protected PrimaryDataStoreDetailVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java index 8a746ff9d1d1..414f7ee03d1d 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailVO.java @@ -56,7 +56,7 @@ public StoragePoolDetailVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java index ad2ad4187702..5e32ae84cd39 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolVO.java @@ -120,7 +120,7 @@ public class StoragePoolVO implements StoragePool { private HypervisorType hypervisor; @Override - public long getId() { + public Long getId() { return id; } diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java index 182a8ec4cab7..09f714f9e3f9 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java @@ -94,7 +94,7 @@ public DataStoreRole getRole() { } @Override - public long getId() { + public Long getId() { return this.imageDataStoreVO.getId(); } diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java index 473959b08140..58b83a00159b 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java @@ -102,7 +102,7 @@ public String getUniqueName() { } @Override - public long getId() { + public Long getId() { return imageVO.getId(); } diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index 60ff31e4342f..67f3dd0df296 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -154,7 +154,7 @@ public VolumeInfo getBaseVolume() { } @Override - public long getId() { + public Long getId() { return snapshot.getId(); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java index db752fe8a1ea..56355b1bd4d6 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java @@ -62,7 +62,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return templateInfo.getId(); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java b/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java index a660f412113f..0d8217f88bc1 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java @@ -35,9 +35,9 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { // TODO Auto-generated method stub - return 0; + return 0l; } @Override diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java index f3c9e790277a..455ac73c2eee 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java @@ -133,7 +133,7 @@ public DataStoreRole getRole() { } @Override - public long getId() { + public Long getId() { return pdsv.getId(); } diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java index 5bf49a9a8138..b1e4f4bbb01c 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -249,7 +249,7 @@ public void update() { } @Override - public long getId() { + public Long getId() { return volumeVO.getId(); } diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java index 0ca9ed512546..87e2c6fec595 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobVO.java @@ -149,7 +149,7 @@ public AsyncJobVO(String related, long userId, long accountId, String cmd, Strin } @Override - public long getId() { + public Long getId() { return id; } diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java index fa2535cd63f5..93165616ce37 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItem.java @@ -22,7 +22,7 @@ public interface SyncQueueItem { /** * @return queue item id */ - long getId(); + Long getId(); /** * @return queue id diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java index cbdb78d4d556..319c817fa59f 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueItemVO.java @@ -61,7 +61,7 @@ public class SyncQueueItemVO implements SyncQueueItem, InternalIdentity { private Date created; @Override - public long getId() { + public Long getId() { return id; } diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java index 9e4093b5818c..4c15ade6bdde 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueVO.java @@ -63,7 +63,7 @@ public class SyncQueueVO implements InternalIdentity { private long queueSizeLimit = 0; @Override - public long getId() { + public Long getId() { return id; } diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java index c44347c85efe..a8a333562ff9 100644 --- a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java +++ b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java @@ -63,7 +63,7 @@ public String getRootCACert() { void saveCertificate(String name, String certificate, String key, String domainSuffix); - byte[] getKeystoreBits(String name, String aliasForCertificateInStore, String storePassword); + Byte[] getKeystoreBits(String name, String aliasForCertificateInStore, String storePassword); void saveCertificate(String name, String certificate, Integer index, String domainSuffix); diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java index 374c080413f8..98dc2048d716 100644 --- a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java +++ b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java @@ -87,7 +87,7 @@ public void saveCertificate(String name, String certificate, Integer index, Stri } @Override - public byte[] getKeystoreBits(String name, String aliasForCertificateInStore, String storePassword) { + public Byte[] getKeystoreBits(String name, String aliasForCertificateInStore, String storePassword) { assert (name != null); assert (aliasForCertificateInStore != null); assert (storePassword != null); diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java index e243500447d5..f53b40419e5b 100644 --- a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java +++ b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java @@ -54,7 +54,7 @@ public KeystoreVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java index 8c9a802f6c11..160ea9ad09fb 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/LunVO.java @@ -87,7 +87,7 @@ public LunVO(Long id, String path, Long volumeId, Long size, String lunName, Str } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java index cfaced96c5ed..a9203db53957 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappVolumeVO.java @@ -135,7 +135,7 @@ public void setVolumeSize(String volumeSize) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java b/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java index a045fecb290f..a98708b77cf0 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/PoolVO.java @@ -30,7 +30,7 @@ public class PoolVO implements InternalIdentity { @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java index 3a24cf4554d8..96c3158ea441 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java @@ -1,82 +1,82 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// -package com.cloud.baremetal.database; - -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import java.util.UUID; - -/** - * Created by frank on 5/8/14. - */ -@Entity -@Table(name = "baremetal_rct") -public class BaremetalRctVO implements InternalIdentity, Identity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private long id; - - @Column(name = "uuid") - private String uuid = UUID.randomUUID().toString(); - - @Column(name = "url") - private String url; - - @Column(name = "rct") - private String rct; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getRct() { - return rct; - } - - public void setRct(String rct) { - this.rct = rct; - } -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +package com.cloud.baremetal.database; + +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import java.util.UUID; + +/** + * Created by frank on 5/8/14. + */ +@Entity +@Table(name = "baremetal_rct") +public class BaremetalRctVO implements InternalIdentity, Identity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long id; + + @Column(name = "uuid") + private String uuid = UUID.randomUUID().toString(); + + @Column(name = "url") + private String url; + + @Column(name = "rct") + private String rct; + + public Long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getRct() { + return rct; + } + + public void setRct(String rct) { + this.rct = rct; + } +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index 5ef861d8139d..2003dd0ff6ab 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -350,7 +350,7 @@ protected Map getHostVmStateReport() { @Override public StartupCommand[] initialize() { - StartupRoutingCommand cmd = new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.BareMetal, + StartupRoutingCommand cmd = new StartupRoutingCommand(0, 0l, 0l, 0l, null, Hypervisor.HypervisorType.BareMetal, new HashMap()); cmd.setDataCenter(_zone); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java index 4f59a8331876..69a95b956658 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java @@ -29,7 +29,7 @@ public class PrepareKickstartPxeServerCommand extends Command { private String initrd; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java index 17c5708a322d..c032af7e6f74 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java @@ -213,7 +213,7 @@ public final StartupCommand[] initialize() { // Create default StartupRoutingCommand, then customise StartupRoutingCommand defaultStartRoutCmd = - new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.Hyperv, RouterPrivateIpStrategy.HostLocal); + new StartupRoutingCommand(0, 0l, 0l, 0l, null, Hypervisor.HypervisorType.Hyperv, RouterPrivateIpStrategy.HostLocal); // Identity within the data centre is decided by CloudStack kernel, // and passed via ServerResource.configure() diff --git a/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java b/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java index 75a864bd1443..d234c99d07a4 100644 --- a/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java +++ b/plugins/hypervisors/hyperv/test/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java @@ -251,7 +251,7 @@ public final void testGetVmStatsCommand() { public final void testStartupCommand() { StartupRoutingCommand defaultStartRoutCmd = - new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.Hyperv, RouterPrivateIpStrategy.HostLocal); + new StartupRoutingCommand(0, 0l, 0l, 0l, null, Hypervisor.HypervisorType.Hyperv, RouterPrivateIpStrategy.HostLocal); // Identity within the data centre is decided by CloudStack kernel, // and passed via ServerResource.configure() diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 11317afe5e2c..8abc060d37f8 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3071,11 +3071,11 @@ public VmStatsEntry getVmStat(final Connect conn, final String vmName) throws Li if (oldStats != null) { final long deltaiord = io_rd - oldStats._ioRead; if (deltaiord > 0) { - stats.setDiskReadIOs(deltaiord); + stats.setDiskReadIOs((new Long(deltaiord)).doubleValue()); } final long deltaiowr = io_wr - oldStats._ioWrote; if (deltaiowr > 0) { - stats.setDiskWriteIOs(deltaiowr); + stats.setDiskWriteIOs((new Long(deltaiowr)).doubleValue()); } final double deltabytesrd = bytes_rd - oldStats._bytesRead; if (deltabytesrd > 0) { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java index 80bd5fac8b0f..aaac327f2831 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java @@ -48,7 +48,7 @@ public Answer execute(final GetHostStatsCommand command, final LibvirtComputingR final Pair nicStats = libvirtComputingResource.getNicStats(libvirtComputingResource.getPublicBridgeName()); - final HostStatsEntry hostStats = new HostStatsEntry(command.getHostId(), cpuUtil, nicStats.first() / 1024, nicStats.second() / 1024, "host", totMem, freeMem, 0, 0); + final HostStatsEntry hostStats = new HostStatsEntry(command.getHostId(), cpuUtil, nicStats.first() / 1024, nicStats.second() / 1024, "host", totMem, freeMem, 0.0, 0.0); return new GetHostStatsAnswer(command, hostStats); } } \ No newline at end of file diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 98a074a3f05c..9d17f01df7c0 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -191,13 +191,13 @@ public class LibvirtComputingResourceTest { */ @Test public void testCreateVMFromSpecLegacy() { - final int id = _random.nextInt(65534); + final long id = _random.nextInt(65534); final String name = "test-instance-1"; final int cpus = _random.nextInt(2) + 1; final int speed = 1024; - final int minRam = 256 * 1024; - final int maxRam = 512 * 1024; + final long minRam = 256 * 1024; + final long maxRam = 512 * 1024; final String os = "Ubuntu"; @@ -220,14 +220,14 @@ public void testCreateVMFromSpecLegacy() { */ @Test public void testCreateVMFromSpecWithTopology6() { - final int id = _random.nextInt(65534); + final long id = _random.nextInt(65534); final String name = "test-instance-1"; final int cpus = 12; final int minSpeed = 1024; final int maxSpeed = 2048; - final int minRam = 256 * 1024; - final int maxRam = 512 * 1024; + final long minRam = 256 * 1024; + final long maxRam = 512 * 1024; final String os = "Ubuntu"; @@ -250,14 +250,14 @@ public void testCreateVMFromSpecWithTopology6() { */ @Test public void testCreateVMFromSpecWithTopology4() { - final int id = _random.nextInt(65534); + final long id = _random.nextInt(65534); final String name = "test-instance-1"; final int cpus = 8; final int minSpeed = 1024; final int maxSpeed = 2048; - final int minRam = 256 * 1024; - final int maxRam = 512 * 1024; + final long minRam = 256 * 1024; + final long maxRam = 512 * 1024; final String os = "Ubuntu"; @@ -284,14 +284,14 @@ public void testCreateVMFromSpecWithTopology4() { */ @Test public void testCreateVMFromSpec() { - final int id = _random.nextInt(65534); + final long id = _random.nextInt(65534); final String name = "test-instance-1"; final int cpus = _random.nextInt(2) + 1; final int minSpeed = 1024; final int maxSpeed = 2048; - final int minRam = 256 * 1024; - final int maxRam = 512 * 1024; + final long minRam = 256 * 1024; + final long maxRam = 512 * 1024; final String os = "Ubuntu"; diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java index 0541b7e61a2f..e38dff4ee3c6 100644 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java @@ -288,7 +288,7 @@ protected void fillHostInfo(StartupRoutingCommand cmd) { OvmHost.Details hostDetails = OvmHost.getDetails(_conn); cmd.setName(hostDetails.name); - cmd.setSpeed(hostDetails.cpuSpeed); + cmd.setSpeed(new Long(hostDetails.cpuSpeed)); cmd.setCpus(hostDetails.cpuNum); cmd.setMemory(hostDetails.freeMemory); cmd.setDom0MinMemory(hostDetails.dom0Memory); @@ -680,7 +680,7 @@ protected Answer execute(GetHostStatsCommand cmd) { Double txBytes = Double.parseDouble(res.get("txBytes")); Double totalMemory = Double.parseDouble(res.get("totalMemory")); Double freeMemory = Double.parseDouble(res.get("freeMemory")); - HostStatsEntry hostStats = new HostStatsEntry(cmd.getHostId(), cpuUtil, rxBytes, txBytes, "host", totalMemory, freeMemory, 0, 0); + HostStatsEntry hostStats = new HostStatsEntry(cmd.getHostId(), cpuUtil, rxBytes, txBytes, "host", totalMemory, freeMemory, 0.0, 0.0); return new GetHostStatsAnswer(cmd, hostStats); } catch (Exception e) { s_logger.debug("Get host stats of " + cmd.getHostName() + " failed", e); @@ -785,10 +785,10 @@ private VmStatsEntry getVmStat(String vmName) throws XmlRpcException { _vmNetworkStats.put(vmName, oldNetworkStat); VmStatsEntry e = new VmStatsEntry(); - e.setCPUUtilization(cpuUtil); + e.setCPUUtilization(Double.valueOf(cpuUtil)); e.setNumCPUs(nvcpus); - e.setNetworkReadKBs(rx); - e.setNetworkWriteKBs(tx); + e.setNetworkReadKBs((new Long(rx)).doubleValue()); + e.setNetworkWriteKBs((new Long(tx)).doubleValue()); e.setEntityType("vm"); return e; } diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupport.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupport.java index 55a087d9746a..a29be722c674 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupport.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupport.java @@ -198,7 +198,7 @@ public void fillHostInfo(StartupRoutingCommand cmd) { LOGGER.debug("Hypervisor version: " + host.getOvmVersion()); } cmd.setName(host.getHostName()); - cmd.setSpeed(host.getCpuKhz()); + cmd.setSpeed(host.getCpuKhz().longValue()); cmd.setCpus(host.getTotalThreads()); cmd.setCpuSockets(host.getCpuSockets()); cmd.setMemory(host.getMemory().longValue()); @@ -703,7 +703,7 @@ public Answer execute(GetHostStatsCommand cmd) { Double freeMemory = Double.parseDouble(stats.get("free")); HostStatsEntry hostStats = new HostStatsEntry(cmd.getHostId(), cpuUtil, rxBytes, txBytes, "host", totalMemory, freeMemory, - 0, 0); + 0.0, 0.0); return new GetHostStatsAnswer(cmd, hostStats); } catch (Exception e) { LOGGER.debug("Unable to get host stats for: " + cmd.getHostName(), diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java index 407e6b5df461..0d84ccea7674 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java @@ -269,13 +269,13 @@ private VmStatsEntry getVmStat(String vmName) { if (oldVmStats == null) { LOGGER.debug("No old stats retrieved stats from " + vmName); stats.setNumCPUs(1); - stats.setNetworkReadKBs(0); - stats.setNetworkWriteKBs(0); - stats.setDiskReadKBs(0); - stats.setDiskWriteKBs(0); - stats.setDiskReadIOs(0); - stats.setDiskWriteIOs(0); - stats.setCPUUtilization(0); + stats.setNetworkReadKBs(0.0); + stats.setNetworkWriteKBs(0.0); + stats.setDiskReadKBs(0.0); + stats.setDiskWriteKBs(0.0); + stats.setDiskReadIOs(0.0); + stats.setDiskWriteIOs(0.0); + stats.setCPUUtilization(0.0); stats.setEntityType("vm"); } else { LOGGER.debug("Retrieved new stats from " + vmName); diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java index a64a09e05e03..57400cc1560f 100644 --- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java +++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessorTest.java @@ -318,11 +318,11 @@ public void copyVolumeCommandTest() throws ConfigurationException { String src = linux.getVirtualDisksDir() + ovmObject.newUuid() + ".raw"; String dst = linux.getVirtualDisksDir() + ovmObject.newUuid() + ".raw"; StoragePoolVO poolio = new StoragePoolVO(); - CopyVolumeCommand copy = new CopyVolumeCommand(0, src, poolio, dst, + CopyVolumeCommand copy = new CopyVolumeCommand(0l, src, poolio, dst, true, 0, false); Answer ra = hypervisor.executeRequest(copy); results.basicBooleanTest(ra.getResult()); - copy = new CopyVolumeCommand(0, src, poolio, dst, false, 0, false); + copy = new CopyVolumeCommand(0l, src, poolio, dst, false, 0, false); ra = hypervisor.executeRequest(copy); results.basicBooleanTest(ra.getResult()); } diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3VirtualRoutingResourceTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3VirtualRoutingResourceTest.java index d2a786a69182..2624758c7b45 100644 --- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3VirtualRoutingResourceTest.java +++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/Ovm3VirtualRoutingResourceTest.java @@ -204,7 +204,7 @@ public void prepareVpcCommandTest() throws ConfigurationException { private IpAddressTO[] getIp(String mac) { String br[] = xen.getVmNicBridge().split("[.]"); List ips = new ArrayList(); - IpAddressTO ip = new IpAddressTO(1, routerip, true, true, true, "vlan://" + IpAddressTO ip = new IpAddressTO(1l, routerip, true, true, true, "vlan://" + br[1], "64.1.1.1", "255.255.255.0", mac, 1000, false); ips.add(ip); IpAddressTO[] ipArray = ips.toArray(new IpAddressTO[ips.size()]); diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupportTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupportTest.java index b9a603150f02..4ed5defc2db5 100644 --- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupportTest.java +++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3HypervisorSupportTest.java @@ -236,7 +236,7 @@ public void MaintainCommandTest() throws ConfigurationException { @Test public void GetVncPortCommandTest() throws ConfigurationException { con = prepare(); - GetVncPortCommand cmd = new GetVncPortCommand(0, xen.getVmName()); + GetVncPortCommand cmd = new GetVncPortCommand(0l, xen.getVmName()); Answer ra = hypervisor.executeRequest(cmd); results.basicBooleanTest(ra.getResult()); } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java index 6edec12a8113..6aa4b297c797 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockConfigurationVO.java @@ -68,7 +68,7 @@ public class MockConfigurationVO implements InternalIdentity { private Date removed; @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHost.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHost.java index 04ef9b6e20d9..b0d0d833b67e 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHost.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHost.java @@ -25,7 +25,7 @@ public interface MockHost { public String getCapabilities(); - public long getId(); + public Long getId(); public String getName(); diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java index 89064f8234d0..a0015c543964 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockHostVO.java @@ -153,7 +153,7 @@ public void setCapabilities(String capabilities) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java index 630054c8388f..12894b2592db 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java @@ -47,7 +47,7 @@ public MockSecStorageVO() { } @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java index e3867610acfa..25cd881321e2 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecurityRulesVO.java @@ -68,7 +68,7 @@ public void setHostId(String hostId) { } @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java index 46cd0e47a7b6..267c1ac5bf28 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java @@ -66,7 +66,7 @@ public void setHostGuid(String hostGuid) { } @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java index cf471a37bd92..28675a70d5fc 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVMVO.java @@ -64,7 +64,7 @@ public MockVMVO() { } @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVm.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVm.java index 733003993c15..78091609021b 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVm.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVm.java @@ -47,7 +47,7 @@ public interface MockVm { public void setVncPort(int vncPort); - public long getId(); + public Long getId(); public String getBootargs(); diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java index 1a8cb085e9df..cdcd57a995b2 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java @@ -63,7 +63,7 @@ public enum MockVolumeType { private VMTemplateStorageResourceAssoc.Status status; @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java index 233a7782d156..e2e771bbc1fe 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java @@ -51,7 +51,7 @@ public class UcsBladeVO implements InternalIdentity, Identity { private String profileDn; @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java index 110b1ae83c6a..513c8c3d3a0b 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java @@ -57,7 +57,7 @@ public class UcsManagerVO implements InternalIdentity, Identity { private String password; @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java index 3b168f4076c9..c4a1aca9f5d1 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZone.java @@ -22,7 +22,7 @@ public interface LegacyZone extends InternalIdentity { @Override - long getId(); + Long getId(); long getZoneId(); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZoneVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZoneVO.java index 93533bc6e614..d17d6ffc0d9a 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZoneVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/LegacyZoneVO.java @@ -45,7 +45,7 @@ public class LegacyZoneVO implements LegacyZone { private long zoneId; @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java index b1f233c3606a..b9f3c4de337a 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java @@ -29,7 +29,7 @@ public interface VmwareDatacenter extends Identity, InternalIdentity { String getVcenterHost(); @Override - long getId(); + Long getId(); String getPassword(); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java index 86597b2e5c93..bd84c62442ae 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java @@ -69,7 +69,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java index 16a03a98ddca..de9845007179 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java @@ -23,7 +23,7 @@ public interface VmwareDatacenterZoneMap extends Grouping, InternalIdentity { @Override - public long getId(); + public Long getId(); public long getZoneId(); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java index a8d88b40502a..8196f53b9659 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java @@ -55,7 +55,7 @@ public VmwareDatacenterZoneMapVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 9a34cd2c08be..ac363986296e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -1722,7 +1722,7 @@ protected void fillHostInfo(final Connection conn, final StartupRoutingCommand c } cmd.setCaps(caps.toString()); - cmd.setSpeed(_host.getSpeed()); + cmd.setSpeed(new Long(_host.getSpeed())); cmd.setCpuSockets(_host.getCpuSockets()); cmd.setCpus(_host.getCpus()); @@ -2139,7 +2139,7 @@ protected boolean getHostInfo(final Connection conn) throws IllegalArgumentExcep public HostStatsEntry getHostStats(final Connection conn, final GetHostStatsCommand cmd, final String hostGuid, final long hostId) { - final HostStatsEntry hostStats = new HostStatsEntry(hostId, 0, 0, 0, "host", 0, 0, 0, 0); + final HostStatsEntry hostStats = new HostStatsEntry(hostId, 0.0, 0.0, 0.0, "host", 0.0, 0.0, 0.0, 0.0); final Object[] rrdData = getRRDData(conn, 1); // call rrd method with 1 // for host @@ -3277,7 +3277,7 @@ public HashMap getVmStats(final Connection conn, final Get final HashMap vmResponseMap = new HashMap(); for (final String vmUUID : vmUUIDs) { - vmResponseMap.put(vmUUID, new VmStatsEntry(0, 0, 0, 0, "vm")); + vmResponseMap.put(vmUUID, new VmStatsEntry(0.0, 0.0, 0.0, 0, "vm")); } final Object[] rrdData = getRRDData(conn, 2); // call rrddata with 2 for diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java index ca58f355336c..4cd3f7e485d8 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java @@ -214,7 +214,7 @@ public void testCheckConsoleProxyLoadCommand() { @Test public void testWatchConsoleProxyLoadCommand() { - final WatchConsoleProxyLoadCommand watchConsoleProxyCommand = new WatchConsoleProxyLoadCommand(0, 0, "", "", 0); + final WatchConsoleProxyLoadCommand watchConsoleProxyCommand = new WatchConsoleProxyLoadCommand(0, 0l, "", "", 0); final CitrixRequestWrapper wrapper = CitrixRequestWrapper.getInstance(); assertNotNull(wrapper); @@ -238,7 +238,7 @@ public void testReadyCommand() { @Test public void testGetHostStatsCommand() { - final GetHostStatsCommand statsCommand = new GetHostStatsCommand(null, null, 0); + final GetHostStatsCommand statsCommand = new GetHostStatsCommand(null, null, 0l); final CitrixRequestWrapper wrapper = CitrixRequestWrapper.getInstance(); assertNotNull(wrapper); @@ -1986,7 +1986,7 @@ public void testGetVmIpAddressCommand() throws XenAPIException, XmlRpcException class NotAValidCommand extends Command { @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfCommand.java b/plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfCommand.java index 6e08dadcc1bf..813be7e1f75a 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfCommand.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/agent/api/BcfCommand.java @@ -26,7 +26,7 @@ public class BcfCommand extends Command { private boolean topologySyncRequested; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CacheBcfTopologyCommand.java b/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CacheBcfTopologyCommand.java index 1ab22a52db4b..eb8b01b3bbc1 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CacheBcfTopologyCommand.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/agent/api/CacheBcfTopologyCommand.java @@ -29,7 +29,7 @@ public CacheBcfTopologyCommand(final TopologyData topology){ } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/BigSwitchBcfDeviceVO.java b/plugins/network-elements/bigswitch/src/com/cloud/network/BigSwitchBcfDeviceVO.java index 1338eebdb73f..52029cab710e 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/BigSwitchBcfDeviceVO.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/BigSwitchBcfDeviceVO.java @@ -91,7 +91,7 @@ public BigSwitchBcfDeviceVO(final long hostId, final long physicalNetworkId, } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfUtils.java b/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfUtils.java index da409df98359..3eafedb85809 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfUtils.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfUtils.java @@ -374,7 +374,7 @@ public List listACLbyNetwork(Network network){ for(FirewallRuleVO rule: fwRules){ AclData acl = new AclData(); acl.setId(rule.getUuid()); - acl.setPriority((int)rule.getId()); // CloudStack Firewall interface does not have priority + acl.setPriority(rule.getId().intValue()); // CloudStack Firewall interface does not have priority acl.setIpProto(rule.getProtocol()); String cidr = null; Integer port = rule.getSourcePortStart(); diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkCommand.java index 91b714a86464..c9e832102376 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkCommand.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/AssociateMacToNetworkCommand.java @@ -29,7 +29,7 @@ public AssociateMacToNetworkCommand(long networkId, String interfaceMac, String } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkCommand.java index 3516dc39f67a..612c84b64e5e 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkCommand.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/CreateNetworkCommand.java @@ -29,7 +29,7 @@ public CreateNetworkCommand(int vlanId, long networkId, String ownerName) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkCommand.java index 93e3f966a9aa..2873ebcada68 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkCommand.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DeleteNetworkCommand.java @@ -28,7 +28,7 @@ public DeleteNetworkCommand(int vlanId, long networkId) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java index 86777ae5c7be..01bc74d581b2 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/agent/api/DisassociateMacFromNetworkCommand.java @@ -27,7 +27,7 @@ public DisassociateMacFromNetworkCommand(long networkId, String interfaceMac) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsDeviceVO.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsDeviceVO.java index e229e3c8b848..ba222e24ded7 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsDeviceVO.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsDeviceVO.java @@ -68,7 +68,7 @@ public BrocadeVcsDeviceVO(final long hostId, long physicalNetworkId, final Strin } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java index fd3bc972168e..b110e9a34da4 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/BrocadeVcsNetworkVlanMappingVO.java @@ -65,7 +65,7 @@ public void setVlanId(int vlanId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java index 4f86d4b8d13f..209492aba95a 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java @@ -30,7 +30,7 @@ public AssociateAsaWithLogicalEdgeFirewallCommand(long vlanId, String asaMgmtIp) } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java index 421f5f307325..86d0726a7ac3 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java @@ -28,7 +28,7 @@ public CleanupLogicalEdgeFirewallCommand(long vlanId) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java index fba9942cda9d..3f7c5b657142 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java @@ -43,7 +43,7 @@ public ConfigureNexusVsmForAsaCommand(long vlanId, String ipAddress, String vsmU } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java index 89e411bddaa3..849a6cd8005e 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java @@ -41,7 +41,7 @@ public CreateLogicalEdgeFirewallCommand(long vlanId, String publicIp, String int } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java index 210c4f9d1099..cf26eb592a4f 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java @@ -24,7 +24,7 @@ public interface CiscoAsa1000vDevice extends Grouping, InternalIdentity, Identity { @Override - long getId(); + Long getId(); @Override String getUuid(); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java index 323c874d5c91..4b8fde9c0798 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java @@ -63,7 +63,7 @@ public CiscoAsa1000vDeviceVO(long physicalNetworkId, String managementIp, String } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java index 09193a4e4337..7dbb9b44d214 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java @@ -24,7 +24,7 @@ public interface CiscoVnmcController extends Grouping, InternalIdentity, Identity { @Override - long getId(); + Long getId(); @Override String getUuid(); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java index 0f843d7f4d13..579aeb946bb1 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java @@ -63,7 +63,7 @@ public CiscoVnmcControllerVO(long hostId, long physicalNetworkId, String provide } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java index 3ae0d56fef2c..ce951558e318 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java @@ -23,7 +23,7 @@ public interface NetworkAsa1000vMap extends Grouping, InternalIdentity { @Override - long getId(); + Long getId(); long getNetworkId(); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java index e2837efc0ab1..8c6f0373c508 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java @@ -48,7 +48,7 @@ public NetworkAsa1000vMapVO(long networkId, long asa1000vId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java index 835dc5448f55..61c34ba1c741 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/ElasticLbVmMapVO.java @@ -67,7 +67,7 @@ public ElasticLbVmMapVO(long ipId, long elbVmId, long lbId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java index 83564cb9c860..ec7dceb48bed 100644 --- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java +++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateDomainCommand.java @@ -30,7 +30,7 @@ public CreateOrUpdateDomainCommand(String domainName, Long templateId) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java index a5bafe95dea4..41690df135af 100644 --- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java +++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/CreateOrUpdateRecordAndReverseCommand.java @@ -39,7 +39,7 @@ public CreateOrUpdateRecordAndReverseCommand(String recordName, String recordIp, } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java index dffdce14e7a4..ea07e7d66866 100644 --- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java +++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveDomainCommand.java @@ -30,7 +30,7 @@ public RemoveDomainCommand(String networkDomain, boolean override) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java index 3479b26c39d4..f00ae4e2a678 100644 --- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java +++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/RemoveRecordCommand.java @@ -36,7 +36,7 @@ public RemoveRecordCommand(String recordName, String recordIp, String networkDom } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/SignInCommand.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/SignInCommand.java index 86f82db0fa86..fd02a2c5a48e 100644 --- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/SignInCommand.java +++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/commands/SignInCommand.java @@ -30,7 +30,7 @@ public SignInCommand(String email, String password) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java b/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java index 664132f54ed0..98dc5ce4580f 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java @@ -61,7 +61,7 @@ public SimpleFirewallRule(FirewallRuleTO rule) { icmpType = rule.getIcmpType(); icmpCode = rule.getIcmpCode(); } else { - int[] portNumbers = rule.getSrcPortRange(); + Integer[] portNumbers = rule.getSrcPortRange(); // if port start and end are not set, they // should be 0,0, and that's already the case @@ -88,7 +88,7 @@ public SimpleFirewallRule(NetworkACLTO rule) { icmpType = rule.getIcmpType(); icmpCode = rule.getIcmpCode(); } else { - int[] portNumbers = rule.getSrcPortRange(); + Integer[] portNumbers = rule.getSrcPortRange(); // if port start and end are not set, they // should be 0,0, and that's already the case @@ -111,8 +111,8 @@ public SimpleFirewallRule(PortForwardingRuleTO rule) { dstIp = rule.getSrcIp(); protocol = rule.getProtocol(); - int[] srcPortNumbers = rule.getSrcPortRange(); - int[] dstPortNumbers = rule.getDstPortRange(); + Integer[] srcPortNumbers = rule.getSrcPortRange(); + Integer[] dstPortNumbers = rule.getDstPortRange(); // if port start and end are not set, they // should be 0,0, and that's already the case diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java b/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java index 9ad5278f2ebf..6b5abba2eda2 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java @@ -53,7 +53,7 @@ public NetScalerPodVO(long netscalerDeviceId, long podId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 9e679f613560..e9d9a7479769 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -808,7 +808,7 @@ public boolean applyStaticNats(Network config, List rules) for (StaticNat rule : rules) { IpAddress sourceIp = _networkMgr.getIp(rule.getSourceIpAddressId()); StaticNatRuleTO ruleTO = - new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); + new StaticNatRuleTO(0l, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); rulesTO.add(ruleTO); } } @@ -834,7 +834,7 @@ public boolean applyStaticNats(Network config, List rules) List rulesTO = new ArrayList(); IpAddress sourceIp = _networkMgr.getIp(rule.getSourceIpAddressId()); StaticNatRuleTO ruleTO = - new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); + new StaticNatRuleTO(0l, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); rulesTO.add(ruleTO); SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rulesTO, null); diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java index 137aa613f9c8..f9bd658a268f 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java @@ -3631,9 +3631,9 @@ private ExternalNetworkResourceUsageAnswer getPublicIpBytesSentAndReceived(Exter if (vserver != null) { String lbVirtualServerIp = vserver.get_ipv46(); - long[] bytesSentAndReceived = answer.ipBytes.get(lbVirtualServerIp); + Long[] bytesSentAndReceived = answer.ipBytes.get(lbVirtualServerIp); if (bytesSentAndReceived == null) { - bytesSentAndReceived = new long[] {0, 0}; + bytesSentAndReceived = new Long[] {0l, 0l}; } bytesSentAndReceived[0] += stat_entry.get_totalrequestbytes(); bytesSentAndReceived[1] += stat_entry.get_totalresponsebytes(); diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java index 133714e35f7c..d283c7404a2f 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java @@ -56,7 +56,7 @@ public void setRules(final List rules) { * @see com.cloud.agent.api.Command#executeInSequence() */ @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java index ff81ae465766..8094793d4999 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java @@ -59,7 +59,7 @@ public void setPublicCidrs(final List publicCidrs) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java index b5434b34e158..1b83fc51e839 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java @@ -58,7 +58,7 @@ public void setRules(final List rules) { * @see com.cloud.agent.api.Command#executeInSequence() */ @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalRouterCommand.java index ff12b8d58645..da86457990d5 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalRouterCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalRouterCommand.java @@ -46,7 +46,7 @@ public CreateLogicalRouterCommand(final String gatewayServiceUuid, final long vl } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchCommand.java index 5dc8616034ab..431db0ede933 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchCommand.java @@ -34,7 +34,7 @@ public CreateLogicalSwitchCommand(final String transportUuid, final String trans } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java index 6bc578fae6fd..215296f390a0 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java @@ -49,7 +49,7 @@ public String getNicName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalRouterCommand.java index 8fd14e95ef41..53f00bc68fb4 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalRouterCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalRouterCommand.java @@ -34,7 +34,7 @@ public DeleteLogicalRouterCommand(String logicalRouterUuid) { * @see com.cloud.agent.api.Command#executeInSequence() */ @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchCommand.java index dbfefe2e7a55..7147183176d5 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchCommand.java @@ -28,7 +28,7 @@ public DeleteLogicalSwitchCommand(final String logicalSwitchUuid) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java index 4a5e6076d581..b304742a7f71 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java @@ -37,7 +37,7 @@ public String getLogicalSwitchPortUuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/FindLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/FindLogicalSwitchPortCommand.java index ee00bd24a3c4..4656e766c33d 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/FindLogicalSwitchPortCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/FindLogicalSwitchPortCommand.java @@ -37,7 +37,7 @@ public String getLogicalSwitchPortUuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java index 91682a1acad2..97781c277cb4 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java @@ -56,7 +56,7 @@ public String getNicName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpDeviceVO.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpDeviceVO.java index 431e8558ae30..3be1c2339980 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpDeviceVO.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpDeviceVO.java @@ -68,7 +68,7 @@ public NiciraNvpDeviceVO(final long hostId, final long physicalNetworkId, final } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpNicMappingVO.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpNicMappingVO.java index 9b137806a4a8..c6ffbe52ff91 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpNicMappingVO.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpNicMappingVO.java @@ -80,7 +80,7 @@ public void setNicUuid(String nicUuid) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpRouterMappingVO.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpRouterMappingVO.java index 9fae3cd74657..8446ef68b3b8 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpRouterMappingVO.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/NiciraNvpRouterMappingVO.java @@ -58,7 +58,7 @@ public NiciraNvpRouterMappingVO(final long id, final String logicalRouterUuid, f } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java index 0243e2d40525..5dd9f1a8b7fe 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java @@ -798,7 +798,7 @@ public boolean applyStaticNats(Network network, List rules) // we only need the source and destination ip. Unfortunately no mention if a rule // is new. StaticNatRuleTO ruleTO = - new StaticNatRuleTO(1, sourceIp.getAddress().addr(), MIN_PORT, MAX_PORT, rule.getDestIpAddress(), MIN_PORT, MAX_PORT, "any", rule.isForRevoke(), false); + new StaticNatRuleTO(1l, sourceIp.getAddress().addr(), MIN_PORT, MAX_PORT, rule.getDestIpAddress(), MIN_PORT, MAX_PORT, "any", rule.isForRevoke(), false); staticNatRules.add(ruleTO); } diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java index d6355b2a6cdf..b0c5c433fda8 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java @@ -276,7 +276,7 @@ public NatRule[] generateStaticNatRulePair(final String insideIp, final String o } - public NatRule[] generatePortForwardingRulePair(final String insideIp, final int[] insidePorts, final String outsideIp, final int[] outsidePorts, + public NatRule[] generatePortForwardingRulePair(final String insideIp, final Integer[] insidePorts, final String outsideIp, final Integer[] outsidePorts, final String protocol) { // Start with a basic static nat rule, then add port and protocol details final NatRule[] rulepair = generateStaticNatRulePair(insideIp, outsideIp); diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigurePortForwardingRulesCommandWrapper.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigurePortForwardingRulesCommandWrapper.java index ae0d4ba27020..2304c03791ec 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigurePortForwardingRulesCommandWrapper.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigurePortForwardingRulesCommandWrapper.java @@ -57,7 +57,7 @@ public Answer execute(final ConfigurePortForwardingRulesOnLogicalRouterCommand c continue; } - if (rule.getDstPortRange()[0] != rule.getDstPortRange()[1] || rule.getSrcPortRange()[0] != rule.getSrcPortRange()[1]) { + if ( (! rule.getDstPortRange()[0].equals(rule.getDstPortRange()[1])) || (! rule.getSrcPortRange()[0].equals(rule.getSrcPortRange()[1])) ) { return new ConfigurePortForwardingRulesOnLogicalRouterAnswer(command, false, "Nicira NVP doesn't support port ranges for port forwarding"); } diff --git a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java index c0dedd284457..dd62dfb88456 100644 --- a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java +++ b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java @@ -443,7 +443,7 @@ public void testConfigureStaticNatRulesOnLogicalRouter() throws ConfigurationExc // Mock the command final ConfigureStaticNatRulesOnLogicalRouterCommand cmd = mock(ConfigureStaticNatRulesOnLogicalRouterCommand.class); - final StaticNatRuleTO rule = new StaticNatRuleTO(1, "11.11.11.11", null, null, "10.10.10.10", null, null, null, false, false); + final StaticNatRuleTO rule = new StaticNatRuleTO(1l, "11.11.11.11", null, null, "10.10.10.10", null, null, null, false, false); final List rules = new ArrayList(); rules.add(rule); when(cmd.getRules()).thenReturn(rules); @@ -487,7 +487,7 @@ public void testConfigureStaticNatRulesOnLogicalRouterExistingRules() throws Con // Mock the command final ConfigureStaticNatRulesOnLogicalRouterCommand cmd = mock(ConfigureStaticNatRulesOnLogicalRouterCommand.class); - final StaticNatRuleTO rule = new StaticNatRuleTO(1, "11.11.11.11", null, null, "10.10.10.10", null, null, null, false, false); + final StaticNatRuleTO rule = new StaticNatRuleTO(1l, "11.11.11.11", null, null, "10.10.10.10", null, null, null, false, false); final List rules = new ArrayList(); rules.add(rule); when(cmd.getRules()).thenReturn(rules); @@ -530,7 +530,7 @@ public void testConfigureStaticNatRulesOnLogicalRouterRemoveRules() throws Confi // Mock the command final ConfigureStaticNatRulesOnLogicalRouterCommand cmd = mock(ConfigureStaticNatRulesOnLogicalRouterCommand.class); - final StaticNatRuleTO rule = new StaticNatRuleTO(1, "11.11.11.11", null, null, "10.10.10.10", null, null, null, true, false); + final StaticNatRuleTO rule = new StaticNatRuleTO(1l, "11.11.11.11", null, null, "10.10.10.10", null, null, null, true, false); final List rules = new ArrayList(); rules.add(rule); when(cmd.getRules()).thenReturn(rules); @@ -572,7 +572,7 @@ public void testConfigureStaticNatRulesOnLogicalRouterRollback() throws Configur // Mock the command final ConfigureStaticNatRulesOnLogicalRouterCommand cmd = mock(ConfigureStaticNatRulesOnLogicalRouterCommand.class); - final StaticNatRuleTO rule = new StaticNatRuleTO(1, "11.11.11.11", null, null, "10.10.10.10", null, null, null, false, false); + final StaticNatRuleTO rule = new StaticNatRuleTO(1l, "11.11.11.11", null, null, "10.10.10.10", null, null, null, false, false); final List rules = new ArrayList(); rules.add(rule); when(cmd.getRules()).thenReturn(rules); @@ -616,7 +616,7 @@ public void testConfigurePortForwardingRulesOnLogicalRouter() throws Configurati when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules); // Mock the api create calls - final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp"); + final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new Integer[] { 8080, 8080 }, "11.11.11.11", new Integer[] { 80, 80 }, "tcp"); rulepair[0].setUuid(UUID.randomUUID()); rulepair[1].setUuid(UUID.randomUUID()); when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]); @@ -655,7 +655,7 @@ public void testConfigurePortForwardingRulesOnLogicalRouterExistingRules() throw when(cmd.getLogicalRouterUuid()).thenReturn("aaaaa"); // Mock the api create calls - final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp"); + final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new Integer[] { 8080, 8080 }, "11.11.11.11", new Integer[] { 80, 80 }, "tcp"); rulepair[0].setUuid(UUID.randomUUID()); rulepair[1].setUuid(UUID.randomUUID()); when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]); @@ -698,7 +698,7 @@ public void testConfigurePortForwardingRulesOnLogicalRouterRemoveRules() throws when(cmd.getLogicalRouterUuid()).thenReturn("aaaaa"); // Mock the api create calls - final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp"); + final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new Integer[] { 8080, 8080 }, "11.11.11.11", new Integer[] { 80, 80 }, "tcp"); final UUID rule0Uuid = UUID.randomUUID(); final UUID rule1Uuid = UUID.randomUUID(); rulepair[0].setUuid(rule0Uuid); @@ -740,7 +740,7 @@ public void testConfigurePortForwardingRulesOnLogicalRouterRollback() throws Con when(cmd.getLogicalRouterUuid()).thenReturn("aaaaa"); // Mock the api create calls - final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp"); + final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new Integer[] { 8080, 8080 }, "11.11.11.11", new Integer[] { 80, 80 }, "tcp"); rulepair[0].setUuid(UUID.randomUUID()); rulepair[1].setUuid(UUID.randomUUID()); when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenThrow(new NiciraNvpApiException()); @@ -777,7 +777,7 @@ public void testConfigurePortForwardingRulesOnLogicalRouterPortRange() throws Co when(nvpApi.findNatRulesByLogicalRouterUuid("aaaaa")).thenReturn(storedRules); // Mock the api create calls - final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 80, 85 }, "11.11.11.11", new int[] { 80, 85 }, "tcp"); + final NatRule[] rulepair = resource.generatePortForwardingRulePair("10.10.10.10", new Integer[] { 80, 85 }, "11.11.11.11", new Integer[] { 80, 85 }, "tcp"); rulepair[0].setUuid(UUID.randomUUID()); rulepair[1].setUuid(UUID.randomUUID()); when(nvpApi.createLogicalRouterNatRule(eq("aaaaa"), (NatRule) any())).thenReturn(rulepair[0]).thenReturn(rulepair[1]); @@ -808,7 +808,7 @@ public void testGenerateStaticNatRulePair() { @Test public void testGeneratePortForwardingRulePair() { - final NatRule[] rules = resource.generatePortForwardingRulePair("10.10.10.10", new int[] { 8080, 8080 }, "11.11.11.11", new int[] { 80, 80 }, "tcp"); + final NatRule[] rules = resource.generatePortForwardingRulePair("10.10.10.10", new Integer[] { 8080, 8080 }, "11.11.11.11", new Integer[] { 80, 80 }, "tcp"); assertTrue("DestinationNatRule".equals(rules[0].getType())); assertTrue("SourceNatRule".equals(rules[1].getType())); diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/VspResourceCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/VspResourceCommand.java index f7e1417aed90..2cdc15f12534 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/VspResourceCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/VspResourceCommand.java @@ -76,7 +76,7 @@ public String getProxyUserDomainuuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java index 537646693782..2cc6b77ade46 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyAclRuleVspCommand.java @@ -75,7 +75,7 @@ public long getNetworkId() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java index b013634e3721..d1e8cac34eb9 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ApplyStaticNatVspCommand.java @@ -56,7 +56,7 @@ public List> getStaticNatDetails() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVpcVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVpcVspCommand.java index fc05559514c1..53bec064a1ca 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVpcVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/element/ShutDownVpcVspCommand.java @@ -41,7 +41,7 @@ public String getVpcUuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/DeallocateVmVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/DeallocateVmVspCommand.java index 19c904f9f209..54c2c6f764e3 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/DeallocateVmVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/DeallocateVmVspCommand.java @@ -84,7 +84,7 @@ public String getVmUuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java index 0ffbda42a37f..6edb7eb41ad5 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ImplementNetworkVspCommand.java @@ -117,7 +117,7 @@ public Collection getIpAddressRange() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReleaseVmVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReleaseVmVspCommand.java index 9a6a4d7cbb97..0d52a1237d30 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReleaseVmVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReleaseVmVspCommand.java @@ -47,7 +47,7 @@ public String getVmInstanceName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java index 6844bf9d1bea..35a7bfdc8709 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/ReserveVmInterfaceVspCommand.java @@ -108,7 +108,7 @@ public String _getVmUserDomainName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/TrashNetworkVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/TrashNetworkVspCommand.java index e10e9beb001f..4362583e8534 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/TrashNetworkVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/guru/TrashNetworkVspCommand.java @@ -53,7 +53,7 @@ public String getVpcUuid() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncVspCommand.java b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncVspCommand.java index 8ccd84db55d0..c4d3eea0bb0e 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncVspCommand.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/agent/api/sync/SyncVspCommand.java @@ -31,7 +31,7 @@ public SyncVspCommand(String nuageVspEntity) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/NuageVspDeviceVO.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/NuageVspDeviceVO.java index 00cb1e4dc7e1..fae2d96bd172 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/NuageVspDeviceVO.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/NuageVspDeviceVO.java @@ -71,7 +71,7 @@ public NuageVspDeviceVO(long hostId, long physicalNetworkId, } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/AddHypervisorCommand.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/AddHypervisorCommand.java index 8094271a9cac..63f029eb12fc 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/AddHypervisorCommand.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/AddHypervisorCommand.java @@ -50,7 +50,7 @@ public void setIpAddress(String ipAddress) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { // TODO Auto-generated method stub return false; } diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigureNetworkCommand.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigureNetworkCommand.java index a5a2bf134d10..654cc8efd565 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigureNetworkCommand.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigureNetworkCommand.java @@ -46,7 +46,7 @@ public void setTenantId(String tennantId) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { // TODO Auto-generated method stub return false; } diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigurePortCommand.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigurePortCommand.java index b36746893f4b..fc62f44171ed 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigurePortCommand.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigurePortCommand.java @@ -72,7 +72,7 @@ public void setPortId(UUID portId) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { // TODO Auto-generated method stub return false; } diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyNetworkCommand.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyNetworkCommand.java index 971a882e98ef..b667a78b62a2 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyNetworkCommand.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyNetworkCommand.java @@ -37,7 +37,7 @@ public void setNetworkUuid(String networkUuid) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { // TODO Auto-generated method stub return false; } diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyPortCommand.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyPortCommand.java index 9cd3dd72b8c6..5fec141d1beb 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyPortCommand.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/DestroyPortCommand.java @@ -42,7 +42,7 @@ public void setPortId(UUID portId) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { // TODO Auto-generated method stub return false; } diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/dao/OpenDaylightControllerVO.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/dao/OpenDaylightControllerVO.java index 6af058fc91fe..8e82da826f82 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/dao/OpenDaylightControllerVO.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/dao/OpenDaylightControllerVO.java @@ -69,7 +69,7 @@ public OpenDaylightControllerVO(final long hostId, final long physicalNetworkId, } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java index 9a3d4172151a..23f6745ed2d3 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java @@ -24,7 +24,7 @@ public class OvsCreateGreTunnelCommand extends Command { long to; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java index 3e08531f06a1..6b0fc2204892 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java @@ -31,7 +31,7 @@ public class OvsCreateTunnelCommand extends Command { String fromIp; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java index 4d2df9ff1716..b2f88da6e538 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java @@ -21,7 +21,7 @@ public class OvsDeleteFlowCommand extends Command { String vmName; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java index 2e0e0b52a915..825bdf85a9e6 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java @@ -43,7 +43,7 @@ public Long getHostId() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java index 9fc6c3760346..4640b73b5076 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java @@ -43,7 +43,7 @@ public String getBridgeName() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java index 79a7e5c20740..afc2bb5b30b0 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java @@ -22,7 +22,7 @@ public class OvsFetchInterfaceCommand extends Command { String label; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java index 078528b37ce1..a2a58b3241c9 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java @@ -25,7 +25,7 @@ public class OvsSetTagAndFlowCommand extends Command { Long vmId; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java index a1045980fc0b..6e33c2f658b5 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java @@ -24,7 +24,7 @@ public class OvsSetupBridgeCommand extends Command { Long networkId; @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return true; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java index 403dff400ad2..f2b723aa373b 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java @@ -111,7 +111,7 @@ public String getVpcConfigInJson() { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java index d9514d5a9a18..c58e74c48f88 100644 --- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java +++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java @@ -119,7 +119,7 @@ public void setBridgeName(String bridgeName) { } @Override - public boolean executeInSequence() { + public Boolean executeInSequence() { return false; } diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java index ff40efac8f68..fdff5d44e4a0 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java @@ -62,7 +62,7 @@ public OvsTunnelInterfaceVO(String ip, String netmask, String mac, long hostId, } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java index 88a759130864..b1ba4e9c3132 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java @@ -82,7 +82,7 @@ public int getKey() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java index 613af812d554..0c90de990632 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoVO.java @@ -53,7 +53,7 @@ public VpcDistributedRouterSeqNoVO(Long vpcId) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java index 7fdb70b7f3a8..088c541b117b 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java @@ -984,7 +984,7 @@ public boolean manageDstNatRule(ArrayList cmdList, PaloAltoPri // build source service xml String srcService; String protocol = rule.getProtocol(); - int[] srcPortRange = rule.getSrcPortRange(); + Integer[] srcPortRange = rule.getSrcPortRange(); if (srcPortRange != null) { String portRange; if (srcPortRange.length == 1 || srcPortRange[0] == srcPortRange[1]) { @@ -1001,7 +1001,7 @@ public boolean manageDstNatRule(ArrayList cmdList, PaloAltoPri // build destination port xml (single port limit in PA) String dstPortXML = ""; - int[] dstPortRange = rule.getDstPortRange(); + Integer[] dstPortRange = rule.getDstPortRange(); if (dstPortRange != null) { dstPortXML = "" + dstPortRange[0] + ""; } diff --git a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java index 931e6ccaed00..4f32b15fe403 100644 --- a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java +++ b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java @@ -233,7 +233,7 @@ public void addIngressFirewallRule() throws ConfigurationException, Exception { List rules = new ArrayList(); List cidrList = new ArrayList(); cidrList.add("0.0.0.0/0"); - FirewallRuleTO active = new FirewallRuleTO(8, null, "192.168.80.103", "tcp", 80, 80, false, false, FirewallRule.Purpose.Firewall, cidrList, null, null); + FirewallRuleTO active = new FirewallRuleTO(8l, null, "192.168.80.103", "tcp", 80, 80, false, false, FirewallRule.Purpose.Firewall, cidrList, null, null); rules.add(active); SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rules); @@ -261,7 +261,7 @@ public void removeIngressFirewallRule() throws ConfigurationException, Exception long vlanId = 3954; List rules = new ArrayList(); - FirewallRuleTO revoked = new FirewallRuleTO(8, null, "192.168.80.103", "tcp", 80, 80, true, false, FirewallRule.Purpose.Firewall, null, null, null); + FirewallRuleTO revoked = new FirewallRuleTO(8l, null, "192.168.80.103", "tcp", 80, 80, true, false, FirewallRule.Purpose.Firewall, null, null, null); rules.add(revoked); SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rules); @@ -348,7 +348,7 @@ public void addStaticNatRule() throws ConfigurationException, Exception { long vlanId = 3954; List rules = new ArrayList(); - StaticNatRuleTO active = new StaticNatRuleTO(0, "192.168.80.103", null, null, "10.3.97.158", null, null, null, false, false); + StaticNatRuleTO active = new StaticNatRuleTO(0l, "192.168.80.103", null, null, "10.3.97.158", null, null, null, false, false); rules.add(active); SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rules, null); @@ -376,7 +376,7 @@ public void removeStaticNatRule() throws ConfigurationException, Exception { long vlanId = 3954; List rules = new ArrayList(); - StaticNatRuleTO revoked = new StaticNatRuleTO(0, "192.168.80.103", null, null, "10.3.97.158", null, null, null, true, false); + StaticNatRuleTO revoked = new StaticNatRuleTO(0l, "192.168.80.103", null, null, "10.3.97.158", null, null, null, true, false); rules.add(revoked); SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rules, null); diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfigurationVO.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfigurationVO.java index 488e7f44485e..0d2f337a0b6b 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfigurationVO.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfigurationVO.java @@ -52,7 +52,7 @@ public String getHostname() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapTrustMapVO.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapTrustMapVO.java index 8b1363816fa3..a93582b4d90a 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapTrustMapVO.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapTrustMapVO.java @@ -43,16 +43,16 @@ public class LdapTrustMapVO implements InternalIdentity { private String name; @Column(name = "domain_id") - private long domainId; + private Long domainId; @Column(name = "account_type") - private short accountType; + private Short accountType; public LdapTrustMapVO() { } - public LdapTrustMapVO(long domainId, LdapManager.LinkType type, String name, short accountType) { + public LdapTrustMapVO(Long domainId, LdapManager.LinkType type, String name, Short accountType) { this.domainId = domainId; this.type = type; this.name = name; @@ -60,7 +60,7 @@ public LdapTrustMapVO(long domainId, LdapManager.LinkType type, String name, sho } @Override - public long getId() { + public Long getId() { return id; } @@ -72,11 +72,11 @@ public String getName() { return name; } - public long getDomainId() { + public Long getDomainId() { return domainId; } - public short getAccountType() { + public Short getAccountType() { return accountType; } diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenVO.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenVO.java index c8ac2f1f4379..91dcf7014bb5 100644 --- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenVO.java +++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenVO.java @@ -58,7 +58,7 @@ public SAMLTokenVO(String uuid, Long domainId, String entity) { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/pom.xml b/pom.xml index c85f8ec18216..868ae02aca8f 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 1.9.2 1.0.0-build217 2.6.9 - 1.7.2 + [2.4,) 18.0 18.0 6.2.0-3.1 diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index dca4de188145..08d19dd1cac4 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -178,7 +178,7 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet detail String cpuUsed = null; HostStats hostStats = ApiDBUtils.getHostStatistics(host.getId()); if (hostStats != null) { - float cpuUtil = (float)hostStats.getCpuUtilization(); + double cpuUtil = hostStats.getCpuUtilization(); cpuUsed = decimalFormat.format(cpuUtil) + "%"; hostResponse.setCpuUsed(cpuUsed); hostResponse.setMemoryUsed((new Double(hostStats.getUsedMemory())).longValue()); @@ -324,7 +324,7 @@ public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, Enu String cpuUsed = null; HostStats hostStats = ApiDBUtils.getHostStatistics(host.getId()); if (hostStats != null) { - float cpuUtil = (float)hostStats.getCpuUtilization(); + double cpuUtil = hostStats.getCpuUtilization(); cpuUsed = decimalFormat.format(cpuUtil) + "%"; hostResponse.setCpuUsed(cpuUsed); hostResponse.setMemoryUsed((new Double(hostStats.getUsedMemory())).longValue()); diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java index 9d883349d605..605a5df06d68 100644 --- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java @@ -205,18 +205,18 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us if (vmStats != null) { userVmResponse.setCpuUsed(new DecimalFormat("#.##").format(vmStats.getCPUUtilization()) + "%"); - userVmResponse.setNetworkKbsRead((long)vmStats.getNetworkReadKBs()); + userVmResponse.setNetworkKbsRead(vmStats.getNetworkReadKBs().longValue()); - userVmResponse.setNetworkKbsWrite((long)vmStats.getNetworkWriteKBs()); + userVmResponse.setNetworkKbsWrite(vmStats.getNetworkWriteKBs().longValue()); if ((userVm.getHypervisorType() != null) && (userVm.getHypervisorType().equals(HypervisorType.KVM) || userVm.getHypervisorType().equals(HypervisorType.XenServer))) { // support KVM and XenServer only util 2013.06.25 - userVmResponse.setDiskKbsRead((long)vmStats.getDiskReadKBs()); + userVmResponse.setDiskKbsRead(vmStats.getDiskReadKBs().longValue()); - userVmResponse.setDiskKbsWrite((long)vmStats.getDiskWriteKBs()); + userVmResponse.setDiskKbsWrite(vmStats.getDiskWriteKBs().longValue()); - userVmResponse.setDiskIORead((long)vmStats.getDiskReadIOs()); + userVmResponse.setDiskIORead(vmStats.getDiskReadIOs().longValue()); - userVmResponse.setDiskIOWrite((long)vmStats.getDiskWriteIOs()); + userVmResponse.setDiskIOWrite(vmStats.getDiskWriteIOs().longValue()); } } } diff --git a/server/src/com/cloud/api/query/vo/AccountJoinVO.java b/server/src/com/cloud/api/query/vo/AccountJoinVO.java index 8d642edd7cf8..9a7dc0dc0bfc 100644 --- a/server/src/com/cloud/api/query/vo/AccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AccountJoinVO.java @@ -185,7 +185,7 @@ public AccountJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java index bcd0fdcbb926..547bfb4bb760 100644 --- a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java @@ -96,7 +96,7 @@ public AffinityGroupJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java index be85c2a62bc1..874c9f2cbfcb 100644 --- a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java @@ -105,7 +105,7 @@ public AsyncJobJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/BaseViewVO.java b/server/src/com/cloud/api/query/vo/BaseViewVO.java index d558f9bc858a..abd781eeb716 100644 --- a/server/src/com/cloud/api/query/vo/BaseViewVO.java +++ b/server/src/com/cloud/api/query/vo/BaseViewVO.java @@ -18,7 +18,7 @@ public abstract class BaseViewVO { - public abstract long getId(); + public abstract Long getId(); @Override public int hashCode() { diff --git a/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java b/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java index 2c4832012975..ec405ebf2004 100644 --- a/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java @@ -121,7 +121,7 @@ public DataCenterJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java b/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java index e846b0b646f9..fba7e2cdbf58 100644 --- a/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java @@ -123,7 +123,7 @@ public DiskOfferingJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/DomainJoinVO.java b/server/src/com/cloud/api/query/vo/DomainJoinVO.java index a7c45609f280..1641fd19b877 100644 --- a/server/src/com/cloud/api/query/vo/DomainJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainJoinVO.java @@ -154,7 +154,7 @@ public DomainJoinVO() { @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java index 8984ff518edd..56b68c4d7af3 100644 --- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java @@ -250,7 +250,7 @@ public DomainRouterJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/EventJoinVO.java b/server/src/com/cloud/api/query/vo/EventJoinVO.java index 8fba938876d8..7ce9b7721740 100644 --- a/server/src/com/cloud/api/query/vo/EventJoinVO.java +++ b/server/src/com/cloud/api/query/vo/EventJoinVO.java @@ -114,7 +114,7 @@ public EventJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/HostJoinVO.java b/server/src/com/cloud/api/query/vo/HostJoinVO.java index 48ac531ce86e..59f243cfec72 100644 --- a/server/src/com/cloud/api/query/vo/HostJoinVO.java +++ b/server/src/com/cloud/api/query/vo/HostJoinVO.java @@ -175,7 +175,7 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity private int jobStatus; @Override - public long getId() { + public Long getId() { return this.id; } diff --git a/server/src/com/cloud/api/query/vo/HostTagVO.java b/server/src/com/cloud/api/query/vo/HostTagVO.java index 60db16adc8e7..3f979bc789cd 100644 --- a/server/src/com/cloud/api/query/vo/HostTagVO.java +++ b/server/src/com/cloud/api/query/vo/HostTagVO.java @@ -43,7 +43,7 @@ public class HostTagVO extends BaseViewVO implements InternalIdentity { long hostId; @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java index 99f61c366116..347a156aa767 100644 --- a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java @@ -86,7 +86,7 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity, Id private Date removed; @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java index 857cebf75f62..9417a72be3e6 100644 --- a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java @@ -83,7 +83,7 @@ public InstanceGroupJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java index 4766de4faedb..22c7709487db 100644 --- a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java @@ -76,7 +76,7 @@ public ProjectAccountJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java index 8b4918561c24..86b6379b6bad 100644 --- a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java @@ -87,7 +87,7 @@ public ProjectInvitationJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectJoinVO.java index 32488ff1b22c..cfbba6da0621 100644 --- a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ProjectJoinVO.java @@ -115,7 +115,7 @@ public ProjectJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java index 2c1ff475095c..ed16c0a6a0fc 100644 --- a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java @@ -98,7 +98,7 @@ public String getUuid() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java index 69604e8286e7..7b848bd21eaa 100644 --- a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java @@ -145,7 +145,7 @@ public SecurityGroupJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java index f16ba8333bd8..66a9523175bd 100644 --- a/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java @@ -144,7 +144,7 @@ public ServiceOfferingJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java index 565e290bd704..7e599f6e94dd 100644 --- a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java +++ b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java @@ -151,7 +151,7 @@ public HypervisorType getHypervisor() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/StorageTagVO.java b/server/src/com/cloud/api/query/vo/StorageTagVO.java index f8d29fd5f85f..e4ac512a2e51 100644 --- a/server/src/com/cloud/api/query/vo/StorageTagVO.java +++ b/server/src/com/cloud/api/query/vo/StorageTagVO.java @@ -43,7 +43,7 @@ public class StorageTagVO extends BaseViewVO implements InternalIdentity { long poolId; @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java index 834a9cedd071..dc8b73057d96 100644 --- a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java +++ b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java @@ -260,7 +260,7 @@ public TemplateJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java index 0e66ca022c58..9e520b9ae128 100644 --- a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java @@ -124,7 +124,7 @@ public UserAccountJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java index 54a48fb06aea..29301c711be8 100644 --- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java +++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java @@ -405,7 +405,7 @@ public UserVmJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java index d9c482ce0a51..193e9f89a5c5 100644 --- a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java +++ b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java @@ -296,7 +296,7 @@ public VolumeJoinVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/api/response/SecurityGroupResultObject.java b/server/src/com/cloud/api/response/SecurityGroupResultObject.java index c2cd423befb4..de0628b0b2e3 100644 --- a/server/src/com/cloud/api/response/SecurityGroupResultObject.java +++ b/server/src/com/cloud/api/response/SecurityGroupResultObject.java @@ -67,7 +67,7 @@ public SecurityGroupResultObject(Long id, String name, String description, long } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java index c3911826feb6..58a17c8285ef 100644 --- a/server/src/com/cloud/consoleproxy/AgentHookBase.java +++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java @@ -197,7 +197,7 @@ public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) { random.nextBytes(randomBytes); String storePassword = Base64.encodeBase64String(randomBytes); - byte[] ksBits = null; + Byte[] ksBits = null; String consoleProxyUrlDomain = _configDao.getValue(Config.ConsoleProxyUrlDomain.key()); if (consoleProxyUrlDomain == null || consoleProxyUrlDomain.isEmpty()) { s_logger.debug("SSL is disabled for console proxy based on global config, skip loading certificates"); diff --git a/server/src/com/cloud/dc/DedicatedResourceVO.java b/server/src/com/cloud/dc/DedicatedResourceVO.java index 79c563ced6eb..e5609b839289 100644 --- a/server/src/com/cloud/dc/DedicatedResourceVO.java +++ b/server/src/com/cloud/dc/DedicatedResourceVO.java @@ -81,7 +81,7 @@ public DedicatedResourceVO(Long dataCenterId, Long podId, Long clusterId, Long h } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/deploy/PlannerHostReservationVO.java b/server/src/com/cloud/deploy/PlannerHostReservationVO.java index 9210d528aeae..2068a7961aac 100644 --- a/server/src/com/cloud/deploy/PlannerHostReservationVO.java +++ b/server/src/com/cloud/deploy/PlannerHostReservationVO.java @@ -72,7 +72,7 @@ public PlannerHostReservationVO(Long hostId, Long dataCenterId, Long podId, Long } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/ha/HaWorkVO.java b/server/src/com/cloud/ha/HaWorkVO.java index f5a36e3bb1ac..5ed18359cd6a 100644 --- a/server/src/com/cloud/ha/HaWorkVO.java +++ b/server/src/com/cloud/ha/HaWorkVO.java @@ -90,7 +90,7 @@ protected HaWorkVO() { } @Override - public long getId() { + public Long getId() { return id; } diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java index ee69a07acdbd..4684a2396393 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java @@ -47,7 +47,7 @@ public Type getType() { @Override public StartupCommand[] initialize() { StartupRoutingCommand cmd = - new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.KVM, new HashMap()); + new StartupRoutingCommand(0, 0l, 0l, 0l, null, Hypervisor.HypervisorType.KVM, new HashMap()); cmd.setDataCenter(_zoneId); cmd.setPod(_podId); cmd.setCluster(_clusterId); diff --git a/server/src/com/cloud/network/ExternalDeviceUsageManager.java b/server/src/com/cloud/network/ExternalDeviceUsageManager.java index 8bd8f56314f5..1ef88f072fa3 100644 --- a/server/src/com/cloud/network/ExternalDeviceUsageManager.java +++ b/server/src/com/cloud/network/ExternalDeviceUsageManager.java @@ -27,6 +27,6 @@ public interface ExternalDeviceUsageManager extends Manager { * updates the network usage stats for a LB rule, associated with an external LB device, that is being revoked as part of Delete LB rule or release IP actions * @param loadBalancerRuleId */ - public void updateExternalLoadBalancerNetworkUsageStats(long loadBalancerRuleId); + public void updateExternalLoadBalancerNetworkUsageStats(Long loadBalancerRuleId); } diff --git a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java index 9e53341db061..4581bf8935e3 100644 --- a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java +++ b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java @@ -206,7 +206,7 @@ private ExternalFirewallDeviceVO getExternalFirewallForNetwork(Network network) } @Override - public void updateExternalLoadBalancerNetworkUsageStats(long loadBalancerRuleId) { + public void updateExternalLoadBalancerNetworkUsageStats(Long loadBalancerRuleId) { LoadBalancerVO lb = _loadBalancerDao.findById(loadBalancerRuleId); if (lb == null) { @@ -262,7 +262,7 @@ public void updateExternalLoadBalancerNetworkUsageStats(long loadBalancerRuleId) long newCurrentBytesReceived = 0; if (publicIp != null) { - long[] bytesSentAndReceived = null; + Long[] bytesSentAndReceived = null; statsEntryIdentifier += ", public IP: " + publicIp; boolean inline = _networkModel.isNetworkInlineMode(network); if (externalLoadBalancer.getType().equals(Host.Type.ExternalLoadBalancer) && inline) { @@ -275,7 +275,7 @@ public void updateExternalLoadBalancerNetworkUsageStats(long loadBalancerRuleId) bytesSentAndReceived = lbAnswer.ipBytes.get(loadBalancingIpAddress); if (bytesSentAndReceived != null) { - bytesSentAndReceived[0] = 0; + bytesSentAndReceived[0] = 0l; } } } else { @@ -532,7 +532,7 @@ private boolean updateStatsEntry(long accountId, long zoneId, long networkId, St long newCurrentBytesReceived = 0; if (publicIp != null) { - long[] bytesSentAndReceived = null; + Long[] bytesSentAndReceived = null; statsEntryIdentifier += ", public IP: " + publicIp; if (host.getType().equals(Host.Type.ExternalLoadBalancer) && inline) { @@ -545,7 +545,7 @@ private boolean updateStatsEntry(long accountId, long zoneId, long networkId, St bytesSentAndReceived = answer.ipBytes.get(loadBalancingIpAddress); if (bytesSentAndReceived != null) { - bytesSentAndReceived[0] = 0; + bytesSentAndReceived[0] = 0l; } } } else { @@ -565,7 +565,7 @@ private boolean updateStatsEntry(long accountId, long zoneId, long networkId, St return true; } else { long vlanTag = Integer.parseInt(BroadcastDomainType.getValue(broadcastURI)); - long[] bytesSentAndReceived = answer.guestVlanBytes.get(String.valueOf(vlanTag)); + Long[] bytesSentAndReceived = answer.guestVlanBytes.get(String.valueOf(vlanTag)); if (bytesSentAndReceived == null) { s_logger.warn("Didn't get an external network usage answer for guest VLAN " + vlanTag); diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java index f0d862257aa8..7f1ebe4b57e5 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java @@ -629,7 +629,7 @@ public boolean applyStaticNatRules(Network network, List ru Vlan vlan = _vlanDao.findById(sourceIp.getVlanId()); StaticNatRuleTO ruleTO = - new StaticNatRuleTO(0, vlan.getVlanTag(), sourceIp.getAddress().addr(), -1, -1, rule.getDestIpAddress(), -1, -1, "any", rule.isForRevoke(), false); + new StaticNatRuleTO(0l, vlan.getVlanTag(), sourceIp.getAddress().addr(), -1, -1, rule.getDestIpAddress(), -1, -1, "any", rule.isForRevoke(), false); staticNatRules.add(ruleTO); } diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java index fa4eb167d30c..dbfcca3c17b1 100644 --- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java +++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.java @@ -387,7 +387,7 @@ private boolean collectDirectNetworkUsage(final HostVO host) { } else { for (UsageIPAddressVO usageIp : fullDurationIpUsage) { String publicIp = usageIp.getAddress(); - long[] bytesSentRcvd = answer.get(publicIp); + Long[] bytesSentRcvd = answer.get(publicIp); Long bytesSent = bytesSentRcvd[0]; Long bytesRcvd = bytesSentRcvd[1]; if (bytesSent == null || bytesRcvd == null) { @@ -419,7 +419,7 @@ private boolean collectDirectNetworkUsage(final HostVO host) { return false; } else { String publicIp = usageIp.getAddress(); - long[] bytesSentRcvd = answer.get(publicIp); + Long[] bytesSentRcvd = answer.get(publicIp); Long bytesSent = bytesSentRcvd[0]; Long bytesRcvd = bytesSentRcvd[1]; if (bytesSent == null || bytesRcvd == null) { diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java b/server/src/com/cloud/network/router/CommandSetupHelper.java index f701218f2ac2..f10280273266 100644 --- a/server/src/com/cloud/network/router/CommandSetupHelper.java +++ b/server/src/com/cloud/network/router/CommandSetupHelper.java @@ -540,7 +540,7 @@ public void createApplyStaticNatCommands(final List rules, if (rules != null) { for (final StaticNat rule : rules) { final IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); - final StaticNatRuleTO ruleTO = new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), + final StaticNatRuleTO ruleTO = new StaticNatRuleTO(0l, sourceIp.getAddress().addr(), null, null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); rulesTO.add(ruleTO); } diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index f0e5f0916b91..ae0643186adf 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2365,8 +2365,8 @@ public void processConnect(final Host host, final StartupCommand cmd, final bool for (DomainRouterVO router : routers) { if (router.isStopPending()) { s_logger.info("Stopping router " + router.getInstanceName() + " due to stop pending flag found!"); - final State state = router.getState(); - if (state != State.Stopped && state != State.Destroyed) { + final VirtualMachine.State state = router.getState(); + if (state != VirtualMachine.State.Stopped && state != VirtualMachine.State.Destroyed) { try { stopRouter(router.getId(), false); } catch (final ResourceUnavailableException e) { diff --git a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java index 3dc984e444c2..0d1ab83a402f 100644 --- a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java +++ b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java @@ -32,7 +32,7 @@ public PrivateGatewayProfile(VpcGateway vpcGateway, long physicalNetworkId) { } @Override - public long getId() { + public Long getId() { return vpcGateway.getId(); } diff --git a/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java b/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java index ce01a69aa0a4..7083cfac5694 100644 --- a/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java +++ b/server/src/com/cloud/storage/resource/DummySecondaryStorageResource.java @@ -133,7 +133,7 @@ public StartupCommand[] initialize() { protected GetStorageStatsAnswer execute(GetStorageStatsCommand cmd) { long size = 1024 * 1024 * 1024 * 100L; - return new GetStorageStatsAnswer(cmd, 0, size); + return new GetStorageStatsAnswer(cmd, 0l, size); } @Override diff --git a/server/test/com/cloud/vpc/NetworkACLServiceTest.java b/server/test/com/cloud/vpc/NetworkACLServiceTest.java index 1909a4f500bf..60edff39911c 100644 --- a/server/test/com/cloud/vpc/NetworkACLServiceTest.java +++ b/server/test/com/cloud/vpc/NetworkACLServiceTest.java @@ -132,7 +132,7 @@ public Long getVpcId() { } @Override - public long getId() { + public Long getId() { return 1L; } diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java index a8ed9a84d9b9..ea40156a2d5d 100644 --- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java +++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java @@ -209,7 +209,7 @@ private UploadAnswer handleUploadProgressCmd(UploadProgressCommand cmd) { if (jobId != null) uj = jobs.get(jobId); if (uj == null) { - return new UploadAnswer(null, 0, "Cannot find job", com.cloud.storage.UploadVO.Status.UNKNOWN, "", "", 0); + return new UploadAnswer(null, 0, "Cannot find job", com.cloud.storage.UploadVO.Status.UNKNOWN, "", "", 0l); } TemplateUploader td = uj.getTemplateUploader(); switch (cmd.getRequest()) { diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java index 883129b20ffa..91302a3d19e2 100644 --- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java +++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java @@ -1029,6 +1029,9 @@ public static String getLinkLocalIpEnd() { public static String portRangeToString(final int portRange[]) { return Integer.toString(portRange[0]) + ":" + Integer.toString(portRange[1]); } + public static String portRangeToString(final Integer portRange[]) { + return portRange[0].toString() + ":" + portRange[1].toString(); + } public static boolean verifyDomainNameLabel(final String hostName, final boolean isHostName) { // must be between 1 and 63 characters long and may contain only the ASCII letters 'a' through 'z' (in a diff --git a/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java b/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java index d43542f34041..815c05e9b079 100644 --- a/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java +++ b/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java @@ -42,6 +42,7 @@ import com.cloud.utils.exception.CloudRuntimeException; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang.ArrayUtils; import com.cloud.utils.Ternary; import org.bouncycastle.openssl.PEMReader; @@ -57,7 +58,7 @@ public static byte[] buildAndSaveKeystore(String alias, String cert, String priv return os.toByteArray(); } - public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException, NoSuchAlgorithmException, + public static Byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException, InvalidKeySpecException { KeyStore ks = KeyStore.getInstance("JKS"); ks.load(null, storePassword != null ? storePassword.toCharArray() : null); @@ -81,7 +82,7 @@ public static byte[] buildAndSaveKeystore(List> ByteArrayOutputStream os = new ByteArrayOutputStream(); ks.store(os, storePassword != null ? storePassword.toCharArray() : null); os.close(); - return os.toByteArray(); + return ArrayUtils.toObject(os.toByteArray()); } public static KeyStore loadKeystore(byte[] ksData, String storePassword) throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {