You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/05 14:03:40 UTC

[1/2] git commit: updated refs/heads/4.4 to 0c60ea2

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 410413606 -> 0c60ea2e0


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/df0564f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df0564f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df0564f1

Branch: refs/heads/4.4
Commit: df0564f14d35c02d5e745ffdea3b3e1e6d69698b
Parents: 4104136
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Mon Apr 21 12:14:22 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon May 5 14:02:52 2014 +0200

----------------------------------------------------------------------
 api/src/com/cloud/vm/VirtualMachineProfile.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df0564f1/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/2] git commit: updated refs/heads/4.4 to 0c60ea2

Posted by da...@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/0c60ea2e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c60ea2e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c60ea2e

Branch: refs/heads/4.4
Commit: 0c60ea2e01a80d5201b23415ebef818984db8730
Parents: df0564f
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Mon Apr 21 15:19:30 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon May 5 14:03:22 2014 +0200

----------------------------------------------------------------------
 usage/src/com/cloud/usage/UsageManagerImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c60ea2e/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);
     }