summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrupaNagabhushan <krupa.nagabhushan@est.tech>2020-11-12 16:17:46 +0000
committerVasyl Razinkov <vasyl.razinkov@est.tech>2020-12-07 21:39:14 +0000
commita85240fe7160862a0b9f8fb95eb48e0ac6c03fad (patch)
tree2737f8a794fd73bf090a8232f1b72fcf5d7cdd27
parent95ad93091d5fa6e377e76f312d495151bddc9da8 (diff)
Fixing issue with nested services
Issue-ID: SDC-3376 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: Ibd234cc1e4459c0b8eb62ed6601a1dc9be3f1853
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java2
-rw-r--r--catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts3
2 files changed, 1 insertions, 4 deletions
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 9eebbc50cb..5c8d9c6c6d 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
@@ -540,7 +540,7 @@ public class ToscaExportHandler {
final ComponentInstance componentInstance) {
log.debug("createDependency componentCache {}", componentCache);
final Component componentRI = componentCache.get(componentInstance.getComponentUid());
- if (componentRI == null) {
+ if (componentRI == null || componentInstance.getOriginType() == OriginTypeEnum.ServiceSubstitution) {
// all resource must be only once!
final Either<Component, StorageOperationStatus> resource = toscaOperationFacade
.getToscaFullElement(componentInstance.getComponentUid());
diff --git a/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts b/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts
index d1d48507a5..ba165b0d50 100644
--- a/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts
+++ b/catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts
@@ -84,10 +84,7 @@ export class CompositionPaletteService {
retValObject['Service'] = serviceGroup;
}
}
- else {
- // Generic will be the 1st category in the left Pallete
retValObject['Generic'] = resInstances['Generic'];
- }
}
// Add all other categories