From 753e695be1e39d2571f4504026f4b21c526efec6 Mon Sep 17 00:00:00 2001 From: Sara Weiss Date: Wed, 25 Sep 2019 12:51:29 +0300 Subject: change management integration with reduce flag Issue-ID: VID-596 Signed-off-by: Sara Weiss Change-Id: I81155ff877016995ef977358d3bf9fddf75a18ce --- .../new-change-management/new-change-management.controller.js | 6 +++--- .../src/main/webapp/app/vid/scripts/services/aaiService.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'vid-app-common/src/main/webapp/app') 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 20e964c53..d966df8d9 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 @@ -587,18 +587,18 @@ vm.vnfs = []; vm.vfModules = []; - let vnfRole = null; + let nfRole = null; let cloudRegion = null; if ($scope.isNewFilterChangeManagmentEnabled()) { - vnfRole = vm.changeManagement.vnfType ? vm.changeManagement.vnfType : null; + nfRole = vm.changeManagement.vnfType ? vm.changeManagement.vnfType : null; cloudRegion = vm.changeManagement.cloudRegion ? vm.changeManagement.cloudRegion : null; } AaiService.getVnfsByCustomerIdAndServiceType( vm.changeManagement.subscriberId, vm.changeManagement.serviceType["service-type"], - vnfRole, + nfRole, cloudRegion, ).then(function (response) { vm.isSearchedVNF = true; diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js index d841e299b..d3075764e 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js @@ -86,13 +86,13 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE }).join("&"); } - function getConfigParams(vnfRole, cloudRegion) { + function getConfigParams(nfRole, cloudRegion) { if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH)) { return null } let data = { - vnfRole: vnfRole, + nfRole: nfRole, cloudRegion: cloudRegion, }; @@ -646,13 +646,13 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE (UtilityService.runHttpErrorHandler); }, - getVnfsByCustomerIdAndServiceType: function (globalSubscriberId, serviceType, vnfRole, cloudRegion) { + getVnfsByCustomerIdAndServiceType: function (globalSubscriberId, serviceType, nfRole, cloudRegion) { let deferred = $q.defer(); let url = globalSubscriberId + COMPONENT.FORWARD_SLASH + serviceType const path = COMPONENT.AAI_GET_VNF_BY_CUSTOMERID_AND_SERVICETYPE + url; - let config = getConfigParams(vnfRole, cloudRegion); + let config = getConfigParams(nfRole, cloudRegion); if (UtilityService.hasContents(globalSubscriberId) && UtilityService.hasContents(serviceType)) { -- cgit 1.2.3-korg