Merge from ECOMP's repository

[vid.git] / 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 ceb5a75..6ede6ef 100755 (executable)
--- 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
@@ -76,8 +76,8 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
                 }];\r
             }\r
             return {displayData: displayData};\r
-        })\r
-    }\r
+        });\r
+    };\r
 \r
     function getJoinedQueryString(queries) {\r
         return queries.filter(function (val) {return val;}).join("&");\r
@@ -347,27 +347,16 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
             });\r
         },\r
 \r
-        getPortMirroringData : function (ids) {\r
+        getPortMirroringData: function (ids) {\r
             var defer = $q.defer();\r
-            if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_REGION_ID_FROM_REMOTE)){\r
-                var url = COMPONENT.AAI_GET_PORT_MIRRORING_CONFIGS_DATA +'?configurationIds=' +  ids.join(',');\r
-                $http.get(url).then(function(res){\r
-                    defer.resolve(res);\r
-                }).catch(function(err) {\r
-                    $log.error(err);\r
-                    defer.resolve({});\r
-                });\r
-            }else {\r
-                var staticConfigurationData = {};\r
-                angular.forEach(ids, function(id) {\r
-                    staticConfigurationData[id] = {\r
-                        "cloudRegionId": "mdt1"\r
-                    }\r
-                });\r
-                defer.resolve({\r
-                    "data": staticConfigurationData\r
-                });\r
-            }\r
+\r
+            var url = COMPONENT.AAI_GET_PORT_MIRRORING_CONFIGS_DATA + '?configurationIds=' + ids.join(',');\r
+            $http.get(url).then(function (res) {\r
+                defer.resolve(res);\r
+            }).catch(function (err) {\r
+                $log.error(err);\r
+                defer.resolve({});\r
+            });\r
 \r
             return defer.promise;\r
 \r
@@ -385,6 +374,29 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
             return defer.promise;\r
         },\r
 \r
+        getVlansByNetworksMapping : function (globalCustomerId, serviceType, serviceInstanceId, sdcModelUuid) {\r
+            var defer = $q.defer();\r
+            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS)) {\r
+                var url = COMPONENT.AAI_GET_PROVIDER_NETWORKS_ASSOCIATIONS + '?'\r
+                    + 'globalCustomerId=' + globalCustomerId\r
+                    + '&serviceType=' + serviceType\r
+                    + '&serviceInstanceId=' + serviceInstanceId\r
+                    + '&sdcModelUuid=' + sdcModelUuid\r
+                ;\r
+\r
+                $http.get(url).then(function(res){\r
+                    defer.resolve(res.data);\r
+                }).catch(function(err) {\r
+                    $log.error(err);\r
+                    defer.resolve({});\r
+                });\r
+\r
+            } else {\r
+                defer.resolve({});\r
+            }\r
+            return defer.promise;\r
+        },\r
+\r
         getSubscriptionServiceTypeList : function(globalCustomerId,\r
                                                   successCallbackFunction) {\r
             $log\r
@@ -434,8 +446,8 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
 \r
                 for (var i = 0; i < aaiLcpCloudRegionTenants.length; i++) {\r
                     lcpCloudRegionTenants.push({\r
-                        "cloudOwner": aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_OWNER],\r
                         "cloudRegionId": aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_REGION_ID],\r
+                        "cloudOwner": aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_OWNER],\r
                         "tenantName": aaiLcpCloudRegionTenants[i][COMPONENT.TENANT_NAME],\r
                         "tenantId": aaiLcpCloudRegionTenants[i][COMPONENT.TENANT_ID],\r
                         "isPermitted": aaiLcpCloudRegionTenants[i][COMPONENT.IS_PERMITTED]});\r
@@ -741,8 +753,25 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
                         "headers: " + header +\r
                         "config: " + config);\r
                 });\r
+        },\r
+\r
+        getHomingData: function(vnfInstanceId, vfModuleId)  {\r
+            var url = COMPONENT.AAI_GET_HOMING_DATA.replace('@vnfInstanceId', vnfInstanceId)\r
+                .replace('@vfModuleId', vfModuleId);\r
+\r
+            var deferred = $q.defer();\r
+\r
+            $http.get(url)\r
+                .success(function (response) {\r
+                    deferred.resolve({data: response});\r
+                }).error(function (data, status, headers, config) {\r
+                deferred.reject({message: data, status: status});\r
+            });\r
+\r
+            return deferred.promise;\r
+\r
         }\r
-    }\r
+    };\r
 };\r
 \r
 appDS2.factory("AaiService", ["$http", "$log", "PropertyService",\r