summaryrefslogtreecommitdiffstats
path: root/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation
diff options
context:
space:
mode:
authorKAPIL SINGAL <ks220y@att.com>2020-09-24 15:18:10 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-24 15:18:10 +0000
commit2b0442d1d2e721c4bf762bb2a3e75bc7606f9fcf (patch)
tree5a75e5187a70048a8897f893e1c26a812c912539 /cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation
parenta9de78841e84867f1b5065205760060bdc5307ec (diff)
parenta4d84ebd1db8f9b881c33f5efefc4aa6c1fbf02f (diff)
Merge "adding save for topology template content"
Diffstat (limited to 'cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation')
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts7
1 files changed, 7 insertions, 0 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts
index e9dd667d2..a9deb675a 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/creationModes/DesignerCreationMode.ts
@@ -74,15 +74,22 @@ export class DesignerCreationMode extends PackageCreationModes {
metadata.template_tags = fullTags;
vlbDefinition.metadata = metadata;
const files: Import[] = [];
+ let insideVlbDefinition: VlbDefinition = null;
if (cbaPackage.definitions.imports && cbaPackage.definitions.imports.size > 0) {
cbaPackage.definitions.imports.forEach((valueOfFile, key) => {
if (!key.includes(cbaPackage.metaData.name)) {
files.push({file: key});
+ } else {
+ // it means this is entry definition
+ insideVlbDefinition = JSON.parse(valueOfFile);
}
});
}
console.log(vlbDefinition);
vlbDefinition.imports = files;
+ if (insideVlbDefinition && insideVlbDefinition.topology_template) {
+ vlbDefinition.topology_template = insideVlbDefinition.topology_template;
+ }
console.log(cbaPackage.definitions.dslDefinition.content);
if (cbaPackage.definitions.dslDefinition.content) {
vlbDefinition.dsl_definitions = JSON.parse(cbaPackage.definitions.dslDefinition.content);