From a82e610071a2814e34846da0c4548fb43a7e8a4f Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Fri, 10 Feb 2023 13:13:29 +0000 Subject: [PATCH] Omit tenant metadata when not set Signed-off-by: MichaelMorris Issue-ID: SDC-4384 Change-Id: I11a389efcc8327bc26831a9331220e018d296c9f --- .../src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java index 313bef57aa..245fec39b0 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java @@ -583,7 +583,9 @@ public class ToscaExportHandler { } toscaMetadata.put(JsonPresentationFields.SUB_CATEGORY.getPresentation(), categoryDefinition.getSubcategories().get(0).getName()); toscaMetadata.put(JsonPresentationFields.RESOURCE_VENDOR.getPresentation(), resource.getVendorName()); - toscaMetadata.put(JsonPresentationFields.TENANT.getPresentation(), resource.getTenant()); + if (resource.getTenant() != null) { + toscaMetadata.put(JsonPresentationFields.TENANT.getPresentation(), resource.getTenant()); + } toscaMetadata.put(JsonPresentationFields.RESOURCE_VENDOR_RELEASE.getPresentation(), resource.getVendorRelease()); toscaMetadata.put(JsonPresentationFields.RESOURCE_VENDOR_MODEL_NUMBER.getPresentation(), resource.getResourceVendorModelNumber()); break; -- 2.16.6