diff options
author | Sara Weiss <sara.weiss@intl.att.com> | 2019-10-06 08:59:07 +0300 |
---|---|---|
committer | Sara Weiss <sara.weiss@intl.att.com> | 2019-10-06 11:08:31 +0300 |
commit | 54b4b3366fb23feae188bbe0a9a7b49eebea2692 (patch) | |
tree | d562b0634b6e1b97c0e4fefbd76dbd27e33355c0 /vid-app-common | |
parent | 39b185a11e5978991eedd4763415eed51b7c9462 (diff) |
change management integration with reduce flag
Issue-ID: VID-596
Signed-off-by: Sara Weiss <sara.weiss@intl.att.com>
Change-Id: I3b9df53ae4b58b3abe672b3871b75a68fda79fc9
Signed-off-by: Sara Weiss <sara.weiss@intl.att.com>
Diffstat (limited to 'vid-app-common')
-rw-r--r-- | vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js | 14 |
1 files changed, 7 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 d966df8d9..9eed4c14d 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 @@ -541,7 +541,7 @@ }); }; - function isCompatibleVNFRole(vnf) { + function isCompatibleNFRole(vnf) { return vnf.properties['nf-role'] === vm.changeManagement['vnfType'] || !vm.changeManagement['vnfType']; @@ -549,7 +549,7 @@ function isValidVnf(vnf) { - let result = isCompatibleVNFRole(vnf) && vnf.properties["model-invariant-id"] + let result = isCompatibleNFRole(vnf) && vnf.properties["model-invariant-id"] && vnf.properties["model-version-id"]; return result; @@ -577,9 +577,9 @@ vm.vnfTypes = []; vm.vnfTypesTemp = []; vm.serviceInstances = []; - vm.fromVNFVersions=[]; - vm.vnfNames =[]; - vm.changeManagement.vnfNames =[]; + vm.fromVNFVersions = []; + vm.vnfNames = []; + vm.changeManagement.vnfNames = []; var instances = vm.changeManagement.serviceType["service-instances"]["service-instance"]; // var promiseArrOfGetVnfs = preparePromiseArrOfGetVnfs(instances); @@ -723,7 +723,7 @@ }; vm.loadVNFNames = function () { - vm.changeManagement.vnfNames =[]; + vm.changeManagement.vnfNames = []; vm.vnfNames = []; const vnfs = vm.changeManagement.fromVNFVersion ? vm.vnfs : []; @@ -731,7 +731,7 @@ var selectedVersionNumber = getVersionNameForId(vm.changeManagement.fromVNFVersion); - if (isCompatibleVNFRole(vnf) && + if (isCompatibleNFRole(vnf) && selectedVersionNumber === getVersionNameForId(vnf.properties["model-version-id"])) { var vServer = {}; |