From e59d8d560376a34e0eab902a673b5b3c3add5b0d Mon Sep 17 00:00:00 2001
From: Sara Weiss <sara.weiss@intl.att.com>
Date: Wed, 18 Sep 2019 13:55:55 +0300
Subject: add 'cloud region' optional field to change management

Issue-ID: VID-596

Change-Id: Ieb89980f7e802fe2508950a0e1a23188145fd85e
Signed-off-by: Sara Weiss <sara.weiss@intl.att.com>
---
 .../webapp/app/vid/scripts/services/aaiService.js  | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js')

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 994a3e4ac..0e1beefb6 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,6 +86,23 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
         }).join("&");
     }
 
+    function getConfigParams(vnfRole, cloudRegion) {
+        if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH)) {
+            return null
+        }
+
+        let data = {
+            vnfRole: vnfRole,
+            cloudRegion: cloudRegion,
+        };
+
+        let config = {
+            params: data
+        };
+
+        return config;
+    }
+
     return {
         getSubscriberName: function (globalCustomerId,
                                      successCallbackFunction) {
@@ -630,24 +647,17 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
         },
 
         getVnfsByCustomerIdAndServiceType: function (globalSubscriberId, serviceType, vnfRole, cloudRegion) {
-            var deferred = $q.defer();
+            let deferred = $q.defer();
 
             let url = globalSubscriberId + COMPONENT.FORWARD_SLASH + serviceType
 
-            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH)){
-                if (vnfRole) {
-                    url + COMPONENT.FORWARD_SLASH + vnfRole
-                }
-                if (cloudRegion) {
-                    url + COMPONENT.FORWARD_SLASH + cloudRegion;
-                }
-            }
-
+            const path = COMPONENT.AAI_GET_VNF_BY_CUSTOMERID_AND_SERVICETYPE + url;
+            let config = getConfigParams(vnfRole, cloudRegion);
 
             if (UtilityService.hasContents(globalSubscriberId) &&
                 UtilityService.hasContents(serviceType)) {
 
-                $http.get(COMPONENT.AAI_GET_VNF_BY_CUSTOMERID_AND_SERVICETYPE + url)
+                $http.get(path, config)
                     .success(function (response) {
                         if (response) {
                             deferred.resolve({data: response});
-- 
cgit 1.2.3-korg