From: Sonsino, Ofir (os0695) <os0695@intl.att.com>
Date: Fri, 25 May 2018 20:28:16 +0000 (+0300)
Subject: Scale out fix for vfmodule name
X-Git-Tag: v2.0.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f904ba09ceca3613cc02478a1908db7828fa3b93;p=sandbox-vid.git

Scale out fix for vfmodule name

Change-Id: I3591d1cff63d96609f0a7441784c8d54cc189568
Issue-ID: VID-188
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---

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 d37bcb8c..086ae0ff 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 = '';