1 files changed, 28 insertions, 28 deletions

diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js
index 18fc30b..ae1dbb5 100644
--- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js
+++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js
@@ -1,36 +1,38 @@
-/*******************************************************************************
- * =============LICENSE_START=========================================================
- *
- * =================================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  
- *      http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *******************************************************************************/
 appDS2.factory('NodeHealthService', function ($http, $q, $log) {
 	return {
 		/**
+		 * Get all the datacenter names
+		 */
+		getDatacentersHealth: function(pageNum,viewPerPage) {
+			// cache control for IE
+			var cc = "&cc=" + new Date().getTime().toString();
+			return $http({
+					method: 'GET',
+					url: 'healthservices/datacenters',
+					cache: false,
+					responseType: 'json' 
+			}).then(function(response) {
+				if (response.data == null || typeof response.data != 'object') 
+					return $q.reject('DatacentersService.getDatacentersHealth: response.data null or not object');
+				else 
+					return response.data;
+			}, 
+			function(error) {
+				$log.error('DatacenterService.getDatacentersHealth failed: ' + JSON.stringify(error));
+				return $q.reject(error.statusText);
+			});
+		},
+		/**
 		 * Gets one page of objects.
 		 * @param {Number} pageNum - page number; e.g., 1 
 		 * @param {Number} viewPerPage - number of items per page; e.g., 25
 		 * @return {JSON} Response object from remote side
 		 */
-		getNodesHealth: function(pageNum,viewPerPage) {
+		getNodesHealth: function(pageNum,viewPerPage, dc) {
 			// cache control for IE
 			let cc = "&cc=" + new Date().getTime().toString();
-			let url = 'healthservices/nodes?pageNum=' + pageNum + '&viewPerPage=' + viewPerPage + cc;
+			let url = 'healthservices/nodes?pageNum=' + pageNum + '&viewPerPage=' + viewPerPage +  
+			'&dc=' + dc +cc;
 			return $http({
 					method: 'GET',
 					url: url,
@@ -53,10 +55,8 @@ appDS2.factory('NodeHealthService', function ($http, $q, $log) {
 		 * @param {nodeName} node name (not the UUID)
 		 * @return {JSON} Response object from remote side
 		 */
-		getNodeServicesHealth: function(nodeName) {
-			// cache control for IE
-			let cc = "?cc=" + new Date().getTime().toString();
-			let url = 'healthservices/nodes/' + nodeName + cc;
+		getNodeServicesHealth: function(nodeName, dc) {
+			let url = 'healthservices/nodes/' + nodeName + '?dc=' + dc;
 			return $http({
 					method: 'GET',
 					url: url,
@@ -72,7 +72,7 @@ appDS2.factory('NodeHealthService', function ($http, $q, $log) {
 				$log.error('serviceHealthService.getNodeServicesHealth failed: ' + JSON.stringify(error));
 				return $q.reject(error.statusText);
 			});
-		}
+		},
 		
 	};
 });