Merge "replaced named func with anonymous func"

3 files changed, 16 insertions, 13 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 06622cfbc..366965c8f 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -3,6 +3,7 @@
  * VID

  * ================================================================================

  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * Modifications Copyright (C) 2019 IBM.

  * ================================================================================

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -1368,11 +1369,11 @@ Private metthods
         function _setPnf(data) { // data is the $scope.service.instance object

             return PnfService.getPnfs(data)

                 .then(

-                    function success(response) {

+                    function (response) {

                         return response.data;

                         // * can add here changes on the data that are needed to the view ( filter, ect..)

                     },

-                    function error(error) {

+                    function (error) {

                         console.error(error);

                     }

                 );

@@ -1382,11 +1383,11 @@ Private metthods
         function _setCr(data) { // data is the $scope.service.instance object

             return CrService.getCr(data)

                 .then(

-                    function success(response) {

+                    function (response) {

                         return response.data.results;

                         // * can add here changes on the data that are needed to the view ( filter, ect..)

                     },

-                    function error(error) {

+                    function (error) {

                         console.error(error);

                     }

                 );

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index f0a6ebdf7..6c4d29005 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -3,6 +3,7 @@
  * VID

  * ================================================================================

  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * Modifications Copyright (C) 2019 IBM.

  * ================================================================================

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -50,7 +51,7 @@
 			$scope.status = FIELD.STATUS.FETCHING_SERVICE_CATALOG_ASDC;

 

 			$http.get(pathQuery)

-			.then(function successCallback(response) {

+			.then(function (response) {

 				$scope.services = [];

 				if (response.data && angular.isArray(response.data.services)) {

 					wholeData = response.data.services;

@@ -82,7 +83,7 @@
 					$scope.isSpinnerVisible = false;

 				}

 				$scope.deployButtonType = response.data.readOnly ? 'disabled' : 'primary';

-			}, function errorCallback(response) {

+			}, function (response) {

 				console.log("Error: " + response);

 			});

 		};

@@ -145,7 +146,7 @@
 			console.log("Instantiating SDC service " + service.uuid);

 

 			$http.get(COMPONENT.SERVICES_PATH + service.uuid)

-				.then(function successCallback(getServiceResponse) {

+				.then(function (getServiceResponse) {

 

 					var serviceModel = getServiceResponse.data;

 

@@ -239,7 +240,7 @@
 					    	}

 					    }

 					});

-				}, function errorCallback(response) {

+				}, function (response) {

 					console.log("Error: " + response);

 				});

 		};

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
index ec4799b14..bb3acad1b 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
@@ -3,6 +3,7 @@
  * VID

  * ================================================================================

  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * Modifications Copyright (C) 2019 IBM.

  * ================================================================================

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -197,7 +198,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
             console.log("Instantiating ASDC service " + service.uuid);

 

             $http.get('rest/models/services/' + service.uuid)

-                .then(function successCallback(getServiceResponse) {

+                .then(function (getServiceResponse) {

                     getServiceResponse.data['service'].serviceTypeName = $scope.serviceTypeName;

                     getServiceResponse.data['service'].createSubscriberName = $scope.createSubscriberName;

                     var serviceModel = getServiceResponse.data;

@@ -278,7 +279,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
                         }

                     });

 

-                }, function errorCallback(response) {

+                }, function (response) {

                     $log.error("Error: ", response);

                 });

         };

@@ -661,7 +662,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
             return $http({

                 method: 'GET',

                 url: pathQuery

-            }).then(function successCallback(response) {

+            }).then(function (response) {

                 if (response.headers()['content-type'].includes('json')) {

                     vidService.setModel(response.data);

                     console.log("aaiSubscriber getAsdcModel DONE!!!!");

@@ -696,10 +697,10 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
 

         $scope.getTenants = function (globalCustomerId) {

             $http.get(FIELD.ID.AAI_GET_TENTANTS + globalCustomerId)

-                .then(function successCallback(response) {

+                .then(function (response) {

                     return response.data;

                     //$location.path("/instantiate");

-                }, function errorCallback(response) {

+                }, function (response) {

                     //TODO

                 });

         }