From 79a0dd38e0d1150e734d04e5ab999764a655af34 Mon Sep 17 00:00:00 2001 From: subhash kumar singh Date: Thu, 17 May 2018 08:52:36 +0000 Subject: Fix resource population to DB Fix resource population to DB. Change-Id: Iae25ce2f15fa121a45a55559458fcbbd217f2c7d Issue-ID: SO-624 Signed-off-by: subhash kumar singh --- .../installer/heat/ToscaResourceInstaller.java | 43 ++++++++++++++-------- .../openecomp/mso/db/catalog/CatalogDatabase.java | 16 ++++++++ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java index fc4e522877..a8c67fd96e 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java @@ -596,23 +596,34 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller { List allottedResourceList = toscaResourceStruct.getSdcCsarHelper().getAllottedResources(); - if(allottedResourceList != null){ - - for(NodeTemplate allottedNode : allottedResourceList){ - - createAllottedResource(allottedNode, toscaResourceStruct); - - catalogDB.saveAllottedResource(toscaResourceStruct.getAllottedResource()); - - catalogDB.saveAllottedResourceCustomization(toscaResourceStruct.getCatalogAllottedResourceCustomization()); - - catalogDB.saveServiceToResourceCustomization(toscaResourceStruct.getCatalogAllottedServiceToResourceCustomization()); - - } - } - + if(allottedResourceList != null){ + + for(NodeTemplate allottedNode : allottedResourceList){ + + createAllottedResource(allottedNode, toscaResourceStruct); + + catalogDB.saveAllottedResource(toscaResourceStruct.getAllottedResource()); + + catalogDB.saveAllottedResourceCustomization(toscaResourceStruct.getCatalogAllottedResourceCustomization()); + + catalogDB.saveServiceToResourceCustomization(toscaResourceStruct.getCatalogAllottedServiceToResourceCustomization()); + + } + } + + // handle VF resource + List serviceVfList = toscaResourceStruct.getSdcCsarHelper().getServiceVfList(); + if (serviceVfList != null) { + for (NodeTemplate vfNode : serviceVfList) { + createVnfResource(vfNode, toscaResourceStruct); + catalogDB.saveVnfResource(toscaResourceStruct.getCatalogVnfResource()); + catalogDB.saveVnfResourceCustomization(toscaResourceStruct.getCatalogVnfResourceCustomization()); + catalogDB.saveServiceToResourceCustomization(toscaResourceStruct.getCatalogVfServiceToResourceCustomization()); + } + } + - List nodeTemplatesVLList = toscaResourceStruct.getSdcCsarHelper().getServiceVlList(); + List nodeTemplatesVLList = toscaResourceStruct.getSdcCsarHelper().getServiceVlList(); if(nodeTemplatesVLList != null){ diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java index 4fb5ebc1f8..91c19dd97f 100644 --- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java +++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java @@ -3826,6 +3826,22 @@ public class CatalogDatabase implements Closeable { LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "saveOrUpdateAllottedResourceCustomization", null); } } + + public void saveVnfResource (VnfResource vnfResource) { + long startTime = System.currentTimeMillis (); + LOGGER.debug ("Catalog database - save vnf Resource with Name " + vnfResource.getModelName()); + try { + VnfResource existing = this.getVnfResourceByModelUuid(vnfResource.getModelUuid()); + if (existing == null) { + this.getSession().save(vnfResource); + } else { + LOGGER.debug("Found existing vnfResource with this modelUuid - no need to save"); + } + + } finally { + LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "saveOrUpdateVnfResourceCustomization", null); + } + } public void saveNetworkResource (NetworkResource networkResource) throws RecordNotFoundException { long startTime = System.currentTimeMillis (); -- cgit 1.2.3-korg