From: tang peng <tang.peng5@zte.com.cn>
Date: Thu, 24 Sep 2020 06:42:19 +0000 (+0800)
Subject: Fixed an Issue on API Calling via MSB
X-Git-Tag: 1.2.8~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Frule-management.git;a=commitdiff_plain;h=7dbc431fa39b0c0094033780c78cb6f871221f85

Fixed an Issue on API Calling via MSB

Issue-ID: HOLMES-365
Signed-off-by: tang peng <tang.peng5@zte.com.cn>
Change-Id: I81f049593d86006323633cb0b6cd5f35b8c70c46
---

diff --git a/pom.xml b/pom.xml
index 683be5b..6e5ec2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.onap.msb.java-sdk</groupId>
             <artifactId>msb-java-sdk</artifactId>
-            <version>1.1.1</version>
+            <version>1.2.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
index c839b5a..ba61a28 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
@@ -78,17 +78,21 @@ public class RuleActiveApp extends IOCApplication<RuleAppConfig> {
         msinfo.setServiceName("holmes-rule-mgmt");
         msinfo.setVersion("v1");
         msinfo.setUrl("/api/holmes-rule-mgmt/v1");
+        msinfo.setPath("/api/holmes-rule-mgmt/v1");
         msinfo.setProtocol("REST");
         msinfo.setVisualRange("0|1");
+        msinfo.setLb_policy("round-robin");
         msinfo.setEnable_ssl(HttpsUtils.isHttpsEnabled());
         Set<Node> nodes = new HashSet<>();
         Node node = new Node();
         node.setIp(serviceAddrInfo[0]);
         node.setPort("9101");
+        /* Following codes will cause an unregistration from MSB (due to MSB malfunction), comment them for now
         node.setCheckType("HTTP");
         node.setCheckUrl(String.format(msbAddrTemplate, serviceAddrInfo[0], "9101"));
         node.setCheckTimeOut("60s");
         node.setCheckInterval("60s");
+        */
         nodes.add(node);
         msinfo.setNodes(nodes);
         return msinfo;