Change the API Path

Change the API path from onapapi to api

Change-Id: I62ee0a3d4e4b24de5aa40d4ca8bb92e6e78d9d1d
Issue-ID: HOLMES-39
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>

diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
index 06f1913..ff3201b 100644 (file)
--- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml
+++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
@@ -15,7 +15,7 @@
 #\r
 server:\r
   type: simple\r
-  rootPath: '/onapapi/holmes-engine-mgmt/v1/*'\r
+  rootPath: '/api/holmes-engine-mgmt/v1/*'\r
   applicationContextPath: /\r
   adminContextPath: /admin\r
   connector:\r
@@ -52,7 +52,7 @@ database:
   driverClass: org.postgresql.Driver\r
   user: holmes\r
   password: holmespwd\r
-  url: jdbc:postgresql://169.254.59.196:5432/holmes\r
+  url: jdbc:postgresql://10.74.156.206:5432/holmes\r
   properties:\r
     charSet: UTF-8\r
   maxWaitForConnection: 1s\r
@@ -64,7 +64,7 @@ database:
   minIdleTime: 1s\r
 \r
 mqConfig:\r
-  brokerIp: 127.0.0.1\r
+  brokerIp: 10.74.156.206\r
   brokerPort: 61616\r
   brokerUsername: activemq\r
   brokerPassword: v1\r

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
index f8c2660..5f2f3be 100644 (file)
--- a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
@@ -51,7 +51,7 @@ public class EngineDActiveApp extends IOCApplication<EngineDAppConfig> {
         MicroServiceInfo msinfo = new MicroServiceInfo();
         msinfo.setServiceName("holmes-engine-mgmt");
         msinfo.setVersion("v1");
-        msinfo.setUrl("/onapapi/holmes-engine-mgmt/v1");
+        msinfo.setUrl("/api/holmes-engine-mgmt/v1");
         msinfo.setProtocol("REST");
         msinfo.setVisualRange("0|1");
         Set<Node> nodes = new HashSet<>();

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
index c8835cc..5d1f442 100644 (file)
--- a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java
@@ -189,6 +189,7 @@ public class DroolsEngine {
         } catch (Exception e) {\r
             throw new CorrelationException("Failed to delete the rule: " + packageName, e);\r
         }\r
+        packageNames.remove(pkg.getName());\r
     }\r
 \r
     public void compileRule(String content, Locale locale)\r