CADI AAF Integration and merging the code

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / controller / HealthCheckController.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
index f1628e0..cecbd9b 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/HealthCheckController.java
@@ -164,12 +164,12 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
                                EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
                        }
 
-                       if (!HealthMonitor.isClusterStatusOk()) {
-                               dbInfo.dbClusterStatus = "Problem, check the logs for more details";
-                               EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
-                       } else {
-                               dbInfo.dbClusterStatus = statusOk;
-                       }
+//                     if (!HealthMonitor.isClusterStatusOk()) {
+//                             dbInfo.dbClusterStatus = "Problem, check the logs for more details";
+//                             EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
+//                     } else {
+//                             dbInfo.dbClusterStatus = statusOk;
+//                     }
 
                        if (!HealthMonitor.isDatabasePermissionsOk()) {
                                dbInfo.dbPermissions = "Problem, check the logs for more details";
@@ -179,28 +179,31 @@ public class HealthCheckController extends EPUnRestrictedBaseController {
                        }
                        statusCollection.add(dbInfo);
                        
-                       HealthStatusInfo CassandraStatusInfo = new HealthStatusInfo("Music-Cassandra");
-                       //CassandraStatusInfo.hostName = EcompPortalUtils.getMyHostName();
-                       CassandraStatusInfo.ipAddress = MusicUtil.getMyCassaHost();
-                       
-                       if (!HealthMonitor.isCassandraStatusOk()) {
-                               overallStatus = false;
-                               CassandraStatusInfo.healthCheckStatus = statusDown;
-                               CassandraStatusInfo.description = "Check the logs for more details";
-                               EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckCassandraError);
-                       }
-                       statusCollection.add(CassandraStatusInfo);
-
-                       HealthStatusInfo zookeeperStatusInfo = new HealthStatusInfo("Music-zookeeper");
-                       //zookeeperStatusInfo.hostName = EcompPortalUtils.getMyHostName();
-                       zookeeperStatusInfo.ipAddress = MusicUtil.getMyZkHost();
-                       if (!HealthMonitor.isZookeeperStatusOk()) {
-                               overallStatus = false;
-                               zookeeperStatusInfo.healthCheckStatus = statusDown;
-                               zookeeperStatusInfo.description = "Check the logs for more details";
-                               EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckZookeeperError);
+                       org.onap.portalapp.music.util.MusicUtil MusicUtilSDK = new org.onap.portalapp.music.util.MusicUtil();
+                       if(MusicUtilSDK.isMusicEnable()){
+                               HealthStatusInfo CassandraStatusInfo = new HealthStatusInfo("Music-Cassandra");
+                               //CassandraStatusInfo.hostName = EcompPortalUtils.getMyHostName();
+                               CassandraStatusInfo.ipAddress = MusicUtil.getMyCassaHost();
+                               
+                               if (!HealthMonitor.isCassandraStatusOk()) {
+                                       overallStatus = false;
+                                       CassandraStatusInfo.healthCheckStatus = statusDown;
+                                       CassandraStatusInfo.description = "Check the logs for more details";
+                                       EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckCassandraError);
+                               }
+                               statusCollection.add(CassandraStatusInfo);
+
+                               HealthStatusInfo zookeeperStatusInfo = new HealthStatusInfo("Music-zookeeper");
+                               //zookeeperStatusInfo.hostName = EcompPortalUtils.getMyHostName();
+                               zookeeperStatusInfo.ipAddress = MusicUtil.getMyZkHost();
+                               if (!HealthMonitor.isZookeeperStatusOk()) {
+                                       overallStatus = false;
+                                       zookeeperStatusInfo.healthCheckStatus = statusDown;
+                                       zookeeperStatusInfo.description = "Check the logs for more details";
+                                       EPLogUtil.logEcompError(logger, EPAppMessagesEnum.MusicHealthCheckZookeeperError);
+                               }
+                               statusCollection.add(zookeeperStatusInfo);
                        }
-                       statusCollection.add(zookeeperStatusInfo);
 
                        String json = "";
                        try {