From c1f79cd311ad62d3adb374921b8c3d303db5add6 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Sat, 22 Feb 2020 17:11:20 -0500 Subject: Add frankfurt rules for Actor redesign Note: VcpeTest and VfwTest are not included, as they depend on updates to the APPC and APPC-LCM Actors. Added feature-controlloop-frankfurt. Added HTTP client property files to feature-controlloop-management. Updates per review comments: - pom changes - simplify FrankfurtBase - rename event-svc-http.properties - change "usescases" to "frankfurt" - use blanks for CDS property defaults - trailing spaces in http-client files - add https property to http-client files Added newlines to config files that appear to be missing them (based on feedback from gerrit). Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn Change-Id: Ib4a4d75461c734ae47309e41dc9d099e8815d55d --- .../event-svc-guard-disabled.properties | 23 +++++++++++++++++ .../eventService/event-svc-http-client.properties | 24 ++++++++++++++++++ .../eventService/event-svc-invalid-db.properties | 29 ++++++++++++++++++++++ .../event-svc-no-guard-actor.properties | 25 +++++++++++++++++++ .../eventService/event-svc-with-db.properties | 27 ++++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties create mode 100644 controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties create mode 100644 controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties create mode 100644 controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties create mode 100644 controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties (limited to 'controlloop/common/eventmanager/src/test/resources/eventService') diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties new file mode 100644 index 000000000..65f6c0cc1 --- /dev/null +++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties @@ -0,0 +1,23 @@ +# +# ============LICENSE_START====================================================== +# ONAP +# =============================================================================== +# Copyright (C) 2020 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======================================================== +# + +actor.service.GUARD.disabled=true +actor.service.GUARD.clientName=guard-client +actor.service.GUARD.operations.Decision.path=decide diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties new file mode 100644 index 000000000..a563afdc3 --- /dev/null +++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties @@ -0,0 +1,24 @@ +# +# ============LICENSE_START====================================================== +# ONAP +# =============================================================================== +# Copyright (C) 2020 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======================================================== +# + +http.client.services=guard-client +http.client.services.guard-client.host=localhost +http.client.services.guard-client.port=80 +http.client.services.guard-client.managed=true diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties new file mode 100644 index 000000000..59b0615b0 --- /dev/null +++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties @@ -0,0 +1,29 @@ +# +# ============LICENSE_START====================================================== +# ONAP +# =============================================================================== +# Copyright (C) 2020 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======================================================== +# + +#actor.service.GUARD.disabled=true +actor.service.GUARD.clientName=guard-client +actor.service.GUARD.operations.Decision.path=decide + +# purposely missing the URL +#operation.history.url=jdbc:h2:mem:EventManagerServicesTest + +operation.history.userName=sa +operation.history.password= diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties new file mode 100644 index 000000000..027f824e8 --- /dev/null +++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties @@ -0,0 +1,25 @@ +# +# ============LICENSE_START====================================================== +# ONAP +# =============================================================================== +# Copyright (C) 2020 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======================================================== +# + +# all GUARD properties are commented out on purpose + +#actor.service.GUARD.disabled=true +#actor.service.GUARD.clientName=guard-client +#actor.service.GUARD.operations.Decision.path=decide diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties new file mode 100644 index 000000000..6e003f6d6 --- /dev/null +++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties @@ -0,0 +1,27 @@ +# +# ============LICENSE_START====================================================== +# ONAP +# =============================================================================== +# Copyright (C) 2020 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======================================================== +# + +#actor.service.GUARD.disabled=true +actor.service.GUARD.clientName=guard-client +actor.service.GUARD.operations.Decision.path=decide + +operation.history.url=jdbc:h2:mem:EventManagerServicesTest +operation.history.userName=sa +operation.history.password= -- cgit 1.2.3-korg