From d3c335e97b9d262588696784551e8bd02ce8331f Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Fri, 14 Jul 2017 13:38:57 -0500 Subject: [POLICY-22] Update vFW+vDN filters to onap package Change-Id: Ied53cb0454cb1669184c55a444233f4710870b7a Signed-off-by: Jorge Hernandez --- .../config/__artifactId__-controller.properties | 20 ++++----- .../src/main/config/vFWsim-controller.properties | 49 ---------------------- .../src/main/config/vFWsim-controller.rest.json | 31 -------------- .../src/main/config/vfwsim-onset.json | 5 --- 4 files changed, 10 insertions(+), 95 deletions(-) delete mode 100644 controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.properties delete mode 100644 controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.rest.json delete mode 100644 controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vfwsim-onset.json (limited to 'controlloop/templates') diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties index 9c3885947..712bc2946 100644 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties +++ b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties @@ -25,30 +25,30 @@ ueb.source.topics=${dcaeTopic},${appcTopic} ueb.source.topics.${dcaeTopic}.servers=${dcaeServers} ueb.source.topics.${dcaeTopic}.apiKey=${dcaeApiKey} ueb.source.topics.${dcaeTopic}.apiSecret=${dcaeApiSecret} -ueb.source.topics.${dcaeTopic}.events=org.openecomp.policy.controlloop.VirtualControlLoopEvent -ueb.source.topics.${dcaeTopic}.events.org.openecomp.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.* -ueb.source.topics.${dcaeTopic}.events.custom.gson=org.openecomp.policy.controlloop.util.Serialization,gsonPretty +ueb.source.topics.${dcaeTopic}.events=org.onap.policy.controlloop.VirtualControlLoopEvent +ueb.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.* +ueb.source.topics.${dcaeTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty ueb.source.topics.${appcTopic}.servers=${appcServers} ueb.source.topics.${appcTopic}.apiKey=${appcApiKey} ueb.source.topics.${appcTopic}.apiSecret=${appcApiSecret} -ueb.source.topics.${appcTopic}.events=org.openecomp.policy.appc.Response -ueb.source.topics.${appcTopic}.events.org.openecomp.policy.appc.Response.filter=CommonHeader=.*,Status=.* -ueb.source.topics.${appcTopic}.events.custom.gson=org.openecomp.policy.appc.util.Serialization,gsonPretty +ueb.source.topics.${appcTopic}.events=org.onap.policy.appc.Response +ueb.source.topics.${appcTopic}.events.org.onap.policy.appc.Response.filter=CommonHeader=.*,Status=.* +ueb.source.topics.${appcTopic}.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty ueb.sink.topics=${appcTopic},${notificationTopic} ueb.sink.topics.${appcTopic}.servers=${appcServers} ueb.sink.topics.${appcTopic}.apiKey=${appcApiKey} ueb.sink.topics.${appcTopic}.apiSecret=${appcApiSecret} -ueb.sink.topics.${appcTopic}.events=org.openecomp.policy.appc.Request -ueb.sink.topics.${appcTopic}.events.custom.gson=org.openecomp.policy.appc.util.Serialization,gsonPretty +ueb.sink.topics.${appcTopic}.events=org.onap.policy.appc.Request +ueb.sink.topics.${appcTopic}.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty ueb.sink.topics.${notificationTopic}.servers=${notificationServers} ueb.sink.topics.${notificationTopic}.apiKey=${notificationApiKey} ueb.sink.topics.${notificationTopic}.apiSecret=${notificationApiSecret} -ueb.sink.topics.${notificationTopic}.events=org.openecomp.policy.controlloop.VirtualControlLoopNotification -ueb.sink.topics.${notificationTopic}.events.custom.gson=org.openecomp.policy.controlloop.util.Serialization,gsonPretty +ueb.sink.topics.${notificationTopic}.events=org.onap.policy.controlloop.VirtualControlLoopNotification +ueb.sink.topics.${notificationTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty rules.groupId=${groupId} rules.artifactId=${artifactId} diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.properties b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.properties deleted file mode 100644 index 5cbe5f682..000000000 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.properties +++ /dev/null @@ -1,49 +0,0 @@ -### -# ============LICENSE_START======================================================= -# archetype-closed-loop-demo-rules -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -controller.name=vFWsim - -ueb.source.topics=${appcTopic} - -ueb.source.topics.${appcTopic}.servers=${appcServers} -ueb.source.topics.${appcTopic}.apiKey=${appcApiKey} -ueb.source.topics.${appcTopic}.apiSecret=${appcApiSecret} -ueb.source.topics.${appcTopic}.events=org.openecomp.policy.appc.Request,org.openecomp.policy.sim.vfw.OnsetEvent -ueb.source.topics.${appcTopic}.events.org.openecomp.policy.appc.Request.filter=CommonHeader=.*,Action=.* -ueb.source.topics.${appcTopic}.events.org.openecomp.policy.sim.vfw.OnsetEvent.filter=appcResponseCode=.* -ueb.source.topics.${appcTopic}.events.custom.gson=org.openecomp.policy.appc.util.Serialization,gsonPretty - -ueb.sink.topics=${dcaeTopic},${appcTopic} - -ueb.sink.topics.${dcaeTopic}.servers=${dcaeServers} -ueb.sink.topics.${dcaeTopic}.apiKey=${dcaeApiKey} -ueb.sink.topics.${dcaeTopic}.apiSecret=${dcaeApiSecret} -ueb.sink.topics.${dcaeTopic}.events=org.openecomp.policy.controlloop.VirtualControlLoopEvent -ueb.sink.topics.${dcaeTopic}.events.custom.gson=org.openecomp.policy.controlloop.util.Serialization,gsonPretty - -ueb.sink.topics.${appcTopic}.servers=${appcServers} -ueb.sink.topics.${appcTopic}.apiKey=${appcApiKey} -ueb.sink.topics.${appcTopic}.apiSecret=${appcApiSecret} -ueb.sink.topics.${appcTopic}.events=org.openecomp.policy.appc.Response -ueb.sink.topics.${appcTopic}.events.custom.gson=org.openecomp.policy.appc.util.Serialization,gsonPretty - -rules.groupId=org.openecomp.policy.drools-applications -rules.artifactId=vfwsim -rules.version=${dependenciesVersion} diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.rest.json b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.rest.json deleted file mode 100644 index 23840c48b..000000000 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vFWsim-controller.rest.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "controller.name": "vFWsim", - - "ueb.source.topics": "${appcTopic}", - - "ueb.source.topics.${appcTopic}.servers": "${appcServers}", - "ueb.source.topics.${appcTopic}.apiKey": "${appcApiKey}", - "ueb.source.topics.${appcTopic}.apiSecret": "${appcApiSecret}", - "ueb.source.topics.${appcTopic}.events": "org.openecomp.policy.appc.Request,org.openecomp.policy.sim.vfw.OnsetEvent", - "ueb.source.topics.${appcTopic}.events.org.openecomp.policy.appc.Request.filter": "CommonHeader=.*,Action=.*", - "ueb.source.topics.${appcTopic}.events.org.openecomp.policy.sim.vfw.OnsetEvent.filter": "appcResponseCode=.*", - "ueb.source.topics.${appcTopic}.events.custom.gson": "org.openecomp.policy.appc.util.Serialization,gsonPretty", - - "ueb.sink.topics": "${dcaeTopic},${appcTopic}", - - "ueb.sink.topics.${dcaeTopic}.servers": "${dcaeServers}", - "ueb.sink.topics.${dcaeTopic}.apiKey": "${dcaeApiKey}", - "ueb.sink.topics.${dcaeTopic}.apiSecret": "${dcaeApiSecret}", - "ueb.sink.topics.${dcaeTopic}.events": "org.openecomp.policy.controlloop.VirtualControlLoopEvent", - "ueb.sink.topics.${dcaeTopic}.events.custom.gson": "org.openecomp.policy.controlloop.util.Serialization,gsonPretty", - - "ueb.sink.topics.${appcTopic}.servers": "${appcServers}", - "ueb.sink.topics.${appcTopic}.apiKey": "${appcApiKey}", - "ueb.sink.topics.${appcTopic}.apiSecret": "${appcApiSecret}", - "ueb.sink.topics.${appcTopic}.events": "org.openecomp.policy.appc.Response", - "ueb.sink.topics.${appcTopic}.events.custom.gson": "org.openecomp.policy.appc.util.Serialization,gsonPretty", - - "rules.groupId": "org.openecomp.policy.drools-applications", - "rules.artifactId": "vfwsim", - "rules.version": "${dependenciesVersion}" -} \ No newline at end of file diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vfwsim-onset.json b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vfwsim-onset.json deleted file mode 100644 index dd559c039..000000000 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/config/vfwsim-onset.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dcaeTopic": "${dcaeTopic}", - "appcTopic": "${appcTopic}", - "appcResponseCode": 400 -} -- cgit 1.2.3-korg