You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/05/05 08:54:41 UTC
[1/4] git commit: updated refs/heads/master to 14f1b96
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 489bb0c7e -> 508e3e2c9
refs/heads/master 99b4cf788 -> 14f1b96b5
CLOUDSTACK-6463: password is not set for VMs created from password enabled template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2284a95e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2284a95e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2284a95e
Branch: refs/heads/master
Commit: 2284a95e4f29b3b8634468b53d3c28395d264038
Parents: 99b4cf7
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Mon Apr 21 12:14:22 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon May 5 11:48:35 2014 +0530
----------------------------------------------------------------------
api/src/com/cloud/vm/VirtualMachineProfile.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2284a95e/api/src/com/cloud/vm/VirtualMachineProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VirtualMachineProfile.java b/api/src/com/cloud/vm/VirtualMachineProfile.java
index c098e85..29f3164 100644
--- a/api/src/com/cloud/vm/VirtualMachineProfile.java
+++ b/api/src/com/cloud/vm/VirtualMachineProfile.java
@@ -53,6 +53,23 @@ public interface VirtualMachineProfile {
public String getName() {
return name;
}
+
+ @Override
+ public int hashCode() {
+ return this.getName() != null ? this.getName().hashCode() : 0;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Param other = (Param) obj;
+ return (other.getName().equals(this.getName()));
+ }
}
String getHostName();
[3/4] git commit: updated refs/heads/4.4-forward to 508e3e2
Posted by ki...@apache.org.
CLOUDSTACK-6463: password is not set for VMs created from password enabled template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce3074e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce3074e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce3074e9
Branch: refs/heads/4.4-forward
Commit: ce3074e9a23e71855798cb5decd01d7f9958f6c0
Parents: 489bb0c
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Mon Apr 21 12:14:22 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon May 5 12:11:28 2014 +0530
----------------------------------------------------------------------
api/src/com/cloud/vm/VirtualMachineProfile.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce3074e9/api/src/com/cloud/vm/VirtualMachineProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VirtualMachineProfile.java b/api/src/com/cloud/vm/VirtualMachineProfile.java
index c098e85..29f3164 100644
--- a/api/src/com/cloud/vm/VirtualMachineProfile.java
+++ b/api/src/com/cloud/vm/VirtualMachineProfile.java
@@ -53,6 +53,23 @@ public interface VirtualMachineProfile {
public String getName() {
return name;
}
+
+ @Override
+ public int hashCode() {
+ return this.getName() != null ? this.getName().hashCode() : 0;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Param other = (Param) obj;
+ return (other.getName().equals(this.getName()));
+ }
}
String getHostName();
[2/4] git commit: updated refs/heads/master to 14f1b96
Posted by ki...@apache.org.
CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14f1b96b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14f1b96b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14f1b96b
Branch: refs/heads/master
Commit: 14f1b96b5122696df58751a2045c333989ab8392
Parents: 2284a95
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Mon Apr 21 15:19:30 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon May 5 11:50:48 2014 +0530
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14f1b96b/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 6ce6901..4ceecbb 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -1205,16 +1205,22 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
UsageEventDetailsVO cpuNumber = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuNumber.name());
if (cpuNumber != null) {
usageInstance.setCpuCores(Long.parseLong(cpuNumber.getValue()));
+ } else {
+ usageInstance.setCpuCores(null);
}
UsageEventDetailsVO cpuSpeed = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuSpeed.name());
if (cpuSpeed != null) {
usageInstance.setCpuSpeed(Long.parseLong(cpuSpeed.getValue()));
+ } else {
+ usageInstance.setCpuSpeed(null);
}
UsageEventDetailsVO memory = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.memory.name());
if (memory != null) {
usageInstance.setMemory(Long.parseLong(memory.getValue()));
+ } else {
+ usageInstance.setMemory(null);
}
_usageInstanceDao.persist(usageInstance);
}
[4/4] git commit: updated refs/heads/4.4-forward to 508e3e2
Posted by ki...@apache.org.
CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/508e3e2c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/508e3e2c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/508e3e2c
Branch: refs/heads/4.4-forward
Commit: 508e3e2c9b08850049a046bc5a22941e481fad5e
Parents: ce3074e
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Mon Apr 21 15:19:30 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon May 5 12:11:35 2014 +0530
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/508e3e2c/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 6ce6901..4ceecbb 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -1205,16 +1205,22 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
UsageEventDetailsVO cpuNumber = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuNumber.name());
if (cpuNumber != null) {
usageInstance.setCpuCores(Long.parseLong(cpuNumber.getValue()));
+ } else {
+ usageInstance.setCpuCores(null);
}
UsageEventDetailsVO cpuSpeed = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuSpeed.name());
if (cpuSpeed != null) {
usageInstance.setCpuSpeed(Long.parseLong(cpuSpeed.getValue()));
+ } else {
+ usageInstance.setCpuSpeed(null);
}
UsageEventDetailsVO memory = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.memory.name());
if (memory != null) {
usageInstance.setMemory(Long.parseLong(memory.getValue()));
+ } else {
+ usageInstance.setMemory(null);
}
_usageInstanceDao.persist(usageInstance);
}