Add UT for actions

Change-Id: Ic2dd7c4326111d9d3b8565a6b7e83b4f46bc197d
Issue-ID: HOLMES-50
Signed-off-by: youbowu <wu.youbo@zte.com.cn>

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/msb/MicroserviceBusRest.java b/holmes-actions/src/main/java/org/openo/holmes/common/msb/MicroserviceBusRest.java
index eb9deef..c8e03e9 100644 (file)
--- a/holmes-actions/src/main/java/org/openo/holmes/common/msb/MicroserviceBusRest.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/msb/MicroserviceBusRest.java
@@ -26,10 +26,11 @@ import org.openo.holmes.common.api.entity.ServiceRegisterEntity;
 \r
 @Path("/openoapi/microservices/v1/services")\r
 public interface MicroserviceBusRest {\r
+\r
     @Path("")\r
     @POST\r
     @Consumes(MediaType.APPLICATION_JSON)\r
     @Produces(MediaType.APPLICATION_JSON)\r
-    public ServiceRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,\r
-            ServiceRegisterEntity entity) throws Exception;\r
+    ServiceRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,\r
+            ServiceRegisterEntity entity);\r
 }\r

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java b/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
index 91e28a6..f7825e7 100644 (file)
--- a/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/utils/MSBRegisterUtil.java
@@ -35,7 +35,7 @@ public class MSBRegisterUtil {
         while (!flag && retry < 20) {\r
             log.info("Holmes microservice register. retry:" + retry);\r
             retry++;\r
-            flag = inner_register(entity);\r
+            flag = innerRegister(entity);\r
             if (!flag) {\r
                 log.warn("micro service register failed, sleep 30S and try again.");\r
                 threadSleep(30000);\r
@@ -47,7 +47,7 @@ public class MSBRegisterUtil {
         log.info("holmes micro service register end.");\r
     }\r
 \r
-    private boolean inner_register(ServiceRegisterEntity entity) {\r
+    private boolean innerRegister(ServiceRegisterEntity entity) {\r
         try {\r
             log.info("msbServerAddr:" + MicroServiceConfig.getMsbServerAddr());\r
             log.info("entity:" + entity);\r
@@ -55,7 +55,7 @@ public class MSBRegisterUtil {
                     MicroServiceConfig.getMsbServerAddr(), MicroserviceBusRest.class);\r
             resourceserviceproxy.registerServce("false", entity);\r
         } catch (Exception error) {\r
-            log.error("microservice register failed!" + error.getMessage());\r
+            log.error("microservice register failed!" + error.getMessage(), error);\r
             return false;\r
         }\r
         return true;\r
@@ -66,7 +66,7 @@ public class MSBRegisterUtil {
         try {\r
             Thread.sleep(second);\r
         } catch (InterruptedException error) {\r
-            log.error("thread sleep error.errorMsg:" + error.getMessage());\r
+            log.error("thread sleep error.errorMsg:" + error.getMessage(), error);\r
         }\r
         log.info("sleep end .");\r
     }\r

diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/utils/MSBRegisterUtilTest.java b/holmes-actions/src/test/java/org/openo/holmes/common/utils/MSBRegisterUtilTest.java
index 0845981..5d04c1a 100644 (file)
--- a/holmes-actions/src/test/java/org/openo/holmes/common/utils/MSBRegisterUtilTest.java
+++ b/holmes-actions/src/test/java/org/openo/holmes/common/utils/MSBRegisterUtilTest.java
@@ -65,7 +65,7 @@ public class MSBRegisterUtilTest {
 \r
         @Override\r
         public ServiceRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,\r
-                ServiceRegisterEntity entity) throws Exception {\r
+                ServiceRegisterEntity entity) {\r
             return null;\r
         }\r
     }\r