You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/10/22 23:14:42 UTC
[2/2] git commit: updated refs/heads/master to d79135f
CLOUDSTACK-4649: allow to update template details with addResourceDetails API
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d79135f4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d79135f4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d79135f4
Branch: refs/heads/master
Commit: d79135f4e650274fa3c20a6079f751398211a682
Parents: 3ec14c4
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Oct 22 10:26:37 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Oct 22 14:01:54 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/storage/dao/VMTemplateDetailsDao.java | 2 ++
.../com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java | 12 ++++++++++++
.../com/cloud/metadata/ResourceMetaDataManagerImpl.java | 4 +++-
3 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d79135f4/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
index 552f8f0..284380e 100644
--- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
+++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
@@ -29,4 +29,6 @@ public interface VMTemplateDetailsDao extends GenericDao<VMTemplateDetailVO, Lon
VMTemplateDetailVO findDetail(long templateId, String name);
void deleteDetails(long vmId);
+
+ void addTemplateDetail(Long templateId, String key, String value);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d79135f4/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
index 33b96c4..5ebed53 100644
--- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
@@ -96,4 +96,16 @@ public class VMTemplateDetailsDaoImpl extends GenericDaoBase<VMTemplateDetailVO,
}
txn.commit();
}
+
+ @Override
+ public void addTemplateDetail(Long templateId, String key, String value) {
+ VMTemplateDetailVO detail = findDetail(templateId, key);
+ if (detail == null) {
+ VMTemplateDetailVO newEntry = new VMTemplateDetailVO(templateId, key, value);
+ persist(newEntry);
+ } else {
+ detail.setValue(value);
+ update(detail.getId(), detail);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d79135f4/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index 929a44d..444650b 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -213,7 +213,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
}
// TODO - Have a better design here.
- if(resourceType == TaggedResourceType.Volume){
+ if (resourceType == TaggedResourceType.Volume){
VolumeDetailVO v = new VolumeDetailVO(id, key, value);
_volumeDetailDao.persist(v);
} else if (resourceType == TaggedResourceType.Nic){
@@ -227,6 +227,8 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
_networkDetailsDao.persist(networkDetail);
} else if (resourceType == TaggedResourceType.UserVm) {
_userVmDetailsDao.addVmDetail(id, key, value);
+ } else if (resourceType == TaggedResourceType.Template) {
+ _templateDetailsDao.addTemplateDetail(id, key, value);
} else{
throw new InvalidParameterValueException("The resource type " + resourceType + " is not supported by the API yet");
}