From c30539776162119e5c9d191ae08f81018a3da4cb Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 14 Nov 2023 10:56:49 +0100 Subject: [PATCH] VNF: fix NPE when list resourcedetails with resourcetype=VnfTemplate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit prior ``` (localcloud) 🐱 > list resourcedetails resourcetype=vnfTemplate resourceid=f2561ad3-21bc-4884-8263-eaf7e9b41e77 🙈 Error: (HTTP 530, error code 9999) ``` now ``` (localcloud) 🐱 > list resourcedetails resourcetype=vnfTemplate resourceid=f2561ad3-21bc-4884-8263-eaf7e9b41e77 🙈 Error: (HTTP 530, error code 9999) ResourceType VnfTemplate doesn't support metadata ``` --- api/src/main/java/com/cloud/server/ResourceTag.java | 2 +- .../src/main/java/com/cloud/tags/ResourceManagerUtilImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/cloud/server/ResourceTag.java b/api/src/main/java/com/cloud/server/ResourceTag.java index 89ec5b905c97..2304241f7e52 100644 --- a/api/src/main/java/com/cloud/server/ResourceTag.java +++ b/api/src/main/java/com/cloud/server/ResourceTag.java @@ -30,7 +30,7 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit public enum ResourceObjectType { UserVm(true, true, true), Template(true, true, true), - VnfTemplate(true, true, true), + VnfTemplate(false, false, true), ISO(true, false, true), Volume(true, true), Snapshot(true, false), diff --git a/server/src/main/java/com/cloud/tags/ResourceManagerUtilImpl.java b/server/src/main/java/com/cloud/tags/ResourceManagerUtilImpl.java index 928e54227a92..c02f41368634 100644 --- a/server/src/main/java/com/cloud/tags/ResourceManagerUtilImpl.java +++ b/server/src/main/java/com/cloud/tags/ResourceManagerUtilImpl.java @@ -81,6 +81,7 @@ public class ResourceManagerUtilImpl implements ResourceManagerUtil { s_typeMap.put(ResourceTag.ResourceObjectType.UserVm, UserVmVO.class); s_typeMap.put(ResourceTag.ResourceObjectType.Volume, VolumeVO.class); s_typeMap.put(ResourceTag.ResourceObjectType.Template, VMTemplateVO.class); + s_typeMap.put(ResourceTag.ResourceObjectType.VnfTemplate, VMTemplateVO.class); s_typeMap.put(ResourceTag.ResourceObjectType.ISO, VMTemplateVO.class); s_typeMap.put(ResourceTag.ResourceObjectType.Snapshot, SnapshotVO.class); s_typeMap.put(ResourceTag.ResourceObjectType.Network, NetworkVO.class);