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 --- .../common/feature-controlloop-management/pom.xml | 10 +++ .../main/feature/config/AAI-http-client.properties | 27 ++++++++ .../feature/config/GUARD-http-client.properties | 27 ++++++++ .../feature/config/SDNC-http-client.properties | 27 ++++++++ .../main/feature/config/SO-http-client.properties | 27 ++++++++ .../main/feature/config/VFC-http-client.properties | 27 ++++++++ .../main/feature/config/event-manager.properties | 72 ++++++++++++++++++++++ 7 files changed, 217 insertions(+) create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties (limited to 'controlloop/common/feature-controlloop-management') diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml index 8c6821616..85981f60c 100644 --- a/controlloop/common/feature-controlloop-management/pom.xml +++ b/controlloop/common/feature-controlloop-management/pom.xml @@ -170,6 +170,11 @@ + + org.onap.policy.models.policy-models-interactions.model-actors + actor.aai + ${policy.models.version} + org.onap.policy.models.policy-models-interactions.model-actors actor.appc @@ -196,6 +201,11 @@ + + org.onap.policy.models.policy-models-interactions.model-actors + actor.guard + ${policy.models.version} + org.onap.policy.models.policy-models-interactions.model-actors actor.sdnr diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties new file mode 100644 index 000000000..5a5f82f4d --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.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========================================================= + +http.client.services=AAI + +http.client.services.AAI.managed=true +http.client.services.AAI.https=true +http.client.services.AAI.host=${env:AAI_HOST} +http.client.services.AAI.port=${env:AAI_PORT} +http.client.services.AAI.username=${env:AAI_USERNAME} +http.client.services.AAI.password=${env:AAI_PASSWORD} +http.client.services.AAI.contextUriPath= diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties new file mode 100644 index 000000000..e1d00bd6a --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.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========================================================= + +http.client.services=GUARD + +http.client.services.GUARD.managed=true +http.client.services.GUARD.https=true +http.client.services.GUARD.host=${env:PDP_HOST} +http.client.services.GUARD.port=${env:PDP_PORT} +http.client.services.GUARD.username=${env:PDP_USERNAME} +http.client.services.GUARD.password=${env:PDP_PASSWORD} +http.client.services.GUARD.contextUriPath=policy/pdpx/v1 diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties new file mode 100644 index 000000000..ad11c3fa5 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.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========================================================= + +http.client.services=SDNC + +http.client.services.SDNC.managed=true +http.client.services.SDNC.https=true +http.client.services.SDNC.host=${env:SDNC_HOST} +http.client.services.SDNC.port=${env:SDNC_PORT} +http.client.services.SDNC.username=${env:SDNC_USERNAME} +http.client.services.SDNC.password=${env:SDNC_PASSWORD} +http.client.services.SDNC.contextUriPath= diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties new file mode 100644 index 000000000..45e77ad15 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.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========================================================= + +http.client.services=SO + +http.client.services.SO.managed=true +http.client.services.SO.https=true +http.client.services.SO.host=${env:SO_HOST} +http.client.services.SO.port=${env:SO_PORT} +http.client.services.SO.username=${env:SO_USERNAME} +http.client.services.SO.password=${env:SO_PASSWORD} +http.client.services.SO.contextUriPath= diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties new file mode 100644 index 000000000..28a2a75b1 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.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========================================================= + +http.client.services=VFC + +http.client.services.VFC.managed=true +http.client.services.VFC.https=true +http.client.services.VFC.host=${env:VFC_HOST} +http.client.services.VFC.port=${env:VFC_PORT} +http.client.services.VFC.username=${env:VFC_USERNAME} +http.client.services.VFC.password=${env:VFC_PASSWORD} +http.client.services.VFC.contextUriPath=api/nslcm/v1 diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties new file mode 100644 index 000000000..d957e4051 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties @@ -0,0 +1,72 @@ +# +# ============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======================================================== +# + +# DB parameters +operation.history.url=jdbc:mariadb://${env:SQL_HOST}:3306/operationshistory +operation.history.userName=${env:SQL_USER} +operation.history.password=${env:SQL_PASSWORD} + +# +# Actor parameters +# +# Note: every operation must have at least one entry, otherwise it will not be +# configured and started. Thus some of them have a "placeholder" property. +# + +actor.service.GUARD.disabled=true +actor.service.GUARD.clientName=GUARD +actor.service.GUARD.operations.Decision.path=decision + +actor.service.AAI.clientName=AAI +actor.service.AAI.operations.CustomQuery.path=aai/v16/query +actor.service.AAI.operations.Tenant.path=aai/v16/search/nodes-query + +actor.service.APPC.sinkTopic=APPC-LCM-READ +actor.service.APPC.sourceTopic=APPC-LCM-WRITE +actor.service.APPC.operations.ConfigModify.placeholder= +actor.service.APPC.operations.Migrate.placeholder= +actor.service.APPC.operations.Restart.placeholder= +actor.service.APPC.operations.Rebuild.placeholder= + +# legacy APPC - must specify sink and source for each operation +actor.service.APPC.operations.ModifyConfig.sinkTopic=APPC-CL +actor.service.APPC.operations.ModifyConfig.sourceTopic=APPC-CL + +actor.service.CDS.clientName=CDS +actor.service.CDS.grpcHost=${envd:CDS_GRPC_HOST:} +actor.service.CDS.grpcPort=${envd:CDS_GRPC_PORT:} +actor.service.CDS.grpcUsername=${envd:CDS_GRPC_USERNAME:} +actor.service.CDS.grpcPassword=${envd:CDS_GRPC_PASSWORD:} +actor.service.CDS.grpcTimeout=10 +actor.service.CDS.operations.gRPC.placeholder= + +actor.service.SDNC.clientName=SDNC +actor.service.SDNC.operations.Reroute.path= +actor.service.SDNC.operations.BandwidthOnDemand.path= + +actor.service.SO.clientName=SO +actor.service.SO.pathGet=orchestrationRequests/v5/ +actor.service.SO.maxGets=20 +actor.service.SO.waitSecGet=20 +actor.service.SO.operations.VF\ Module\ Create.path=serviceInstantiation/v7/serviceInstances +actor.service.SO.operations.VF\ Module\ Delete.path=serviceInstances/v7 + +actor.service.VFC.clientName=VFC +actor.service.VFC.operations.Restart.path= -- cgit 1.2.3-korg