diff options
Diffstat (limited to 'controlloop')
4 files changed, 98 insertions, 6 deletions
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties index bd2797b16..1b9592cb3 100644 --- a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties +++ b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties @@ -75,6 +75,9 @@ 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.pathGet=jobs -actor.service.VFC.operations.Restart.path=ns +actor.service.VFC.Restart.clientName=VFC +actor.service.VFC.Restart.pathGet=jobs +actor.service.VFC.Restart.maxGets=20 +actor.service.VFC.Restart.waitSecGet=20 +actor.service.VFC.Restart.path=ns +actor.service.VFC.Restart.timeoutSec=60 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 index ea9569a85..853991714 100644 --- 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 @@ -76,6 +76,9 @@ 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.pathGet=jobs -actor.service.VFC.operations.Restart.path=ns +actor.service.VFC.Restart.clientName=VFC +actor.service.VFC.Restart.pathGet=jobs +actor.service.VFC.Restart.maxGets=20 +actor.service.VFC.Restart.waitSecGet=20 +actor.service.VFC.Restart.path=ns +actor.service.VFC.Restart.timeoutSec=60 diff --git a/controlloop/common/feature-controlloop-utils/src/main/feature/install/disable b/controlloop/common/feature-controlloop-utils/src/main/feature/install/disable new file mode 100644 index 000000000..f5cab0ec8 --- /dev/null +++ b/controlloop/common/feature-controlloop-utils/src/main/feature/install/disable @@ -0,0 +1,29 @@ +#! /bin/bash + +### +# ============LICENSE_START======================================================= +# ONAP POLICY +# ================================================================================ +# 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========================================================= +## + +for actor in AAI GUARD SO SDNC VFC +do + FILE=${POLICY_HOME}/config/${actor}-http-client.properties + if [[ -f ${FILE}.ofc ]]; then + mv $FILE.ofc $FILE + fi +done
\ No newline at end of file diff --git a/controlloop/common/feature-controlloop-utils/src/main/feature/install/enable b/controlloop/common/feature-controlloop-utils/src/main/feature/install/enable new file mode 100644 index 000000000..829ef7d7f --- /dev/null +++ b/controlloop/common/feature-controlloop-utils/src/main/feature/install/enable @@ -0,0 +1,57 @@ +#! /bin/bash + +### +# ============LICENSE_START======================================================= +# ONAP POLICY +# ================================================================================ +# 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========================================================= +## + +for actor in AAI SO SDNC VFC GUARD +do + FILE=${POLICY_HOME}/config/${actor}-http-client.properties + if [[ -f ${FILE} && ${actor} != GUARD ]]; then + case ${actor} in + AAI) + PORT=6666 + ;; + SO) + PORT=6667 + ;; + VFC) + PORT=6668 + ;; + SDNC) + PORT=6670 + ;; + esac + sed -i.ofc \ + -e "s/^http.client.services.${actor}.host[\s\t]*=.*/http.client.services.${actor}.host=localhost/g" \ + -e "s/^http.client.services.${actor}.userName[\s\t]*=.*/http.client.services.${actor}.userName=policy/g" \ + -e "s/^http.client.services.${actor}.password[\s\t]*=.*/http.client.services.${actor}.password=policy/g" \ + -e "s/^http.client.services.${actor}.port[\s\t]*=.*/http.client.services.${actor}.port=${PORT}/g" \ + -e "s/^http.client.services.${actor}.contextUriPath[\s\t]*=.*/http.client.services.${actor}.contextUriPath=/g" \ + ${FILE} + else + sed -i.ofc \ + -e "s/^http.client.services.${actor}.host[\s\t]*=.*/http.client.services.${actor}.host=localhost/g" \ + -e "s/^http.client.services.${actor}.port[\s\t]*=.*/http.client.services.${actor}.port=6669/g" \ + -e "s!^http.client.services.${actor}.contextUriPath[\s\t]*=.*!http.client.services.${actor}.contextUriPath=/pdp/api/getDecision!g" \ + -e "s/^http.client.services.${actor}.userName[\s\t]*=.*/http.client.services.${actor}.userName=/g" \ + -e "s/^http.client.services.${actor}.password[\s\t]*=.*/http.client.services.${actor}.password=/g" \ + ${FILE} + fi +done |