From 25628c56e5fc6b1d6e2e3b761f435fc9596ce1b3 Mon Sep 17 00:00:00 2001 From: Daniel Cruz Date: Wed, 23 Oct 2019 18:18:07 -0500 Subject: Update APPC LCM Model references Updates to all references of APPC LCM model code based on changes in policy models for APPC LCM. Issue-ID: POLICY-2043 Change-Id: I0102eb27f449578636cfc0bf22124fa863f05724 Signed-off-by: Daniel Cruz --- .../controller-usecases/src/main/resources/usecases.drl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'controlloop/common/controller-usecases') diff --git a/controlloop/common/controller-usecases/src/main/resources/usecases.drl b/controlloop/common/controller-usecases/src/main/resources/usecases.drl index fb6812a88..b10ffad54 100644 --- a/controlloop/common/controller-usecases/src/main/resources/usecases.drl +++ b/controlloop/common/controller-usecases/src/main/resources/usecases.drl @@ -46,11 +46,7 @@ import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.appc.Request; import org.onap.policy.appc.Response; import org.onap.policy.appc.CommonHeader; -import org.onap.policy.appclcm.LcmRequestWrapper; -import org.onap.policy.appclcm.LcmResponseWrapper; -import org.onap.policy.appclcm.LcmRequest; -import org.onap.policy.appclcm.LcmResponse; -import org.onap.policy.appclcm.LcmCommonHeader; +import org.onap.policy.appclcm.AppcLcmDmaapWrapper; import org.onap.policy.cds.CdsResponse; import org.onap.policy.cds.client.CdsProcessorGrpcClient; import org.onap.policy.cds.properties.CdsServerProperties; @@ -585,7 +581,7 @@ rule "EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED" if (request instanceof Request) { PolicyEngineConstants.getManager().deliver("APPC-CL", request); } - else if (request instanceof LcmRequestWrapper) { + else if (request instanceof AppcLcmDmaapWrapper) { PolicyEngineConstants.getManager().deliver("APPC-LCM-READ", request); } break; @@ -1022,7 +1018,7 @@ rule "APPC.LCM.RESPONSE" onset.getRequestId() == $event.getRequestId() ) $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), requestId == $event.getRequestId().toString(), timerType == "Operation", !expired ) - $response : LcmResponseWrapper( getBody().getCommonHeader().getRequestId() == $event.getRequestId() ) + $response : AppcLcmDmaapWrapper( getBody().getOutput().getCommonHeader().getRequestId() == $event.getRequestId() ) then Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage()); @@ -1100,7 +1096,7 @@ end rule "APPC.LCM.RESPONSE.CLEANUP" when $params : ControlLoopParams( $clName : getClosedLoopControlName() ) - $response : LcmResponseWrapper($id : getBody().getCommonHeader().getRequestId ) + $response : AppcLcmDmaapWrapper($id : getBody().getOutput().getCommonHeader().getRequestId() ) not ( VirtualControlLoopEvent( requestId == $id, closedLoopEventStatus == ControlLoopEventStatus.ONSET ) ) then -- cgit 1.2.3-korg