From: adheli.tavares Date: Thu, 12 Jun 2025 07:25:44 +0000 (+0100) Subject: Remove VFC from docker compose and helm configurations X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F141252%2F5;p=policy%2Fdocker.git Remove VFC from docker compose and helm configurations Issue-ID: POLICY-5385 Change-Id: I3c16ac2b0acd10c2c1740847f496e88ca5c734c5 Signed-off-by: adheli.tavares --- diff --git a/compose/compose.common.yml b/compose/compose.common.yml index c78a7814..84add712 100644 --- a/compose/compose.common.yml +++ b/compose/compose.common.yml @@ -1,6 +1,6 @@ # # ===========LICENSE_START==================================================== -# Copyright (C) 2024-2025 Nordix Foundation. +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. 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. @@ -30,7 +30,6 @@ services: - grpc-sim - sdnc-sim - so-sim - - vfc-sim volumes: - ./config/sim-all:/opt/app/policy/simulators/etc/mounted:ro - ./config/sim-all/logback.xml:/opt/app/policy/simulators/etc/mounted/logback.xml:ro @@ -38,7 +37,6 @@ services: - 6666 - 6668 - 6669 - - 6670 - 6680 ports: - ${SIMULATOR_PORT}:6666 @@ -103,7 +101,7 @@ services: ZOOKEEPER_CLIENT_PORT: 2181 kafka: - image: nexus3.onap.org:10001/confluentinc/cp-kafka:latest + image: nexus3.onap.org:10001/confluentinc/cp-kafka:7.4.9 container_name: kafka hostname: kafka depends_on: diff --git a/compose/compose.yaml b/compose/compose.yaml index 8ed55b92..6612da93 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -2,7 +2,7 @@ # ===========LICENSE_START==================================================== # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2021 Bell Canada. All rights reserved. -# Modifications Copyright 2021-2025 Nordix Foundation. +# Modifications Copyright 2021-2025 OpenInfra Foundation Europe. All rights reserved. # Modifications Copyright 2024-2025 Deutsche Telekom # ============================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -201,8 +201,7 @@ services: 'kafka', '9092', 'aai-sim', '6666', 'sdnc-sim', '6668', - 'so-sim', '6669', - 'vfc-sim', '6670' + 'so-sim', '6669' ] policy-clamp-runtime-acm: diff --git a/compose/config/drools-applications/custom/engine-system.properties b/compose/config/drools-applications/custom/engine-system.properties index 19e03b51..e019bb0c 100644 --- a/compose/config/drools-applications/custom/engine-system.properties +++ b/compose/config/drools-applications/custom/engine-system.properties @@ -3,6 +3,7 @@ # ONAP # ================================================================================ # Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2025 OpenInfra Foundation Europe. 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. @@ -28,14 +29,6 @@ com.sun.management.jmxremote.port=9991 com.sun.management.jmxremote.authenticate=false com.sun.management.jmxremote.ssl=false -# certs - -javax.net.ssl.trustStore=${envd:TRUSTSTORE:/opt/app/policy/etc/ssl/policy-truststore} -javax.net.ssl.trustStorePassword=${envd:TRUSTSTORE_PASSWD:Pol1cy_0nap} - -javax.net.ssl.keyStore=${envd:KEYSTORE:/opt/app/policy/etc/ssl/policy-keystore} -javax.net.ssl.keyStorePassword=${envd:KEYSTORE_PASSWD:Pol1cy_0nap} - # kie kie.maven.offline.force=${envd:REPOSITORY_OFFLINE:false} diff --git a/compose/config/drools-applications/env/base-postgres.conf b/compose/config/drools-applications/env/base-postgres.conf index 2abb5e20..c9196734 100644 --- a/compose/config/drools-applications/env/base-postgres.conf +++ b/compose/config/drools-applications/env/base-postgres.conf @@ -1,5 +1,5 @@ # ============LICENSE_START================================================== -# Copyright (C) 2024 Nordix Foundation. +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. 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. @@ -124,14 +124,6 @@ SO_URL=http://so-sim:6669/ SO_USERNAME=InfraPortalClient SO_PASSWORD='password1$' -# VFC - -VFC_HOST=vfc-sim -VFC_PORT=6670 -VFC_CONTEXT_URI= -VFC_USERNAME= -VFC_PASSWORD= - # SDNC SDNC_HOST=sdnc-sim diff --git a/compose/config/drools-pdp/custom/engine-system.properties b/compose/config/drools-pdp/custom/engine-system.properties index 19e03b51..e019bb0c 100644 --- a/compose/config/drools-pdp/custom/engine-system.properties +++ b/compose/config/drools-pdp/custom/engine-system.properties @@ -3,6 +3,7 @@ # ONAP # ================================================================================ # Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2025 OpenInfra Foundation Europe. 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. @@ -28,14 +29,6 @@ com.sun.management.jmxremote.port=9991 com.sun.management.jmxremote.authenticate=false com.sun.management.jmxremote.ssl=false -# certs - -javax.net.ssl.trustStore=${envd:TRUSTSTORE:/opt/app/policy/etc/ssl/policy-truststore} -javax.net.ssl.trustStorePassword=${envd:TRUSTSTORE_PASSWD:Pol1cy_0nap} - -javax.net.ssl.keyStore=${envd:KEYSTORE:/opt/app/policy/etc/ssl/policy-keystore} -javax.net.ssl.keyStorePassword=${envd:KEYSTORE_PASSWD:Pol1cy_0nap} - # kie kie.maven.offline.force=${envd:REPOSITORY_OFFLINE:false} diff --git a/compose/config/drools-pdp/env/base-postgres.conf b/compose/config/drools-pdp/env/base-postgres.conf index 64a1d57d..5a83a475 100644 --- a/compose/config/drools-pdp/env/base-postgres.conf +++ b/compose/config/drools-pdp/env/base-postgres.conf @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2021 Bell Canada. All rights reserved. -# Modification Copyright 2024 Nordix Foundation. +# Modification Copyright 2024-2025 OpenInfra Foundation Europe. 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. @@ -121,14 +121,6 @@ SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra SO_USERNAME=InfraPortalClient SO_PASSWORD='password1$' -# VFC - -VFC_HOST= -VFC_PORT= -VFC_CONTEXT_URI=api/nslcm/v1/ -VFC_USERNAME= -VFC_PASSWORD= - # SDNC SDNC_HOST= diff --git a/compose/config/sim-all/simParameters.json b/compose/config/sim-all/simParameters.json index b54db25c..257814f6 100644 --- a/compose/config/sim-all/simParameters.json +++ b/compose/config/sim-all/simParameters.json @@ -25,13 +25,6 @@ "https": false, "userName": "InfraPortalClient", "password": "password1$" - }, - { - "name": "VFC simulator", - "providerClass": "org.onap.policy.simulators.VfcSimulatorJaxRs", - "host": "0.0.0.0", - "port": 6670, - "https": false } ], diff --git a/compose/stop-compose.sh b/compose/stop-compose.sh index 5811a3e1..ede5ef6d 100755 --- a/compose/stop-compose.sh +++ b/compose/stop-compose.sh @@ -1,7 +1,7 @@ #!/bin/bash # # ============LICENSE_START==================================================== -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. 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. @@ -60,8 +60,6 @@ source get-versions.sh > /dev/null 2>&1 echo "Collecting logs from docker compose containers..." rm -rf *.log -#COMPOSE_FILES="-f compose.${database}.yml -f compose.pdp.scale.yml -f compose.acm.scale.yml" - # this will collect logs by service instead of mixing all together containers=$(docker compose ps --all --format '{{.Service}}') @@ -70,6 +68,7 @@ for item in "${item_list[@]}" do if [ -n "$item" ]; then docker compose logs $item >> $item.log + cat $item.log fi done diff --git a/helm/policy/components/policy-models-simulator/resources/config/simParameters.json b/helm/policy/components/policy-models-simulator/resources/config/simParameters.json index 1f4b274f..1c767c7c 100644 --- a/helm/policy/components/policy-models-simulator/resources/config/simParameters.json +++ b/helm/policy/components/policy-models-simulator/resources/config/simParameters.json @@ -26,13 +26,6 @@ "https": false, "userName": "InfraPortalClient", "password": "password1$" - }, - { - "name": "VFC simulator", - "providerClass": "org.onap.policy.simulators.VfcSimulatorJaxRs", - "host": "0.0.0.0", - "port": 6670, - "https": false } ], diff --git a/helm/policy/components/policy-models-simulator/values.yaml b/helm/policy/components/policy-models-simulator/values.yaml index e35fe579..859e9728 100644 --- a/helm/policy/components/policy-models-simulator/values.yaml +++ b/helm/policy/components/policy-models-simulator/values.yaml @@ -61,10 +61,6 @@ service: name: so-sim externalPort: 6669 internalPort: 6669 - vfc: - name: vfc-sim - externalPort: 6670 - internalPort: 6670 grpc: name: grpc-sim externalPort: 6680