summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonsino, Ofir (os0695) <os0695@intl.att.com>2018-05-25 23:28:16 +0300
committerSonsino, Ofir (os0695) <os0695@intl.att.com>2018-05-25 23:28:16 +0300
commitf904ba09ceca3613cc02478a1908db7828fa3b93 (patch)
tree55c7d8494bb296a4b765baa7082541f723cc40a1
parentcd389fd8381b37db031b777791910fd4a062912c (diff)
Scale out fix for vfmodule name
Change-Id: I3591d1cff63d96609f0a7441784c8d54cc189568 Issue-ID: VID-188 Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js11
1 files changed, 4 insertions, 7 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
index d37bcb8c1..086ae0ff0 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
@@ -241,14 +241,11 @@
var data;
if(workflowType=="VNF Scale Out") {
- var name = moduleToScale.modelCustomizationName.split('-')[0]; //example: vSAMP12..base..module-0
- name = name + "-" + vnf.groupModules[moduleToScale.customizationUuid].length;
-
data = {
modelInfo: {
modelType: 'vfModule',
modelInvariantId: moduleToScale.invariantUuid,
- modelName: name,
+ modelName: moduleToScale.modelCustomizationName,
modelVersion: moduleToScale.version,
modelVersionId: moduleToScale.uuid
},
@@ -256,8 +253,8 @@
requestInfo: requestInfoData,
relatedInstanceList: [],
requestParameters:requestParametersData
- }
- requestInfoData.instanceName = vnf.name;
+ };
+ requestInfoData.instanceName = vnf.name + "_" + (vnf.groupModules[moduleToScale.customizationUuid].length + 1);
}else{
data = {
vnfName: vnf.name,
@@ -275,7 +272,7 @@
requestInfo: requestInfoData,
relatedInstanceList: [],
requestParameters:requestParametersData
- }
+ };
}
var serviceInstanceId = '';