summaryrefslogtreecommitdiffstats
path: root/models-examples
diff options
context:
space:
mode:
authorrameshiyer27 <ramesh.murugan.iyer@est.tech>2024-01-29 09:23:58 +0000
committerRamesh Murugan Iyer <ramesh.murugan.iyer@est.tech>2024-02-08 14:29:41 +0000
commit49f07db935d114b72a44e446867b16262dd552aa (patch)
treef6867985541acb76f1e5279ed4104c86dc7adffb /models-examples
parent71be21fd5b9b52c613bb855f00a79a51e81906dd (diff)
Remove dmaap from models
Issue-ID: POLICY-4402 Change-Id: Icead1601984f463e557b969f2792f0f0aa05f060 Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Diffstat (limited to 'models-examples')
-rw-r--r--models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json4
-rw-r--r--models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml4
-rw-r--r--models-examples/src/main/resources/policies/vCPE.apex.policy.operational.input.tosca.json6
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml2
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml16
5 files changed, 16 insertions, 16 deletions
diff --git a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json
index 7bea9c53a..9e6f5f9ea 100644
--- a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json
+++ b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.json
@@ -52,7 +52,7 @@
"topicName": "APPC-LCM-WRITE",
"events": [
{
- "eventClass": "org.onap.policy.appclcm.AppcLcmDmaapWrapper",
+ "eventClass": "org.onap.policy.appclcm.AppcLcmMessageWrapper",
"eventFilter": "[?($.type == 'response')]",
"customSerialization": {
"customSerializerClass": "org.onap.policy.appclcm.util.Serialization",
@@ -92,7 +92,7 @@
"topicName": "APPC-LCM-READ",
"events": [
{
- "eventClass": "org.onap.policy.appclcm.AppcLcmDmaapWrapper",
+ "eventClass": "org.onap.policy.appclcm.AppcLcmMessageWrapper",
"customSerialization": {
"customSerializerClass": "org.onap.policy.appclcm.util.Serialization",
"jsonParser": "gson"
diff --git a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml
index df9fe5b4e..950b49308 100644
--- a/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/usecases.native.controller.policy.input.tosca.yaml
@@ -32,7 +32,7 @@ topology_template:
jsonParser: gsonPretty
- topicName: APPC-LCM-WRITE
events:
- - eventClass: org.onap.policy.appclcm.AppcLcmDmaapWrapper
+ - eventClass: org.onap.policy.appclcm.AppcLcmMessageWrapper
eventFilter: '[?($.type == ''response'')]'
customSerialization:
customSerializerClass: org.onap.policy.appclcm.util.Serialization
@@ -53,7 +53,7 @@ topology_template:
jsonParser: gsonPretty
- topicName: APPC-LCM-READ
events:
- - eventClass: org.onap.policy.appclcm.AppcLcmDmaapWrapper
+ - eventClass: org.onap.policy.appclcm.AppcLcmMessageWrapper
customSerialization:
customSerializerClass: org.onap.policy.appclcm.util.Serialization
jsonParser: gson
diff --git a/models-examples/src/main/resources/policies/vCPE.apex.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.apex.policy.operational.input.tosca.json
index 52a17a050..929a9d0eb 100644
--- a/models-examples/src/main/resources/policies/vCPE.apex.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.apex.policy.operational.input.tosca.json
@@ -1609,7 +1609,7 @@
"taskLogic": {
"key": "TaskLogic",
"logicFlavour": "JAVASCRIPT",
- "logic": "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * Modifications Copyright (C) 2020 Nordix Foundation.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.info(executor.subject.id);\nexecutor.logger.info(executor.inFields);\n\nvar appcRequest = new org.onap.policy.appclcm.AppcLcmDmaapWrapper;\nappcRequest.setBody(new org.onap.policy.appclcm.AppcLcmBody);\nappcRequest.getBody().setInput(new org.onap.policy.appclcm.AppcLcmInput);\nappcRequest.getBody().getInput().setCommonHeader(\n new org.onap.policy.appclcm.AppcLcmCommonHeader);\n\nappcRequest.setVersion(\"2.0.0\");\nappcRequest.setRpcName(\"restart\");\nappcRequest.setCorrelationId(executor.inFields.get(\"requestID\"));\nappcRequest.setType(\"request\");\n\nvar vcpeClosedLoopStatus = executor\n .getContextAlbum(\"VCPEClosedLoopStatusAlbum\").get(\n executor.inFields.get(\"vnfID\").toString());\n\nappcRequest.getBody().getInput().getCommonHeader().setTimeStamp(java.time.Instant.now());\nappcRequest.getBody().getInput().getCommonHeader().setApiVer(\"2.00\");\nappcRequest.getBody().getInput().getCommonHeader().setOriginatorId(\n executor.inFields.get(\"requestID\").toString());\nappcRequest.getBody().getInput().getCommonHeader().setRequestId(\n executor.inFields.get(\"requestID\"));\nappcRequest.getBody().getInput().getCommonHeader().setSubRequestId(\"1\");\nappcRequest.getBody().getInput().getCommonHeader().getFlags().put(\"ttl\", \"10000\");\nappcRequest.getBody().getInput().getCommonHeader().getFlags().put(\"force\", \"TRUE\");\nappcRequest.getBody().getInput().getCommonHeader().getFlags().put(\"mode\", \"EXCLUSIVE\");\n\nappcRequest.getBody().getInput().setAction(\"Restart\");\nappcRequest.getBody().getInput().setActionIdentifiers(new java.util.HashMap());\nappcRequest.getBody().getInput().getActionIdentifiers().put(\"vnf-id\",\n executor.inFields.get(\"vnfID\").toString());\n\nexecutor.getContextAlbum(\"RequestIDVNFIDAlbum\").put(\n executor.inFields.get(\"requestID\").toString(),\n executor.inFields.get(\"vnfID\"));\n\nvcpeClosedLoopStatus.put(\"notification\", \"OPERATION\");\nvcpeClosedLoopStatus.put(\"notificationTime\", java.lang.System\n .currentTimeMillis());\n\nexecutor.outFields.put(\"APPCLCMRequestEvent\", appcRequest);\n\nexecutor.logger.info(executor.outFields);\n\ntrue;"
+ "logic": "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2016-2018 Ericsson. All rights reserved.\n * Modifications Copyright (C) 2020 Nordix Foundation.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.info(executor.subject.id);\nexecutor.logger.info(executor.inFields);\n\nvar appcRequest = new org.onap.policy.appclcm.AppcLcmMessageWrapper;\nappcRequest.setBody(new org.onap.policy.appclcm.AppcLcmBody);\nappcRequest.getBody().setInput(new org.onap.policy.appclcm.AppcLcmInput);\nappcRequest.getBody().getInput().setCommonHeader(\n new org.onap.policy.appclcm.AppcLcmCommonHeader);\n\nappcRequest.setVersion(\"2.0.0\");\nappcRequest.setRpcName(\"restart\");\nappcRequest.setCorrelationId(executor.inFields.get(\"requestID\"));\nappcRequest.setType(\"request\");\n\nvar vcpeClosedLoopStatus = executor\n .getContextAlbum(\"VCPEClosedLoopStatusAlbum\").get(\n executor.inFields.get(\"vnfID\").toString());\n\nappcRequest.getBody().getInput().getCommonHeader().setTimeStamp(java.time.Instant.now());\nappcRequest.getBody().getInput().getCommonHeader().setApiVer(\"2.00\");\nappcRequest.getBody().getInput().getCommonHeader().setOriginatorId(\n executor.inFields.get(\"requestID\").toString());\nappcRequest.getBody().getInput().getCommonHeader().setRequestId(\n executor.inFields.get(\"requestID\"));\nappcRequest.getBody().getInput().getCommonHeader().setSubRequestId(\"1\");\nappcRequest.getBody().getInput().getCommonHeader().getFlags().put(\"ttl\", \"10000\");\nappcRequest.getBody().getInput().getCommonHeader().getFlags().put(\"force\", \"TRUE\");\nappcRequest.getBody().getInput().getCommonHeader().getFlags().put(\"mode\", \"EXCLUSIVE\");\n\nappcRequest.getBody().getInput().setAction(\"Restart\");\nappcRequest.getBody().getInput().setActionIdentifiers(new java.util.HashMap());\nappcRequest.getBody().getInput().getActionIdentifiers().put(\"vnf-id\",\n executor.inFields.get(\"vnfID\").toString());\n\nexecutor.getContextAlbum(\"RequestIDVNFIDAlbum\").put(\n executor.inFields.get(\"requestID\").toString(),\n executor.inFields.get(\"vnfID\"));\n\nvcpeClosedLoopStatus.put(\"notification\", \"OPERATION\");\nvcpeClosedLoopStatus.put(\"notificationTime\", java.lang.System\n .currentTimeMillis());\n\nexecutor.outFields.put(\"APPCLCMRequestEvent\", appcRequest);\n\nexecutor.logger.info(executor.outFields);\n\ntrue;"
}
}
},
@@ -2597,7 +2597,7 @@
"version": "0.0.1"
},
"schemaFlavour": "Java",
- "schemaDefinition": "org.onap.policy.appclcm.AppcLcmDmaapWrapper"
+ "schemaDefinition": "org.onap.policy.appclcm.AppcLcmMessageWrapper"
}
},
{
@@ -2611,7 +2611,7 @@
"version": "0.0.1"
},
"schemaFlavour": "Java",
- "schemaDefinition": "org.onap.policy.appclcm.AppcLcmDmaapWrapper"
+ "schemaDefinition": "org.onap.policy.appclcm.AppcLcmMessageWrapper"
}
},
{
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
index f5c181645..328ea8f6f 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
@@ -12,7 +12,7 @@ policy_types:
properties:
buscontroller_feed_publishing_endpoint:
type: string
- description: DMAAP Bus Controller feed endpoint
+ description: Bus Controller feed endpoint
datafile.policy:
type: string
description: datafile Policy JSON as string \ No newline at end of file
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
index 95c87e129..8e6c6f024 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
@@ -25,13 +25,13 @@ policy_types:
required: false
description: source topics and applicable events
entry_schema:
- type: onap.datatypes.dmaap.topic
+ type: onap.datatypes.kafka.topic
sinkTopics:
type: list
required: false
description: sink topics and applicable events
entry_schema:
- type: onap.datatypes.dmaap.topic
+ type: onap.datatypes.kafka.topic
customConfig:
type: map
required: false
@@ -54,20 +54,20 @@ policy_types:
description: the drools controller to which the current native policy is assigned
data_types:
- onap.datatypes.dmaap.topic:
+ onap.datatypes.kafka.topic:
derived_from: tosca.datatypes.Root
properties:
topicName:
type: string
required: true
- description: the dmaap topic name
+ description: the kafka topic name
events:
type: list
required: true
description: events used by this topic
entry_schema:
- type: onap.datatypes.dmaap.events
- onap.datatypes.dmaap.events:
+ type: onap.datatypes.kafka.events
+ onap.datatypes.kafka.events:
derived_from: tosca.datatypes.Root
properties:
eventClass:
@@ -79,10 +79,10 @@ data_types:
required: false
description: the JSONPath based condition to filter out the events to serialize
customSerialization:
- type: onap.datatypes.dmaap.custom_serialization
+ type: onap.datatypes.kafka.custom_serialization
required: false
description: overrides the default serialization/deserialization mechanisms with custom ones
- onap.datatypes.dmaap.custom_serialization:
+ onap.datatypes.kafka.custom_serialization:
derived_from: tosca.datatypes.Root
properties:
customSerializerClass: