commit 0bbe5b01b1d240e204be81d510fb38b662e1a114
author Guangrong Fu <fu.guangrong@zte.com.cn> Thu Sep 15 19:52:40 2022 +0800
committer Guangrong Fu <fu.guangrong@zte.com.cn> Thu Sep 29 07:41:29 2022 +0000
tree 6eb7b631ed6f5acbfe61fbbd6c9d56efe9e7387b
parent 6fc48a9d8a0f186e1fb9c5b94d52927d3714425d

[HOLMES] Updated the Image Version

Updated the image version and some config files.

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

kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl b/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
index 494333c..814aeed 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
@@ -4,7 +4,7 @@
 import org.onap.holmes.common.api.stat.VesAlarm;
 import org.onap.holmes.common.aai.CorrelationUtil;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;
-import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
+import org.onap.holmes.common.utils.SpringContextUtil;
 import org.onap.holmes.common.utils.DroolsLog;
 
 rule "Relation_analysis_Rule"
@@ -20,7 +20,7 @@
         $child : VesAlarm( eventId != $eventId, parentId == null,
             CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId, $sourceName),
             eventName in ("Fault_MME_eNodeB out of service alarm"),
-            startEpochMicrosec < $startEpochMicrosec + 60000 && startEpochMicrosec > $startEpochMicrosec - 60000 )
+            startEpochMicrosec < $startEpochMicrosec + 60000 && startEpochMicrosec > $startEpochMicrosec - 60000)
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("Relation_analysis_Rule: rootId=" + $root.getEventId() + ", childId=" + $child.getEventId());
@@ -37,7 +37,7 @@
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("root_has_child_handle_Rule: rootId=" + $root.getEventId() + ", childId=" + $child.getEventId());
-        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
+        DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
         PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, $child, "org.onap.holmes.droolsRule");
         dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
         $root.setRootFlag(1);
@@ -55,7 +55,7 @@
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("root_no_child_handle_Rule: rootId=" + $root.getEventId());
-        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
+        DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
         PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, "org.onap.holmes.droolsRule");
         dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
         $root.setRootFlag(1);
@@ -70,7 +70,7 @@
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("root_cleared_handle_Rule: rootId=" + $root.getEventId());
-        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
+        DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
         PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, "org.onap.holmes.droolsRule");
         dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
         retract($root);
@@ -85,4 +85,4 @@
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("child_handle_Rule: childId=" + $child.getEventId());
         retract($child);
-end
+end
\ No newline at end of file