Issue-ID: VID-943
Change-Id: I3c395f5332f078ad1a9a2c2c6899d5edc8a6bec7
Signed-off-by: PATTANAYAK, SAUMYA SWARUP (sp931a) <sp931a@att.com>
if (serviceModel == null) {
throw new GenericUncheckedException("Internal error while fetching Service Model: " + sdcModelUuid);
}
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);
VidNotions.ModelCategory serviceModelCategory = serviceModel.getService().getVidNotions().getModelCategory();
return (serviceModelCategory == VidNotions.ModelCategory.IS_5G_PROVIDER_NETWORK_MODEL) ||
(serviceModelCategory == VidNotions.ModelCategory.IS_5G_FABRIC_CONFIGURATION_MODEL);
try {
return serviceModelCache.get(uuid);
} catch (ExecutionException e) {
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) {
if (e.getCause() instanceof AsdcCatalogException) {
throw (AsdcCatalogException) e.getCause();
} else if (e.getCause() instanceof NullServiceModelException) {
try {
return toscaParser.makeServiceModel(serviceCsar, asdcServiceMetadata);
} catch (SdcToscaParserException e) {
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);
}
}
return tosca.makeServiceModel(uuid, serviceCsar, asdcServiceMetadata);
}
}