From 5e484ea73840e0b329be09730e009ae22c9962dc Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Wed, 31 Jan 2024 15:02:48 +0000 Subject: Remove Dmaap from apex-pdp Issue-ID: POLICY-4402 Signed-off-by: rameshiyer27 Change-Id: I76c284b6ff7ec0ce77189f3f2bc93d5b91d4eb24 --- .../resources/logic/definitive/APPCRestartVNFRequestTask.js | 4 ++-- .../src/main/resources/policy/ONAPvCPEPolicyModel.apex | 6 +++--- .../policy/apex/domains/onap/vcpe/AppcResponseCreator.java | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'examples/examples-onap-vcpe') diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js index 9ee928fca..058b4fd19 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js @@ -1,7 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020,2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ executor.logger.info(executor.subject.id); executor.logger.info(executor.inFields); -var appcRequest = new org.onap.policy.appclcm.AppcLcmDmaapWrapper; +var appcRequest = new org.onap.policy.appclcm.AppcLcmMessageWrapper; appcRequest.setBody(new org.onap.policy.appclcm.AppcLcmBody); appcRequest.getBody().setInput(new org.onap.policy.appclcm.AppcLcmInput); appcRequest.getBody().getInput().setCommonHeader( diff --git a/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex b/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex index 241435e67..b6c7958bd 100644 --- a/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex +++ b/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex @@ -1,7 +1,7 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= # Copyright (C) 2016-2018 Ericsson. All rights reserved. -# Modifications Copyright (C) 2019-2020 Nordix Foundation. +# Modifications Copyright (C) 2019-2020,2024 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ schema create name=UUIDType flavour=Java schema=java.util.UUID schema create name=VirtualControlLoopEventType flavour=Java schema=org.onap.policy.controlloop.VirtualControlLoopEvent schema create name=VirtualControlLoopNotificationType flavour=Java schema=org.onap.policy.controlloop.VirtualControlLoopNotification -schema create name=APPCLCMRequestType flavour=Java schema=org.onap.policy.appclcm.AppcLcmDmaapWrapper -schema create name=APPCLCMResponseType flavour=Java schema=org.onap.policy.appclcm.AppcLcmDmaapWrapper +schema create name=APPCLCMRequestType flavour=Java schema=org.onap.policy.appclcm.AppcLcmMessageWrapper +schema create name=APPCLCMResponseType flavour=Java schema=org.onap.policy.appclcm.AppcLcmMessageWrapper schema create name=GuardDecisionAttributesType flavour=Avro schema=LS #MACROFILE:"src/main/resources/schemas/definitive/GuardDecisionAttributesType.avsc" diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java index e6d913b27..ea44a2645 100644 --- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java +++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2020,2024 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,8 +29,8 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.BlockingQueue; import org.onap.policy.appclcm.AppcLcmBody; -import org.onap.policy.appclcm.AppcLcmDmaapWrapper; import org.onap.policy.appclcm.AppcLcmInput; +import org.onap.policy.appclcm.AppcLcmMessageWrapper; import org.onap.policy.appclcm.AppcLcmOutput; import org.onap.policy.common.gson.InstantAsMillisTypeAdapter; @@ -75,8 +75,8 @@ public class AppcResponseCreator { @Override public void run() { - AppcLcmDmaapWrapper requestWrapper = null; - requestWrapper = gson.fromJson(jsonRequestString, AppcLcmDmaapWrapper.class); + AppcLcmMessageWrapper requestWrapper = null; + requestWrapper = gson.fromJson(jsonRequestString, AppcLcmMessageWrapper.class); AppcLcmInput request = requestWrapper.getBody().getInput(); @@ -96,7 +96,7 @@ public class AppcResponseCreator { response.setPayload(""); - AppcLcmDmaapWrapper responseWrapper = new AppcLcmDmaapWrapper(); + AppcLcmMessageWrapper responseWrapper = new AppcLcmMessageWrapper(); responseWrapper.setBody(new AppcLcmBody()); responseWrapper.getBody().setOutput(response); -- cgit 1.2.3-korg