From: GuangrongFu <fu.guangrong@zte.com.cn>
Date: Tue, 3 Nov 2020 01:58:36 +0000 (+0800)
Subject: Changed the CL Ouput Topic to dcae_cl_out
X-Git-Tag: 1.3.0~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Frule-management.git;a=commitdiff_plain;h=fa2f14b76044cb0744c0f4a31de625fec148fe0c

Changed the CL Ouput Topic to dcae_cl_out

Change-Id: I9c3ffa5907fc6e73bdcf0e7d7648baf5d1619066
Issue-ID: HOLMES-369
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
---

diff --git a/rules/ccvpn-rule.drl b/rules/ccvpn-rule.drl
index 1f2d82d..2778ad1 100644
--- a/rules/ccvpn-rule.drl
+++ b/rules/ccvpn-rule.drl
@@ -143,7 +143,7 @@ rule "Set Up Correlation"
 		    	if ($a.getRootFlag() != 1 && $b.getRootFlag() != 1) {
 			    	PolicyMsg msg = createPolicyMsg($a);
 			        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
-			        dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_CL_OUTPUT");
+			        dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
 			        updateAaiLinkStatus(getLogicLink($a), status);
 		    	}
 		        $a.setRootFlag(1);
diff --git a/rules/ccvpn2-rule.drl b/rules/ccvpn2-rule.drl
index 6636397..0d34932 100644
--- a/rules/ccvpn2-rule.drl
+++ b/rules/ccvpn2-rule.drl
@@ -76,6 +76,6 @@ dialect "java"
            }
         PolicyMsg msg = createPolicyMsg($a, bandwidth);
         DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
-        dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_CL_OUTPUT");
+        dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
         $a.setRootFlag(1);
     end
diff --git a/rules/mdons-rule.drl b/rules/mdons-rule.drl
index c4bc803..a5a64d5 100644
--- a/rules/mdons-rule.drl
+++ b/rules/mdons-rule.drl
@@ -75,7 +75,7 @@ rule "Process Alarms MSA"
 		for(Map.Entry<String,String> entry : map.entrySet()){
 		    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());
 			DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
-			dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_Output_Event");
+			dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
 			DroolsLog.printInfo("Published to policy=" + msg.toString());
 
 		}
@@ -95,7 +95,7 @@ rule "Process Alarms TAPI"
 		for(Map.Entry<String,String> entry : map.entrySet()){
 		    PolicyMsg msg = createPolicyMsg($a, entry.getKey(), entry.getValue());
 			DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
-			dmaapService.publishPolicyMsg(msg, "unauthenticated.DCAE_Output_Event");
+			dmaapService.publishPolicyMsg(msg, "dcae_cl_out");
 			DroolsLog.printInfo("Published to policy=" + msg.toString());
 
 		}
diff --git a/rules/volte-rule.drl b/rules/volte-rule.drl
index 7f1ab4f..5d6e56e 100644
--- a/rules/volte-rule.drl
+++ b/rules/volte-rule.drl
@@ -38,7 +38,7 @@ no-loop true
 		DroolsLog.printInfo("Root alarm: ID=" + $root.getEventId() + ", Event Name=" + $root.getEventName());
 		DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
 		PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, $child, "org.onap.holmes.droolsRule");
-        dmaapService.publishPolicyMsg(policyMsg, "unauthenticated.DCAE_CL_OUTPUT");
+        dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
 		$root.setRootFlag(1);
 		update($root);
 end
@@ -55,7 +55,7 @@ no-loop true
 		DroolsLog.printInfo("New alarm: ID=" + $root.getEventId() + ", Event Name=" + $root.getEventName());
 		DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
 		PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, "org.onap.holmes.droolsRule");
-        dmaapService.publishPolicyMsg(policyMsg, "unauthenticated.DCAE_CL_OUTPUT");
+        dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
 		$root.setRootFlag(1);
 		update($root);
 end
@@ -69,7 +69,7 @@ no-loop true
 		DroolsLog.printInfo("Alarm cleared: ID=" + $root.getEventId() + ", Event Name=" + $root.getEventName());
 		DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
 		PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, "org.onap.holmes.droolsRule");
-        dmaapService.publishPolicyMsg(policyMsg, "unauthenticated.DCAE_CL_OUTPUT");
+        dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
 		retract($root);
 end