Merge "Fix the health check"

2 files changed, 38 insertions, 11 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/resource/PackageResource.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/resource/PackageResource.java
index 6ad6596a..74d8aeb3 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/resource/PackageResource.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/resource/PackageResource.java
@@ -37,6 +37,7 @@ import org.eclipse.jetty.http.HttpStatus;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.db.connection.ConnectionUtil;
 import org.onap.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
 import org.onap.vnfsdk.marketplace.db.resource.PackageManager;
 import org.onap.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
@@ -201,17 +202,7 @@ public class PackageResource {
     @ApiOperation(value = "Health for VNF Repository", response = Response.class)
     @Produces(MediaType.APPLICATION_JSON)
     public Response healthCheck() {
-
-        // Step 1: Check whether tomcat server is up
-        RestResponse resp = RestfulClient.get("127.0.0.1", CommonConstant.HTTP_PORT, CommonConstant.BASE_URL);
-        if (RestConstant.RESPONSE_CODE_200 != resp.getStatusCode()) {
-            return Response.serverError().build();
-        }
-
-        // Step 2: Check whether postgres database is up
-        try {
-            PackageManager.getInstance().queryPackageByCsarId("01");
-        } catch (Exception e) {
+        if (ConnectionUtil.getSession() == null){
             return Response.serverError().build();
         }
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/HealthCheckTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/HealthCheckTest.java
new file mode 100644
index 00000000..92bf673b
--- /dev/null
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/HealthCheckTest.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 Huawei Technologies Co., Ltd.
+ *
+ * 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.
+ */
+
+package org.onap.vnfsdk.marketplace.resource;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class HealthCheckTest {
+    private PackageResource pkgRsc = null;
+
+    @Before
+    public void setUp() {
+        pkgRsc = new PackageResource();
+    }
+
+    @Test
+    public void testHealth() throws Exception {
+        assertEquals(200, pkgRsc.healthCheck().getStatus());
+    }
+}