2 files changed, 15 insertions, 12 deletions
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java
index 319347e..13507d6 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java
@@ -32,24 +32,27 @@ import org.onap.holmes.common.config.MicroServiceConfig;
 @Service
 public class EngineService {
 
-    protected HttpResponse delete(String packageName) throws Exception {
+    private static final String PREFIX = "https://";
+    private static final String PORT = ":9102";
+
+    protected HttpResponse delete(String packageName, String ip) throws Exception {
         HashMap headers = createHeaders();
-        String url = MicroServiceConfig.getMsbServerAddrWithHttpPrefix() + RuleMgtConstant.ENGINE_PATH + "/" + packageName;
+        String url = PREFIX + ip + PORT + RuleMgtConstant.ENGINE_PATH + "/" + packageName;
         return HttpsUtils.delete(url, headers);
     }
 
-    protected HttpResponse check(CorrelationCheckRule4Engine correlationCheckRule4Engine)
+    protected HttpResponse check(CorrelationCheckRule4Engine correlationCheckRule4Engine, String ip)
             throws Exception {
         String content = GsonUtil.beanToJson(correlationCheckRule4Engine);
         HashMap headers = createHeaders();
-        String url = MicroServiceConfig.getMsbServerAddrWithHttpPrefix() + RuleMgtConstant.ENGINE_PATH;
+        String url = PREFIX + ip + PORT + RuleMgtConstant.ENGINE_PATH;
         return HttpsUtils.post(url, headers, new HashMap<>(), new StringEntity(content));
     }
 
-    protected HttpResponse deploy(CorrelationDeployRule4Engine correlationDeployRule4Engine) throws Exception {
+    protected HttpResponse deploy(CorrelationDeployRule4Engine correlationDeployRule4Engine, String ip) throws Exception {
         String content = GsonUtil.beanToJson(correlationDeployRule4Engine);
         HashMap headers = createHeaders();
-        String url = MicroServiceConfig.getMsbServerAddrWithHttpPrefix() + RuleMgtConstant.ENGINE_PATH;
+        String url = PREFIX + ip + PORT + RuleMgtConstant.ENGINE_PATH;
         return HttpsUtils.put(url, headers, new HashMap<>(), new StringEntity(content));
     }
 
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
index 18a326e..b0bd1f5 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
@@ -34,10 +34,10 @@ public class EngineWrapper {
     @Inject
     private EngineService engineService;
 
-    public String deployEngine(CorrelationDeployRule4Engine correlationRule) throws CorrelationException {
+    public String deployEngine(CorrelationDeployRule4Engine correlationRule,String ip) throws CorrelationException {
         HttpResponse response;
         try {
-            response = engineService.deploy(correlationRule);
+            response = engineService.deploy(correlationRule, ip);
         } catch (Exception e) {
             throw new CorrelationException("Failed to call the rule deployment RESTful API.", e);
         }
@@ -55,10 +55,10 @@ public class EngineWrapper {
         }
     }
 
-    public boolean deleteRuleFromEngine(String packageName) throws CorrelationException {
+    public boolean deleteRuleFromEngine(String packageName,String ip) throws CorrelationException {
         HttpResponse response;
         try {
-            response = engineService.delete(packageName);
+            response = engineService.delete(packageName, ip);
         } catch (Exception e) {
             throw new CorrelationException("Failed to call the rule deleting RESTful API.", e);
         }
@@ -70,12 +70,12 @@ public class EngineWrapper {
         }
     }
 
-    public boolean checkRuleFromEngine(CorrelationCheckRule4Engine correlationCheckRule4Engine)
+    public boolean checkRuleFromEngine(CorrelationCheckRule4Engine correlationCheckRule4Engine,String ip)
             throws CorrelationException {
         log.info("Rule Contents: " + correlationCheckRule4Engine.getContent());
         HttpResponse response;
         try {
-            response = engineService.check(correlationCheckRule4Engine);
+            response = engineService.check(correlationCheckRule4Engine, ip);
         } catch (Exception e) {
             throw new CorrelationException("Failed to call the rule verification RESTful API.", e);
         }