From 8ec0337374da419a627c505d6d59e3479609fed5 Mon Sep 17 00:00:00 2001 From: Barath Kumar R Date: Tue, 4 May 2021 17:16:14 +0530 Subject: [PATCH] BUG 1383 Cannot compose VNFD from UI: 'mgmt_cp missing' when adding VDU * Before adding CP need to VDU * While adding CP add mgmt-cp Change-Id: I4219faea328ab46285f8e049d5dc1a7565cdea42 Signed-off-by: Barath Kumar R --- .../vnf-composer/VNFComposerComponent.ts | 72 ++++++++++--------- .../compose-packages/ComposePackages.ts | 2 +- src/assets/i18n/de.json | 3 +- src/assets/i18n/en.json | 3 +- src/assets/i18n/es.json | 3 +- src/assets/i18n/pt.json | 3 +- 6 files changed, 47 insertions(+), 39 deletions(-) diff --git a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts index 081874a..7c3c247 100644 --- a/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts +++ b/src/app/packages/ns-packages/vnf-composer/VNFComposerComponent.ts @@ -266,7 +266,7 @@ export class VNFComposerComponent { if (vnfdPackageDetails['ext-cpd'] !== undefined) { vnfdPackageDetails['ext-cpd'].forEach((cp: EXTCPD): void => { this.nodes.push({ - id: cp['int-cpd'] !== undefined ? cp['int-cpd'].cpd : cp.id, + id: cp['int-cpd'].cpd !== undefined ? cp['int-cpd'].cpd : cp.id, name: cp.id, reflexive: false, type: 'cp' @@ -643,32 +643,38 @@ export class VNFComposerComponent { /** Drop VDU Composer Data @private */ private vduDropCompose(): void { const randomID: string = this.sharedService.randomString(); - if (this.vnfdPackageDetails.vdu === undefined) { - this.vnfdPackageDetails.vdu = []; + if (this.vnfdPackageDetails['mgmt-cp'] === undefined) { + this.notifierService.notify('error', this.translateService.instant('PAGE.TOPOLOGY.ADDCPBEFOREVDU')); + } else { + if (this.vnfdPackageDetails.vdu === undefined) { + this.vnfdPackageDetails.vdu = []; + } + this.vnfdPackageDetails.vdu.push({ + id: 'vdu_' + randomID, + name: 'vdu_' + randomID, + description: '', + 'sw-image-desc': 'ubuntu', + 'int-cpd': [], + 'monitoring-parameter': [], + 'virtual-compute-desc': '', + 'virtual-storage-desc': [] + }); + this.addNodes(environment.VNFPACKAGES_URL, this.identifier, this.vnfdPackageDetails); } - this.vnfdPackageDetails.vdu.push({ - id: 'vdu_' + randomID, - name: 'vdu_' + randomID, - description: '', - 'sw-image-desc': 'ubuntu', - 'int-cpd': [], - 'monitoring-parameter': [], - 'virtual-compute-desc': '', - 'virtual-storage-desc': [] - }); - this.addNodes(environment.VNFPACKAGES_URL, this.identifier, this.vnfdPackageDetails); } /** Drop CP Composer Data @private */ private cpDropCompose(): void { const randomID: string = this.sharedService.randomString(); if (this.vnfdPackageDetails['ext-cpd'] === undefined) { this.vnfdPackageDetails['ext-cpd'] = []; - this.vnfdPackageDetails['mgmt-cp'] = 'cp_' + randomID; } this.vnfdPackageDetails['ext-cpd'].push({ id: 'cp_' + randomID, 'int-cpd': {} }); + if (this.vnfdPackageDetails['mgmt-cp'] === undefined) { + this.vnfdPackageDetails['mgmt-cp'] = 'cp_' + randomID; + } this.addNodes(environment.VNFPACKAGES_URL, this.identifier, this.vnfdPackageDetails); } /** Drop IntVL Composer Data @private */ @@ -812,25 +818,23 @@ export class VNFComposerComponent { if (vdu['int-cpd'] === undefined) { vdu['int-cpd'] = []; } - if (extcpd['int-cpd'] === undefined) { - vdu['int-cpd'].push({ - id: vduExternalID, - 'virtual-network-interface-requirement': [ - { - name: vduExternalID, - position: 1, - 'virtual-interface': { type: 'PARAVIRT' } - } - ] - }); - this.vnfdPackageDetails['ext-cpd'][index] = { - id: extcpd.id, - 'int-cpd': { - cpd: vduExternalID, - 'vdu-id': vduID + vdu['int-cpd'].push({ + id: vduExternalID, + 'virtual-network-interface-requirement': [ + { + name: vduExternalID, + position: 1, + 'virtual-interface': { type: 'PARAVIRT' } } - }; - } + ] + }); + this.vnfdPackageDetails['ext-cpd'][index] = { + id: extcpd.id, + 'int-cpd': { + cpd: vduExternalID, + 'vdu-id': vduID + } + }; } }); } @@ -1018,7 +1022,7 @@ export class VNFComposerComponent { this.vnfdPackageDetails['ext-cpd'].forEach((extCPD: EXTCPD): void => { if (extCPD['int-cpd'] !== undefined) { if (extCPD['int-cpd'].cpd === CPDID) { - delete extCPD['int-cpd']; + extCPD['int-cpd'] = {}; } } }); diff --git a/src/app/utilities/compose-packages/ComposePackages.ts b/src/app/utilities/compose-packages/ComposePackages.ts index be70655..c621215 100644 --- a/src/app/utilities/compose-packages/ComposePackages.ts +++ b/src/app/utilities/compose-packages/ComposePackages.ts @@ -239,6 +239,6 @@ export class ComposePackages implements OnInit { } }; } - return jsyaml.dump(packageYaml); + return jsyaml.dump(packageYaml, { sortKeys: true }); } } diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index ba63664..47d7a98 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -303,7 +303,8 @@ "VDU": "VDU", "INTVL": "IntVL", "INTCP": "IntCP", - "DATAEMPTY": "Bitte ändere etwas" + "DATAEMPTY": "Bitte ändere etwas", + "ADDCPBEFOREVDU": "Fügen Sie CP hinzu, bevor Sie VDU hinzufügen" }, "PROJECT": { "NEWPROJECT": "Nieuw project", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 239192a..9046e5b 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -303,7 +303,8 @@ "VDU": "VDU", "INTVL": "IntVL", "INTCP": "IntCP", - "DATAEMPTY": "Please change something" + "DATAEMPTY": "Please change something", + "ADDCPBEFOREVDU": "Add CP before adding VDU" }, "PROJECT": { "NEWPROJECT": "New Project", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 40dd3d1..7b17d28 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -303,7 +303,8 @@ "VDU": "VDU", "INTVL": "IntVL", "INTCP": "IntCP", - "DATAEMPTY": "Por favor, cambia algo" + "DATAEMPTY": "Por favor, cambia algo", + "ADDCPBEFOREVDU": "Agregue CP antes de agregar VDU" }, "PROJECT": { "NEWPROJECT": "Nuevo proyecto", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index e97c200..ce9071d 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -303,7 +303,8 @@ "VDU": "VDU", "INTVL": "IntVL", "INTCP": "IntCP", - "DATAEMPTY": "Por favor mude algo" + "DATAEMPTY": "Por favor mude algo", + "ADDCPBEFOREVDU": "Adicione CP antes de adicionar VDU" }, "PROJECT": { "NEWPROJECT": "Novo projeto", -- 2.17.1