Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C5D2910A9E for ; Thu, 24 Oct 2013 17:15:30 +0000 (UTC) Received: (qmail 1936 invoked by uid 500); 24 Oct 2013 17:15:29 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 1505 invoked by uid 500); 24 Oct 2013 17:15:25 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 1445 invoked by uid 99); 24 Oct 2013 17:15:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Oct 2013 17:15:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 469DE819EC3; Thu, 24 Oct 2013 17:15:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to 3ae6e9e Date: Thu, 24 Oct 2013 17:15:22 +0000 (UTC) Updated Branches: refs/heads/4.2 16301ddaa -> 3ae6e9e58 CLOUDSTACK-4649: added support to removeResourceDetail to remove details for UserVm/Templates Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ae6e9e5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ae6e9e5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ae6e9e5 Branch: refs/heads/4.2 Commit: 3ae6e9e58ea1751cb9a9df55fb5177b911f521f6 Parents: 16301dd Author: Alena Prokharchyk Authored: Thu Oct 24 09:49:29 2013 -0700 Committer: Alena Prokharchyk Committed: Thu Oct 24 10:03:51 2013 -0700 ---------------------------------------------------------------------- .../com/cloud/storage/dao/VMTemplateDetailsDao.java | 4 +++- .../cloud/storage/dao/VMTemplateDetailsDaoImpl.java | 14 +++++++++++++- .../schema/src/com/cloud/vm/dao/UserVmDetailsDao.java | 4 +++- .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 14 +++++++++++++- .../cloud/metadata/ResourceMetaDataManagerImpl.java | 8 ++++++-- server/src/com/cloud/vm/dao/NicDetailDao.java | 2 +- server/src/com/cloud/vm/dao/NicDetailDaoImpl.java | 4 +--- 7 files changed, 40 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ae6e9e5/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 284380e..3021b8f 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java @@ -30,5 +30,7 @@ public interface VMTemplateDetailsDao extends GenericDao { void deleteDetails(long vmId); - void addVmDetail(Long vmId, String key, String value); + void addVmDetail(long vmId, String key, String value); + + void removeDetails(long vmId, String key); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ae6e9e5/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java index be166b5..70cd66f 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java @@ -97,7 +97,7 @@ public class UserVmDetailsDaoImpl extends GenericDaoBase i } @Override - public void addVmDetail(Long vmId, String key, String value) { + public void addVmDetail(long vmId, String key, String value) { UserVmDetailVO detail = findDetail(vmId, key); if (detail == null) { UserVmDetailVO newEntry = new UserVmDetailVO(vmId, key, value); @@ -107,4 +107,16 @@ public class UserVmDetailsDaoImpl extends GenericDaoBase i update(detail.getId(), detail); } } + + @Override + public void removeDetails(long vmId, String key) { + if(key != null){ + UserVmDetailVO detail = findDetail(vmId, key); + if(detail != null){ + remove(detail.getId()); + } + }else { + deleteDetails(vmId); + } + } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ae6e9e5/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 52b224c..dfdb051 100644 --- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java +++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java @@ -227,10 +227,14 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource Long id = _taggedResourceMgr.getResourceId(resourceId, resourceType); // TODO - Have a better design here. - if(resourceType == TaggedResourceType.Volume){ + if (resourceType == TaggedResourceType.Volume){ _volumeDetailDao.removeDetails(id, key); - } else { + } else if (resourceType == TaggedResourceType.Nic){ _nicDetailDao.removeDetails(id, key); + } else if (resourceType == TaggedResourceType.UserVm) { + _userVmDetailsDao.removeDetails(id, key); + } else if (resourceType == TaggedResourceType.Template) { + _templateDetailsDao.removeDetails(id, key); } return true; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ae6e9e5/server/src/com/cloud/vm/dao/NicDetailDao.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/NicDetailDao.java b/server/src/com/cloud/vm/dao/NicDetailDao.java index 38eb2f2..66bff16 100644 --- a/server/src/com/cloud/vm/dao/NicDetailDao.java +++ b/server/src/com/cloud/vm/dao/NicDetailDao.java @@ -31,5 +31,5 @@ public interface NicDetailDao extends GenericDao { void deleteDetails(long nicId); - void removeDetails(Long id, String key); + void removeDetails(long nicId, String key); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ae6e9e5/server/src/com/cloud/vm/dao/NicDetailDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/NicDetailDaoImpl.java b/server/src/com/cloud/vm/dao/NicDetailDaoImpl.java index e166891..87b4d20 100644 --- a/server/src/com/cloud/vm/dao/NicDetailDaoImpl.java +++ b/server/src/com/cloud/vm/dao/NicDetailDaoImpl.java @@ -94,8 +94,7 @@ public class NicDetailDaoImpl extends GenericDaoBase implemen } @Override - public void removeDetails(Long nicId, String key) { - + public void removeDetails(long nicId, String key) { if(key != null){ NicDetailVO detail = findDetail(nicId, key); if(detail != null){ @@ -104,7 +103,6 @@ public class NicDetailDaoImpl extends GenericDaoBase implemen }else { deleteDetails(nicId); } - } }