diff options
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java | 4 | ||||
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java | 2 |
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); } } |