diff options
| author |   Arthur Martella <amartell@research.att.com> | 2017-09-08 13:27:46 -0400 |
|---|---|---|
| committer | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:32:24 -0400 |
| commit | 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch) | |
| tree | 68c0c53c9156f5aa3c6b3599ac940770f986633d /status-control/src/main | |
| parent | fa1a211d28a912892fcd888569df033900eb01ee (diff) | |
1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400
Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000
Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'status-control/src/main')
3 files changed, 4 insertions, 4 deletions
diff --git a/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java b/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java index cd8cc7f13a..00d45a9235 100644 --- a/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java +++ b/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java @@ -62,7 +62,7 @@ public class HealthCheckUtils { public enum NodeType {APIH, RA, BPMN}; public boolean catalogDBCheck (MsoLogger subMsoLogger, long startTime) { - try(CatalogDatabase catalogDB = new CatalogDatabase ()) { + try(CatalogDatabase catalogDB = CatalogDatabase.getInstance()) { catalogDB.healthCheck (); } catch (Exception e) { subMsoLogger.error(MessageEnum.GENERAL_EXCEPTION, "", "HealthCheck", MsoLogger.ErrorCode.DataError, "Failed to check catalog database", e); @@ -74,7 +74,7 @@ public class HealthCheckUtils { public boolean requestDBCheck (MsoLogger subMsoLogger, long startTime) { try { - RequestsDatabase.healthCheck (); + (RequestsDatabase.getInstance()).healthCheck (); } catch (Exception e) { subMsoLogger.error(MessageEnum.GENERAL_EXCEPTION, "", "HealthCheck", MsoLogger.ErrorCode.DataError, "Failed to check request database", e); subMsoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.ServiceNotAvailable, "Exception during local healthcheck"); diff --git a/status-control/src/main/java/org/openecomp/mso/MsoStatusHandler.java b/status-control/src/main/java/org/openecomp/mso/MsoStatusHandler.java index f125cbbc50..b182726439 100644 --- a/status-control/src/main/java/org/openecomp/mso/MsoStatusHandler.java +++ b/status-control/src/main/java/org/openecomp/mso/MsoStatusHandler.java @@ -51,7 +51,7 @@ public class MsoStatusHandler { // Query DB for the value try { - RequestsDatabase.updateSiteStatus(siteName, enable); + (RequestsDatabase.getInstance()).updateSiteStatus(siteName, enable); } catch (Exception e) { logger.error (MessageEnum.GENERAL_EXCEPTION, "", "setSiteStatus", MsoLogger.ErrorCode.DataError, "Failed to set site status", e); diff --git a/status-control/src/main/java/org/openecomp/mso/MsoStatusUtil.java b/status-control/src/main/java/org/openecomp/mso/MsoStatusUtil.java index 2a86a4a260..b9fab62b6f 100644 --- a/status-control/src/main/java/org/openecomp/mso/MsoStatusUtil.java +++ b/status-control/src/main/java/org/openecomp/mso/MsoStatusUtil.java @@ -34,7 +34,7 @@ public class MsoStatusUtil { // Query DB for the value try { - SiteStatus siteStatus = RequestsDatabase.getSiteStatus(siteName); + SiteStatus siteStatus = (RequestsDatabase.getInstance()).getSiteStatus(siteName); if (null != siteStatus) { return siteStatus.getStatus(); } else { |