aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPATTANAYAK, SAUMYA SWARUP (sp931a) <sp931a@att.com>2021-01-21 15:48:04 -0500
committerIkram Ikramullah <ikram@research.att.com>2021-02-02 20:08:43 +0000
commit31b631f1f239aaaf540ed5cee7644eac55687b5e (patch)
treec528a59c6bde8736d1cc27c84bb8ded4ab4ce4f6
parent0384ef0b3dcc36a6de0887814a4304c0d60cec11 (diff)
Unable to delete old service instances created of old ASDC service
Issue-ID: VID-943 Change-Id: I3c395f5332f078ad1a9a2c2c6899d5edc8a6bec7 Signed-off-by: PATTANAYAK, SAUMYA SWARUP (sp931a) <sp931a@att.com>
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java2
2 files changed, 6 insertions, 0 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java b/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java
index 015f8dc96..c467d99de 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java
@@ -139,6 +139,10 @@ public class AaiServiceInstanceStandardQueryController extends VidRestrictedBase
if (serviceModel == null) {
throw new GenericUncheckedException("Internal error while fetching Service Model: " + sdcModelUuid);
}
+ if (serviceModel.getService() == null || serviceModel.getService().getVidNotions() == null) {
+ return false;
+ }
+
VidNotions.ModelCategory serviceModelCategory = serviceModel.getService().getVidNotions().getModelCategory();
return (serviceModelCategory == VidNotions.ModelCategory.IS_5G_PROVIDER_NETWORK_MODEL) ||
(serviceModelCategory == VidNotions.ModelCategory.IS_5G_FABRIC_CONFIGURATION_MODEL);
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java
index ef62bf9f6..1870a0024 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java
@@ -127,6 +127,7 @@ public class VidServiceImpl implements VidService {
try {
return serviceModelCache.get(uuid);
} catch (ExecutionException e) {
+ LOG.error("Failed to get service info from cache ", e.getLocalizedMessage());
if (e.getCause() instanceof AsdcCatalogException) {
throw (AsdcCatalogException) e.getCause();
} else if (e.getCause() instanceof NullServiceModelException) {
@@ -155,6 +156,7 @@ public class VidServiceImpl implements VidService {
try {
return toscaParser.makeServiceModel(serviceCsar, asdcServiceMetadata);
} catch (SdcToscaParserException e) {
+ LOG.error("Failed to create service model using sdc tosca library", e);
return tosca.makeServiceModel(uuid, serviceCsar, asdcServiceMetadata);
}
}