diff options
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java | 2 | ||||
| -rw-r--r-- | catalog-ui/src/app/ng2/pages/composition/palette/services/palette.service.ts | 3 |
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 |