From 1f6f373a5d59ca3bc89c452ca572ce940b3f5763 Mon Sep 17 00:00:00 2001 From: "bhoopender.singh@t-systems.com" Date: Tue, 10 Dec 2024 09:52:09 +0100 Subject: [PATCH] chef removal changes for catalog-be - Removed chef from catalog-be module with kubernetes resources. Issue-ID: SDC-4697 Change-Id: Ife1b8ad8c0a978d574787e395daf978364a0fc41 Signed-off-by: bhoopender.singh@t-systems.com --- asdctool/pom.xml | 2 +- catalog-be-plugins/backend-all-plugins/pom.xml | 2 +- .../src/main/docker/backend-all-plugins/Dockerfile | 3 +- .../etsi-nfv-nsd-csar-plugin/pom.xml | 2 +- catalog-be-plugins/pom.xml | 2 +- catalog-be/pom.xml | 6 +- catalog-be/sdc-backend-init/Dockerfile | 26 +- .../sdc-catalog-be-setup/attributes/default.rb | 5 - .../recipes/1_create_consumer_and_user.rb | 48 ---- .../recipes/2_check_Backend.rb | 37 --- .../recipes/3_import_Normatives.rb | 43 ---- catalog-be/sdc-backend-init/chef-solo/LICENSE | 201 ---------------- catalog-be/sdc-backend-init/chef-solo/README.md | 37 --- catalog-be/sdc-backend-init/chef-solo/chefignore | 11 - .../sdc-backend-init/chef-solo/cookbooks/README.md | 54 ----- .../sdc-backend-init/chef-solo/data_bags/README.md | 63 ----- .../chef-solo/environments/README.md | 5 - .../chef-solo/importNormatives.json | 4 - .../sdc-backend-init/chef-solo/importNormatives.rb | 16 -- .../sdc-backend-init/chef-solo/roles/README.md | 16 -- .../chef-solo/roles/catalog-be-setup.json | 21 -- catalog-be/sdc-backend-init/chef-solo/solo.json | 4 - catalog-be/sdc-backend-init/chef-solo/solo.rb | 16 -- .../chef-solo/upgradeNormatives.json | 4 - .../chef-solo/upgradeNormatives.rb | 16 -- .../custom-scripts/check_backend.sh | 48 ++++ .../custom-scripts/create_consumer_and_user.sh | 60 +++++ .../custom-scripts/import_normatives.sh | 65 +++++ catalog-be/sdc-backend-init/startup.sh | 16 +- catalog-be/src/main/docker/backend/Dockerfile | 31 +-- .../cookbooks/sdc-catalog-be/attributes/default.rb | 73 ------ .../files/default/Artifact-Generator.properties | 264 --------------------- .../recipes/BE_1_cleanup_jettydir.rb | 29 --- .../recipes/BE_2_setup_configuration.rb | 81 ------- .../recipes/BE_3_setup_key_and_trust_store.rb | 21 -- .../sdc-catalog-be/recipes/BE_4_jetty_Modules.rb | 59 ----- .../recipes/BE_5_setup_elasticsearch.rb | 21 -- .../BE_6_setup_portal_and_key_properties.rb | 25 -- .../sdc-catalog-be/recipes/BE_7_logback.rb | 8 - .../sdc-catalog-be/recipes/BE_8_errors_config.rb | 16 -- .../recipes/BE_9_prepareProbeFile.rb | 17 -- .../templates/default/BE-janusgraph.properties.erb | 30 --- .../default/BE-onboarding-configuration.yaml.erb | 5 - .../src/main/docker/backend/chef-solo/LICENSE | 201 ---------------- .../src/main/docker/backend/chef-solo/README.md | 37 --- .../src/main/docker/backend/chef-solo/chefignore | 11 - .../docker/backend/chef-solo/cookbooks/README.md | 54 ----- .../docker/backend/chef-solo/data_bags/README.md | 63 ----- .../backend/chef-solo/environments/README.md | 5 - .../main/docker/backend/chef-solo/roles/README.md | 16 -- .../docker/backend/chef-solo/roles/catalog-be.json | 25 -- .../src/main/docker/backend/chef-solo/solo.json | 4 - .../src/main/docker/backend/chef-solo/solo.rb | 16 -- .../files/BE_3_setup_key_and_trust_store.sh | 48 ++++ .../docker/backend/files/create_directories.sh | 31 +++ .../docker/backend/files/create_jetty_modules.sh | 14 ++ .../ecomp-error-configuration.yaml | 0 .../default => files}/error-configuration.yaml | 0 .../files/default => files}/logback.xml | 0 .../rewrite-root-to-swagger-ui.xml} | 0 catalog-be/src/main/docker/backend/startup.sh | 3 - .../import/tosca/categories/categoryTypes.yml | 6 + .../import/tosca/data-types/dataTypes.yml | 241 +++++++++++++++++++ catalog-dao/pom.xml | 2 +- catalog-fe/pom.xml | 2 +- catalog-model/pom.xml | 2 +- catalog-ui/pom.xml | 2 +- common-app-api/pom.xml | 2 +- common-app-logging/pom.xml | 2 +- common-be-tests-utils/pom.xml | 2 +- common-be/pom.xml | 2 +- .../onap-configuration-management-api/pom.xml | 2 +- .../onap-configuration-management-core/pom.xml | 2 +- .../onap-common-configuration-management/pom.xml | 2 +- .../pom.xml | 2 +- .../onap-generic-artifact-browser-service/pom.xml | 2 +- common/onap-generic-artifact-browser/pom.xml | 2 +- common/onap-tosca-datatype/pom.xml | 2 +- common/pom.xml | 2 +- .../catalog-be/configuration.yaml | 96 ++++---- .../distribution-engine-configuration.yaml | 36 +-- .../catalog-be/janusgraph.properties | 30 +++ .../init-script/check_backend.sh | 48 ++++ .../init-script/create_consumer_and_user.sh | 60 +++++ .../init-script/import_normatives.sh | 65 +++++ .../catalog-be-resources/ready-probe.sh | 2 +- .../catalog-be-resources/resource/key.properties | 4 +- .../resource/portal.properties | 10 +- .../catalog-be-resources/start.d/http.ini | 4 +- .../catalog-be-resources/start.d/https.ini | 2 +- .../catalog-be-resources/start.d/ssl.ini | 23 +- integration-tests/pom.xml | 122 +++++++++- onboarding/pom.xml | 2 +- .../action-library-rest-services/pom.xml | 2 +- .../action-library-rest-types/pom.xml | 2 +- .../action-library-rest/pom.xml | 2 +- .../application-config-rest-services/pom.xml | 2 +- .../application-config-rest-types/pom.xml | 2 +- .../application-config-rest/pom.xml | 2 +- .../conflict-rest/conflict-rest-services/pom.xml | 2 +- .../conflict-rest/conflict-rest-types/pom.xml | 2 +- .../conflict-rest/pom.xml | 2 +- .../externaltesting-rest-services/pom.xml | 2 +- .../externaltesting-rest/pom.xml | 2 +- .../healthcheck-rest-services/pom.xml | 2 +- .../healthcheck-rest-types/pom.xml | 2 +- .../healthcheck-rest/pom.xml | 2 +- .../item-permissions-rest-services/pom.xml | 2 +- .../item-permissions-rest-types/pom.xml | 2 +- .../item-permissions-rest/pom.xml | 2 +- .../item-rest/item-rest-services/pom.xml | 2 +- .../item-rest/item-rest-types/pom.xml | 2 +- .../openecomp-sdc-rest-webapp/item-rest/pom.xml | 2 +- .../openecomp-sdc-rest-webapp/metrics-rest/pom.xml | 2 +- .../notifications-fe/pom.xml | 2 +- .../notifications-rest-services/pom.xml | 2 +- .../notifications-rest-types/pom.xml | 2 +- .../notifications-rest/pom.xml | 2 +- .../onboarding-rest-war/pom.xml | 2 +- .../openecomp-sdc-common-rest/pom.xml | 2 +- openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml | 2 +- .../openecomp-sdc-rest-webapp/togglz-rest/pom.xml | 2 +- .../togglz-rest/togglz-rest-services/pom.xml | 2 +- .../togglz-rest/togglz-rest-types/pom.xml | 2 +- .../unique-type-rest/pom.xml | 2 +- .../unique-type-rest-services/pom.xml | 2 +- .../unique-type-rest-types/pom.xml | 2 +- .../validation-rest/pom.xml | 2 +- .../validation-rest-services/pom.xml | 2 +- .../validation-rest/validation-rest-types/pom.xml | 2 +- .../vendor-license-rest/pom.xml | 2 +- .../vendor-license-rest-services/pom.xml | 2 +- .../vendor-license-rest-types/pom.xml | 2 +- .../vendor-software-products-rest/pom.xml | 2 +- .../vendor-software-products-rest-services/pom.xml | 2 +- .../vendor-software-products-rest-types/pom.xml | 2 +- .../vnf-repository-rest-services/pom.xml | 2 +- openecomp-be/api/pom.xml | 2 +- .../backend/openecomp-sdc-action-manager/pom.xml | 2 +- .../openecomp-sdc-activity-log-manager/pom.xml | 2 +- .../pom.xml | 2 +- .../backend/openecomp-sdc-conflict-manager/pom.xml | 2 +- .../openecomp-sdc-healthcheck-manager/pom.xml | 2 +- .../openecomp-sdc-item-permissions-manager/pom.xml | 2 +- .../backend/openecomp-sdc-security-util/pom.xml | 2 +- .../openecomp-sdc-validation-manager/pom.xml | 2 +- .../openecomp-sdc-vendor-license-manager/pom.xml | 2 +- .../pom.xml | 2 +- openecomp-be/backend/pom.xml | 2 +- openecomp-be/dist/pom.xml | 2 +- .../dist/sdc-onboard-backend-docker/pom.xml | 2 +- .../dist/sdc-onboard-db-init-docker/pom.xml | 2 +- openecomp-be/lib/openecomp-common-lib/pom.xml | 2 +- .../openecomp-conflict-api/pom.xml | 2 +- .../openecomp-conflict-core/pom.xml | 2 +- openecomp-be/lib/openecomp-conflict-lib/pom.xml | 2 +- .../openecomp-config-lib/pom.xml | 2 +- .../openecomp-facade-api/pom.xml | 2 +- .../openecomp-facade-core/pom.xml | 2 +- .../openecomp-facade-lib/pom.xml | 2 +- .../openecomp-nosqldb-api/pom.xml | 2 +- .../openecomp-nosqldb-core/pom.xml | 2 +- .../openecomp-nosqldb-lib/pom.xml | 2 +- .../openecomp-session-lib/pom.xml | 2 +- .../openecomp-utilities-lib/pom.xml | 2 +- .../openecomp-zusammen-api/pom.xml | 2 +- .../openecomp-zusammen-core/pom.xml | 2 +- .../openecomp-zusammen-lib/pom.xml | 2 +- openecomp-be/lib/openecomp-core-lib/pom.xml | 2 +- .../openecomp-sdc-healing-api/pom.xml | 2 +- .../openecomp-sdc-healing-core/pom.xml | 2 +- .../openecomp-sdc-healing-impl/pom.xml | 2 +- openecomp-be/lib/openecomp-healing-lib/pom.xml | 2 +- openecomp-be/lib/openecomp-heat-lib/pom.xml | 2 +- .../openecomp-item-permissions-api/pom.xml | 2 +- .../openecomp-item-permissions-core/pom.xml | 2 +- .../openecomp-item-permissions-impl/pom.xml | 2 +- .../lib/openecomp-item-permissions-lib/pom.xml | 2 +- .../openecomp-sdc-action-api/pom.xml | 2 +- .../openecomp-sdc-action-core/pom.xml | 2 +- openecomp-be/lib/openecomp-sdc-action-lib/pom.xml | 2 +- .../openecomp-sdc-activity-log-api/pom.xml | 2 +- .../openecomp-sdc-activity-log-core/pom.xml | 2 +- .../lib/openecomp-sdc-activity-log-lib/pom.xml | 2 +- .../lib/openecomp-sdc-datatypes-lib/pom.xml | 2 +- .../openecomp-sdc-enrichment-api/pom.xml | 2 +- .../openecomp-sdc-enrichment-core/pom.xml | 2 +- .../openecomp-sdc-enrichment-impl/pom.xml | 2 +- .../lib/openecomp-sdc-enrichment-lib/pom.xml | 2 +- .../openecomp-sdc-externaltesting-api/pom.xml | 2 +- .../openecomp-sdc-externaltesting-impl/pom.xml | 2 +- .../lib/openecomp-sdc-externaltesting-lib/pom.xml | 2 +- .../openecomp-sdc-logging-api/pom.xml | 2 +- .../openecomp-sdc-logging-core/pom.xml | 2 +- .../openecomp-sdc-logging-spring/pom.xml | 2 +- openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml | 2 +- .../openecomp-sdc-model-api/pom.xml | 2 +- .../openecomp-sdc-model-impl/pom.xml | 2 +- openecomp-be/lib/openecomp-sdc-model-lib/pom.xml | 2 +- .../openecomp-sdc-notification-api/pom.xml | 2 +- .../openecomp-sdc-notification-core/pom.xml | 2 +- .../openecomp-sdc-notification-websocket/pom.xml | 2 +- .../openecomp-sdc-notification-worker/pom.xml | 2 +- .../lib/openecomp-sdc-notification-lib/pom.xml | 2 +- .../openecomp-sdc-tosca-generator-api/pom.xml | 2 +- .../openecomp-sdc-tosca-generator-core/pom.xml | 2 +- .../lib/openecomp-sdc-tosca-generator-lib/pom.xml | 2 +- .../openecomp-sdc-translator-api/pom.xml | 2 +- .../openecomp-sdc-translator-core/pom.xml | 2 +- .../lib/openecomp-sdc-translator-lib/pom.xml | 2 +- .../openecomp-sdc-validation-api/pom.xml | 2 +- .../openecomp-sdc-validation-core/pom.xml | 2 +- .../openecomp-sdc-validation-impl/pom.xml | 2 +- .../openecomp-sdc-validation-sdk/pom.xml | 2 +- .../lib/openecomp-sdc-validation-lib/pom.xml | 2 +- .../openecomp-sdc-vendor-license-api/pom.xml | 2 +- .../openecomp-sdc-vendor-license-core/pom.xml | 2 +- .../lib/openecomp-sdc-vendor-license-lib/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../openecomp-sdc-versioning-api/pom.xml | 2 +- .../openecomp-sdc-versioning-core/pom.xml | 2 +- .../lib/openecomp-sdc-versioning-lib/pom.xml | 2 +- .../openecomp-tosca-converter-api/pom.xml | 2 +- .../openecomp-tosca-converter-core/pom.xml | 2 +- .../lib/openecomp-tosca-converter-lib/pom.xml | 2 +- openecomp-be/lib/openecomp-tosca-lib/pom.xml | 2 +- openecomp-be/lib/pom.xml | 2 +- openecomp-be/pom.xml | 2 +- openecomp-be/tools/swagger-ui/pom.xml | 2 +- openecomp-be/tools/zusammen-tools/pom.xml | 2 +- openecomp-ui/pom.xml | 2 +- pom.xml | 2 +- sdc-os-chef/pom.xml | 2 +- utils/webseal-simulator/pom.xml | 2 +- 236 files changed, 1103 insertions(+), 2007 deletions(-) delete mode 100644 catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb delete mode 100644 catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb delete mode 100644 catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb delete mode 100644 catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb delete mode 100644 catalog-be/sdc-backend-init/chef-solo/LICENSE delete mode 100644 catalog-be/sdc-backend-init/chef-solo/README.md delete mode 100644 catalog-be/sdc-backend-init/chef-solo/chefignore delete mode 100644 catalog-be/sdc-backend-init/chef-solo/cookbooks/README.md delete mode 100644 catalog-be/sdc-backend-init/chef-solo/data_bags/README.md delete mode 100644 catalog-be/sdc-backend-init/chef-solo/environments/README.md delete mode 100644 catalog-be/sdc-backend-init/chef-solo/importNormatives.json delete mode 100644 catalog-be/sdc-backend-init/chef-solo/importNormatives.rb delete mode 100644 catalog-be/sdc-backend-init/chef-solo/roles/README.md delete mode 100644 catalog-be/sdc-backend-init/chef-solo/roles/catalog-be-setup.json delete mode 100644 catalog-be/sdc-backend-init/chef-solo/solo.json delete mode 100644 catalog-be/sdc-backend-init/chef-solo/solo.rb delete mode 100644 catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.json delete mode 100644 catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.rb create mode 100644 catalog-be/sdc-backend-init/custom-scripts/check_backend.sh create mode 100644 catalog-be/sdc-backend-init/custom-scripts/create_consumer_and_user.sh create mode 100644 catalog-be/sdc-backend-init/custom-scripts/import_normatives.sh delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_setup_key_and_trust_store.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_5_setup_elasticsearch.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb delete mode 100644 catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/LICENSE delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/README.md delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/chefignore delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/cookbooks/README.md delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/data_bags/README.md delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/environments/README.md delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/roles/README.md delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/roles/catalog-be.json delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/solo.json delete mode 100644 catalog-be/src/main/docker/backend/chef-solo/solo.rb create mode 100644 catalog-be/src/main/docker/backend/files/BE_3_setup_key_and_trust_store.sh create mode 100644 catalog-be/src/main/docker/backend/files/create_directories.sh create mode 100644 catalog-be/src/main/docker/backend/files/create_jetty_modules.sh rename catalog-be/src/main/docker/backend/{chef-repo/cookbooks/sdc-catalog-be/files/default => files}/ecomp-error-configuration.yaml (100%) rename catalog-be/src/main/docker/backend/{chef-repo/cookbooks/sdc-catalog-be/files/default => files}/error-configuration.yaml (100%) rename catalog-be/src/main/docker/backend/{chef-repo/cookbooks/sdc-catalog-be/files/default => files}/logback.xml (100%) rename catalog-be/src/main/docker/backend/{chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-jetty-rewrite.yaml.erb => files/rewrite-root-to-swagger-ui.xml} (100%) rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb => integration-tests/catalog-be-resources/catalog-be/configuration.yaml (91%) rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb => integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml (66%) create mode 100644 integration-tests/catalog-be-resources/catalog-be/janusgraph.properties create mode 100644 integration-tests/catalog-be-resources/init-script/check_backend.sh create mode 100644 integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh create mode 100644 integration-tests/catalog-be-resources/init-script/import_normatives.sh rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb => integration-tests/catalog-be-resources/ready-probe.sh (72%) rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb => integration-tests/catalog-be-resources/resource/key.properties (97%) rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb => integration-tests/catalog-be-resources/resource/portal.properties (90%) rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/http-ini.erb => integration-tests/catalog-be-resources/start.d/http.ini (93%) rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/https-ini.erb => integration-tests/catalog-be-resources/start.d/https.ini (95%) rename catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb => integration-tests/catalog-be-resources/start.d/ssl.ini (72%) diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 499b0ee6cb..f3a0440941 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/catalog-be-plugins/backend-all-plugins/pom.xml b/catalog-be-plugins/backend-all-plugins/pom.xml index ba5712e4b5..eea42a23dc 100644 --- a/catalog-be-plugins/backend-all-plugins/pom.xml +++ b/catalog-be-plugins/backend-all-plugins/pom.xml @@ -25,7 +25,7 @@ limitations under the License. catalog-be-plugins org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT pom diff --git a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile index 159fde430e..b4d4297a89 100644 --- a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile +++ b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile @@ -1,3 +1,4 @@ FROM ${docker.namespace}/sdc-backend:latest -COPY --chown=${JETTY_USER}:${JETTY_USER} onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/ \ No newline at end of file +ARG JETTY_USER=onap +COPY --chown=${JETTY_USER}:${JETTY_USER} onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/ diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml index d6ead306fe..c2105b2b5e 100644 --- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml +++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/pom.xml @@ -24,7 +24,7 @@ catalog-be-plugins org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT 4.0.0 diff --git a/catalog-be-plugins/pom.xml b/catalog-be-plugins/pom.xml index 6f1d67ea08..256ffbf85f 100644 --- a/catalog-be-plugins/pom.xml +++ b/catalog-be-plugins/pom.xml @@ -24,7 +24,7 @@ sdc-main org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT 4.0.0 catalog-be-plugins diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index f10807b981..a9946babf4 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT @@ -1232,7 +1232,7 @@ - sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default + sdc-backend-init false @@ -1386,7 +1386,7 @@ - sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default + sdc-backend-init diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile index 9681734268..8f3f37da73 100644 --- a/catalog-be/sdc-backend-init/Dockerfile +++ b/catalog-be/sdc-backend-init/Dockerfile @@ -9,11 +9,9 @@ ENV PYCURL_SSL_LIBRARY=openssl RUN apk update && \ apk add binutils jq libpng && \ apk add --no-cache \ - libcurl \ - ruby && \ + libcurl && \ apk add --no-cache --virtual .build-dependencies \ libressl-dev \ - ruby-dev \ libffi-dev \ libxml2-dev \ build-base \ @@ -21,15 +19,7 @@ RUN apk update && \ # needed libcurl to install correctly \ python -m pip install --upgrade pip && \ pip install 'pycurl==7.44.1' && \ - set -ex && \ - gem install --no-update-sources \ - rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \ - berkshelf:6.3.1 \ - io-console:0.4.6 \ - webrick \ - --no-document && \ - apk del .build-dependencies && \ - gem cleanup + apk del .build-dependencies ENV ONAP_LOG=/home/onap/logs RUN mkdir $ONAP_LOG && chown onap:onap $ONAP_LOG @@ -48,12 +38,18 @@ RUN chmod 770 -R /home/onap/scripts && \ ENV PATH=$PATH:/home/onap/.local/bin -COPY --chown=onap:onap chef-solo /home/onap/chef-solo/ -COPY --chown=onap:onap chef-repo/cookbooks /home/onap/chef-solo/cookbooks/ +COPY --chown=onap:onap normatives.tar.gz /home/onap/ +COPY --chown=onap:onap custom-scripts/create_consumer_and_user.sh /home/onap/create_consumer_and_user.sh +RUN chmod +x /home/onap/create_consumer_and_user.sh; +COPY --chown=onap:onap custom-scripts/check_backend.sh /home/onap/check_backend.sh +RUN chmod +x /home/onap/check_backend.sh +COPY --chown=onap:onap custom-scripts/import_normatives.sh /home/onap/import_normatives.sh +RUN chmod +x /home/onap/import_normatives.sh + COPY --chown=onap:onap startup.sh /home/onap/ RUN chmod 770 /home/onap/startup.sh WORKDIR /home/onap/ -ENTRYPOINT /home/${user}/startup.sh +ENTRYPOINT [ "/home/onap/startup.sh" ] diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb deleted file mode 100644 index 682885312e..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb +++ /dev/null @@ -1,5 +0,0 @@ -#BasicAuth -default['basic_auth']['enabled'] = true -default['basic_auth'][:user_name] = "testName" -default['basic_auth'][:user_pass] = "testPass" - diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb deleted file mode 100644 index 5de3453bf0..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb +++ /dev/null @@ -1,48 +0,0 @@ -require 'base64' -if node['disableHttp'] - protocol = "https" - https_flag = "--https" - be_port = node['BE']['https_port'] - if node['BE-init']['tls_cert'] && node['BE-init']['tls_key'] - tls_key = "--tls_key " + node['BE-init']['tls_key'] - tls_cert = "--tls_cert " + node['BE-init']['tls_cert'] - if node['BE-init']['tls_password'] - tls_key_pw = "--tls_key_pw " + node['BE-init']['tls_password'] - end - end - if node['BE-init']['ca_cert'] - ca_cert = "--ca_cert " + node['BE-init']['ca_cert'] - end -else - protocol = "http" - https_flag = "" - be_port = node['BE']['http_port'] -end - -if node['BE']['user_conf'] - user_conf_dir = "--conf " + node['BE']['user_conf'] -else - # set default user configuration file - user_conf_dir = "" -end - -if node['basic_auth'] - basic_auth_enabled = node['basic_auth']['enabled'] - basic_auth_user = node['basic_auth']['user_name'] - basic_auth_pass = node['basic_auth']['user_pass'] - if basic_auth_enabled - basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass) - else - # set default user configuration file - basic_auth_config = "" - end -end - -execute "executing-create_users" do - command "sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{user_conf_dir} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" - action :run -end -execute "executing-create_consumers" do - command "sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" - action :run -end diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb deleted file mode 100644 index 72686111f5..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'base64' -if node['disableHttp'] - protocol = "https" - https_flag = "--https" - be_port = node['BE']['https_port'] - if node['BE-init']['tls_cert'] && node['BE-init']['tls_key'] - tls_key = "--tls_key " + node['BE-init']['tls_key'] - tls_cert = "--tls_cert " + node['BE-init']['tls_cert'] - if node['BE-init']['tls_password'] - tls_key_pw = "--tls_key_pw " + node['BE-init']['tls_password'] - end - end - if node['BE-init']['ca_cert'] - ca_cert = "--ca_cert " + node['BE-init']['ca_cert'] - end -else - protocol = "http" - https_flag = "" - be_port = node['BE']['http_port'] -end - -if node['basic_auth'] - basic_auth_enabled = node['basic_auth']['enabled'] - basic_auth_user = node['basic_auth']['user_name'] - basic_auth_pass = node['basic_auth']['user_pass'] - if basic_auth_enabled - basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass) - else - # set default user configuration file - basic_auth_config = "" - end -end - -execute "executing-check_backend_health" do - command "sdccheckbackend -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" - action :run -end diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb deleted file mode 100644 index cb36ffdc3d..0000000000 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb +++ /dev/null @@ -1,43 +0,0 @@ -require 'base64' -be_ip=node['Nodes'][:BE] - -if node['disableHttp'] - protocol = "https" - be_port = node['BE']['https_port'] - param="-i #{be_ip} -p #{be_port} --https" - if node['BE-init']['tls_cert'] && node['BE-init']['tls_key'] - tls_key = "--tls_key " + node['BE-init']['tls_key'] - tls_cert = "--tls_cert " + node['BE-init']['tls_cert'] - if node['BE-init']['tls_password'] - tls_key_pw = "--tls_key_pw " + node['BE-init']['tls_password'] - end - end - if node['BE-init']['ca_cert'] - ca_cert = "--ca_cert " + node['BE-init']['ca_cert'] - end -else - protocol = "http" - be_port = node['BE']['http_port'] - param="-i #{be_ip} -p #{be_port}" -end - -if node['basic_auth'] - basic_auth_enabled = node['basic_auth']['enabled'] - basic_auth_user = node['basic_auth']['user_name'] - basic_auth_pass = node['basic_auth']['user_pass'] - if basic_auth_enabled - basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass) - else - # set default user configuration file - basic_auth_config = "" - end -end -cookbook_file "/var/tmp/normatives.tar.gz" do - source "normatives.tar.gz" -end - -execute "create-jetty-modules" do - command "set -ex && tar -xvf normatives.tar.gz && cd /var/tmp/normatives/import/tosca && sdcinit #{param} #{basic_auth_config} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert} > #{ENV['ONAP_LOG']}/init.log" - cwd "/var/tmp/" - action :run -end diff --git a/catalog-be/sdc-backend-init/chef-solo/LICENSE b/catalog-be/sdc-backend-init/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -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. diff --git a/catalog-be/sdc-backend-init/chef-solo/README.md b/catalog-be/sdc-backend-init/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/catalog-be/sdc-backend-init/chef-solo/chefignore b/catalog-be/sdc-backend-init/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/catalog-be/sdc-backend-init/chef-solo/cookbooks/README.md b/catalog-be/sdc-backend-init/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/catalog-be/sdc-backend-init/chef-solo/data_bags/README.md b/catalog-be/sdc-backend-init/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/catalog-be/sdc-backend-init/chef-solo/environments/README.md b/catalog-be/sdc-backend-init/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/catalog-be/sdc-backend-init/chef-solo/importNormatives.json b/catalog-be/sdc-backend-init/chef-solo/importNormatives.json deleted file mode 100644 index f5c9276e2e..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/importNormatives.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "recipe[sdc-normatives::import_Normatives]" ] -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/importNormatives.rb b/catalog-be/sdc-backend-init/chef-solo/importNormatives.rb deleted file mode 100644 index 2693926c4b..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/importNormatives.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/importNormatives.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/sdc-backend-init/chef-solo/roles/README.md b/catalog-be/sdc-backend-init/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/catalog-be/sdc-backend-init/chef-solo/roles/catalog-be-setup.json b/catalog-be/sdc-backend-init/chef-solo/roles/catalog-be-setup.json deleted file mode 100644 index 8a8e12da9d..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/roles/catalog-be-setup.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "catalog-be", - "description": "Installation application - catalogBE", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[sdc-catalog-be-setup::1_create_consumer_and_user]", - "recipe[sdc-catalog-be-setup::2_check_Backend]", - "recipe[sdc-catalog-be-setup::3_import_Normatives]" - - ], - "env_run_lists": { - } -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/solo.json b/catalog-be/sdc-backend-init/chef-solo/solo.json deleted file mode 100644 index 3ae51db12d..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/solo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "role[catalog-be-setup]" ] -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/solo.rb b/catalog-be/sdc-backend-init/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.json b/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.json deleted file mode 100644 index f05c767f7c..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "recipe[sdc-normatives::upgrade_Normatives]" ] -} - diff --git a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.rb b/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.rb deleted file mode 100644 index 4172431c8b..0000000000 --- a/catalog-be/sdc-backend-init/chef-solo/upgradeNormatives.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/upgradeNormatives.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/sdc-backend-init/custom-scripts/check_backend.sh b/catalog-be/sdc-backend-init/custom-scripts/check_backend.sh new file mode 100644 index 0000000000..cf7d6e4053 --- /dev/null +++ b/catalog-be/sdc-backend-init/custom-scripts/check_backend.sh @@ -0,0 +1,48 @@ +#!/bin/sh + + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +# Initialize optional flags as empty strings +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" +basic_auth_config="" + +# Set TLS configuration flags if using HTTPS +if [ "$protocol" = "https" ]; then + [ -n "$TLS_CERT" ] && tls_cert="--tls_cert $TLS_CERT" + [ -n "$TLS_KEY" ] && tls_key="--tls_key $TLS_KEY" + [ -n "$TLS_KEY_PW" ] && tls_key_pw="--tls_key_pw $TLS_KEY_PW" + [ -n "$CA_CERT" ] && ca_cert="--ca_cert $CA_CERT" +fi + + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdccheckbackend..." + +sdccheckbackend -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdccheckbackend." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/catalog-be/sdc-backend-init/custom-scripts/create_consumer_and_user.sh b/catalog-be/sdc-backend-init/custom-scripts/create_consumer_and_user.sh new file mode 100644 index 0000000000..3b7267c356 --- /dev/null +++ b/catalog-be/sdc-backend-init/custom-scripts/create_consumer_and_user.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +basic_auth_config="" + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + + +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" + +if [ "$protocol" = "https" ]; then + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +fi + +# Execute sdcuserinit command +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcuserinit..." + +sdcuserinit -i $BE_IP -p $be_port $basic_auth_config $user_conf_dir $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert +echo "sdcuserinit executed successfully." + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcconsumerinit..." +sdcconsumerinit -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdcuserinit and sdcconsumerinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/catalog-be/sdc-backend-init/custom-scripts/import_normatives.sh b/catalog-be/sdc-backend-init/custom-scripts/import_normatives.sh new file mode 100644 index 0000000000..e21e1b01b0 --- /dev/null +++ b/catalog-be/sdc-backend-init/custom-scripts/import_normatives.sh @@ -0,0 +1,65 @@ +#!/bin/sh + + +# Set protocol and port based on DISABLE_HTTP +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + be_port=$BE_HTTPS_PORT + param="-i $BE_IP -p $be_port --https" + + # Set TLS flags if certificates are provided + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +else + protocol="http" + be_port="$BE_HTTP_PORT" + param="-i $BE_IP -p $be_port" +fi + +# Set basic authentication if enabled +if [ "$BASIC_AUTH_ENABLED" = "true" ]; then + basic_auth_user="${BASIC_AUTH_USER:-}" + basic_auth_pass="${BASIC_AUTH_PASS:-}" + + if [ -n "$basic_auth_user" ] && [ -n "$basic_auth_pass" ]; then + basic_auth_config="--header $(echo -n "$basic_auth_user:$basic_auth_pass" | base64)" + else + basic_auth_config="" + fi +else + basic_auth_config="" +fi + +# Extract normatives tarball and run the initialization command +echo "Extracting normatives.tar.gz and initializing SDC..." +cd /var/tmp/ || exit 1 +cp /home/onap/normatives.tar.gz /var/tmp/ +tar -xvf /var/tmp/normatives.tar.gz + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcinit..." + +# Run sdcinit command with the constructed parameters +cd /var/tmp/normatives/import/tosca || exit 1 +sdcinit $param $basic_auth_config $tls_cert $tls_key $tls_key_pw $ca_cert > "/home/onap/logs/init.log" 2>&1 + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Done sdcinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" + +echo "SDC initialization Done. Logs can be found at ${ONAP_LOG}/init.log" + diff --git a/catalog-be/sdc-backend-init/startup.sh b/catalog-be/sdc-backend-init/startup.sh index e216341882..e35bab3aad 100644 --- a/catalog-be/sdc-backend-init/startup.sh +++ b/catalog-be/sdc-backend-init/startup.sh @@ -1,4 +1,16 @@ #!/bin/sh -cd /home/"${user}"/chef-solo || exit $? -chef-solo -c solo.rb -E "${ENVNAME}" \ No newline at end of file +set -e + + +log_script() { + script_name=$1 + sh "$script_name" 2>&1 | sed "s|^|[$script_name] |" || \ + echo "$script_name failed. Continuing with other scripts..." >&2 +} + +log_script "/home/onap/create_consumer_and_user.sh" +log_script "/home/onap/check_backend.sh" +log_script "/home/onap/import_normatives.sh" + +echo "Done" diff --git a/catalog-be/src/main/docker/backend/Dockerfile b/catalog-be/src/main/docker/backend/Dockerfile index e1647c0321..4980b892d1 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/Dockerfile @@ -3,24 +3,6 @@ FROM onap/integration-java11:10.0.0 USER root ARG JETTY_FOLDER=/app/jetty -# Install Chef -RUN set -ex && \ - apk update && \ - apk add --no-cache \ - wget \ - build-base \ - ruby \ - ruby-dev \ - libffi-dev \ - libxml2-dev && \ - gem install --no-update-sources \ - rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \ - berkshelf:6.3.1 \ - io-console:0.4.6 \ - webrick \ - --no-document && \ - gem cleanup - ENV JETTY_HOME=$JETTY_FOLDER ENV JETTY_BASE=$JETTY_FOLDER ENV JETTY_USER=onap @@ -37,12 +19,21 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/ RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml -COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/ -COPY --chown=onap:onap chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/ COPY --chown=onap:onap onap-sdc-backend/catalog-be.war $JETTY_FOLDER/webappwar/ COPY --chown=onap:onap context.xml $JETTY_FOLDER/webapps/ +COPY --chown=onap:onap files/rewrite-root-to-swagger-ui.xml $JETTY_FOLDER/etc/rewrite-root-to-swagger-ui.xml + COPY --chown=onap:onap startup.sh $JETTY_FOLDER/ +COPY --chown=onap:onap files/create_directories.sh $JETTY_FOLDER/ +COPY --chown=onap:onap files/create_jetty_modules.sh $JETTY_FOLDER/ +COPY --chown=onap:onap files/logback.xml $JETTY_FOLDER/config/catalog-be/ +COPY --chown=onap:onap files/ecomp-error-configuration.yaml $JETTY_FOLDER/config/catalog-be/ecomp-error-configuration.yaml +COPY --chown=onap:onap files/error-configuration.yaml $JETTY_FOLDER/config/catalog-be/error-configuration.yaml +COPY --chown=onap:onap files/BE_3_setup_key_and_trust_store.sh $JETTY_FOLDER/ +RUN chmod +x /app/jetty/BE_3_setup_key_and_trust_store.sh RUN chmod 770 $JETTY_FOLDER/startup.sh +RUN chmod +x $JETTY_FOLDER/create_directories.sh && $JETTY_FOLDER/create_directories.sh +RUN chmod +x $JETTY_FOLDER/create_jetty_modules.sh && $JETTY_FOLDER/create_jetty_modules.sh ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb deleted file mode 100644 index 787a764262..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ /dev/null @@ -1,73 +0,0 @@ -# -default['BE'][:http_port] = 8080 -default['BE'][:https_port] = 8443 -default['FE'][:http_port] = 8181 -default['FE'][:https_port] = 9443 -default['disableHttp'] = true - - -#+----------------------------------+ -#| | -#| Jetty | -#| | -#+----------------------------------+ - -#BasicAuth -default['basic_auth']['enabled'] = false -default['basic_auth'][:user_name] = "testName" -default['basic_auth'][:user_pass] = "testPass" -default['basic_auth']['excludedUrls'] = "/sdc2/rest/healthCheck" - -#Cassandra -default['cassandra']['cassandra_port'] = 9042 -default['cassandra']['datacenter_name'] = "DC-" -default['cassandra']['cluster_name'] = "SDC-CS-" -default['cassandra']['socket_read_timeout'] = 20000 -default['cassandra']['socket_connect_timeout'] = 20000 -default['cassandra']['janusgraph_connection_timeout'] = 10000 -default['cassandra']['janusgraph_config_file'] = "#{ENV['JETTY_BASE']}/config/catalog-be/janusgraph.properties" -default['cassandra'][:db_cache] = true -default['cassandra'][:read_consistency_level] = "ONE" -default['cassandra'][:write_consistency_level] = "ALL" - - -#Onboard -default['ONBOARDING_BE'][:http_port] = 8081 -default['ONBOARDING_BE'][:https_port] = 8445 - -#UEB -default['UEB']['PublicKey'] = "sSJc5qiBnKy2qrlc" -default['UEB']['SecretKey'] = "4ZRPzNJfEUK0sSNBvccd2m7X" - -default['Pair_EnvName'] = "" - -#+----------------------------------+ -#| | -#| Portal | -#| | -#+----------------------------------+ -default['ECompP']['cipher_key'] = "AGLDdG4D04BKm2IxIWEr8o==" -default['ECompP']['portal_user'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" -default['ECompP']['portal_pass'] = "j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI=" -default['ECompP']['portal_app_name'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" - - -#+----------------------------------+ -#| | -#| DMAAP Consumer | -#| | -#+----------------------------------+ -default['DMAAP']['active'] = false -default['DMAAP']['consumer']['aftEnvironment'] = "AFTUAT" -default['DMAAP']['consumer']['consumerGroup'] = "ccd_onap" -default['DMAAP']['consumer']['consumerId'] = "ccd_onap" -default['DMAAP']['consumer']['dme2preferredRouterFilePath'] = "DME2preferredRouter.txt" -default['DMAAP']['consumer']['environment'] = "TEST" -default['DMAAP']['consumer']['host'] = "dmaap.onap.com" -default['DMAAP']['consumer']['password'] = "password" -default['DMAAP']['consumer']['port'] = 3905 -default['DMAAP']['consumer']['serviceName'] = "dmaap-v1.dev.dmaap.dt.saat.acsi.onap.com/events" -default['DMAAP']['consumer']['topic'] = "com.onap.ccd.CCD-CatalogManagement-v1" -default['DMAAP']['consumer']['username'] = "user" -default['DMAAP']['partitioncount'] = "3" -default['DMAAP']['replicationcount'] = "3" diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties deleted file mode 100644 index 1d7e5fa01a..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/Artifact-Generator.properties +++ /dev/null @@ -1,264 +0,0 @@ -#action widget details -AAI.model-version-id.action=fd7fb09e-d930-41b9-b83f-cfde9df48640 -AAI.model-invariant-id.action=af593b4b-490e-4665-ad74-2f6351c0a7ce -#action-data widget details -AAI.model-invariant-id.action-data=9551346c-7d8b-4daf-9926-b93e96e2344a -AAI.model-version-id.action-data=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd -#allotted-resource widget details -AAI.model-invariant-id.allotted-resource=f6d6a23d-a1a9-48ff-8419-b6530da2d381 -AAI.model-version-id.allotted-resource=7ad0915f-25c0-4a70-b9bc-185a75f87564 -#availability-zone widget details -AAI.model-version-id.availability-zone=6c092fb1-21b2-456b-9e01-67fb4de1896e -AAI.model-invariant-id.availability-zone=61b88c01-d819-41c0-8e21-7fd7ba47148e -#az-and-dvs-switches widget details -AAI.model-version-id.az-and-dvs-switches=b2dea88d-78a0-49bf-95c9-5819df08e966 -AAI.model-invariant-id.az-and-dvs-switches=53dc00d4-e6d9-48ec-b6cc-3d3797e9b896 -#class-of-service widget details -AAI.model-version-id.class-of-service=d2fb27cc-15eb-4c4e-828e-71d41aaecc5b -AAI.model-invariant-id.class-of-service=18094b19-d16d-4822-8acf-e92c6aefa178 -#cloud-region widget details -AAI.model-version-id.cloud-region=2a160989-b202-47dd-874b-4a0f275998f7 -AAI.model-invariant-id.cloud-region=425b2158-e51d-4509-9945-dad4556474a3 -#complex widget details -AAI.model-invariant-id.complex=af91c2f7-35fc-43cf-a13d-443f385b2353 -AAI.model-version-id.complex=3a8ab1ee-9220-4fe8-b89c-9251d160ddc2 -#connector widget details -AAI.model-version-id.connector=22104c9f-29fd-462f-be07-96cd6b46dd33 -AAI.model-invariant-id.connector=4c01c948-7607-4d66-8a6c-99c2c2717936 -#constrained-element-set widget details -AAI.model-invariant-id.constrained-element-set=c0292b4f-ee97-40cc-8c2e-f967c48f5701 -AAI.model-version-id.constrained-element-set=01102126-9c04-4a89-945b-b131e61e95d7 -#ctag-assignment widget details -AAI.model-version-id.ctag-assignment=44e5cb1f-0938-41aa-b766-d4595109fe89 -AAI.model-invariant-id.ctag-assignment=fcb8d46b-b656-4ad6-8fa4-22cef74b443f -#ctag-pool widget details -AAI.model-invariant-id.ctag-pool=46c51d4e-d67e-4a9c-b1f5-49b1e9c6fcaa -AAI.model-version-id.ctag-pool=2056c41f-23b9-4de7-9f50-819adad37d76 -#customer widget details -AAI.model-invariant-id.customer=c1d4305f-cdbd-4bbe-9069-a2f4978fd89e -AAI.model-version-id.customer=d4df5c27-98a1-4812-a8aa-c17f055b7a3f -#cvlan-tag-entry widget details -AAI.model-version-id.cvlan-tag-entry=c3878ffb-8d85-4114-bee6-e4074a9db10b -AAI.model-invariant-id.cvlan-tag-entry=245cf4b0-7cc5-4eea-bbd9-753e939adcab -#dvs-switch widget details -AAI.model-invariant-id.dvs-switch=98fbb471-1f86-428e-bd8a-c8a25de6fa23 -AAI.model-version-id.dvs-switch=4cb44ae8-e3ab-452a-9f95-bcc8a44c55ea -#edge-prop-names widget details -AAI.model-invariant-id.edge-prop-names=7a08cad4-8759-46a5-8245-095d1ba57ac6 -AAI.model-version-id.edge-prop-names=f0442326-8201-4d0e-857c-74b4ddcbfc9f -#element-choice-set widget details -AAI.model-invariant-id.element-choice-set=9a011958-7165-47a3-b872-00951d1f09ae -AAI.model-version-id.element-choice-set=af27fbfd-598d-44da-aeae-0f9d3a5fcd6a -#entitlement widget details -AAI.model-version-id.entitlement=7e27ba2e-b7db-4e13-9fae-d142152ef98a -AAI.model-invariant-id.entitlement=ae75b5a0-d5e1-4f3a-b8fb-37626a753da3 -#flavor widget details -AAI.model-invariant-id.flavor=bace8d1c-a261-4041-9e37-823117415d0f -AAI.model-version-id.flavor=36200fb5-f251-4f5d-a520-7c5ad5c2cd4b -#generic-vnf widget details -AAI.model-version-id.generic-vnf=93a6166f-b3d5-4f06-b4ba-aed48d009ad9 -AAI.model-invariant-id.generic-vnf=acc6edd8-a8d4-4b93-afaa-0994068be14c -#group-assignment widget details -AAI.model-invariant-id.group-assignment=7cc05f25-7ba2-42b7-a237-c5662a1689e1 -AAI.model-version-id.group-assignment=fe578080-ce19-4604-8760-fc264fbb2565 -#image widget details -AAI.model-version-id.image=f6a038c2-820c-42ba-8c2b-375e24e8f932 -AAI.model-invariant-id.image=3f4c7204-739b-4bbb-87a7-8a6856439c90 -#include-node-filter widget details -AAI.model-invariant-id.include-node-filter=2a2d8ad2-af0a-4e1f-9982-0c899e7dc827 -AAI.model-version-id.include-node-filter=f05f804d-7057-4ffe-bdc5-39f2f0c9c9fd -#instance-group widget details -AAI.model-version-id.instance-group=8e6ee9dc-9017-444a-83b3-219edb018128 -AAI.model-invariant-id.instance-group=3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd -#inventory-item widget details -AAI.model-invariant-id.inventory-item=cd57d844-9017-4078-aa19-926935a3d77c -AAI.model-version-id.inventory-item=69957f4a-2155-4b95-8d72-d6dd9b88b27b -#inventory-item-data widget details -AAI.model-version-id.inventory-item-data=0e54bb87-bd6e-4a2b-ad1c-6d935b87ae51 -AAI.model-invariant-id.inventory-item-data=87a383ae-cf03-432e-a9de-04e6a622d0fd -#ipsec-configuration widget details -AAI.model-invariant-id.ipsec-configuration=aca4c310-cb45-42bd-9f88-73e40ba7b962 -AAI.model-version-id.ipsec-configuration=d949fd10-36bf-408a-ac7a-cad5004d2e0d -#key-data widget details -AAI.model-version-id.key-data=c23ea04d-1a3b-453d-bc49-a6c783a5e92b -AAI.model-invariant-id.key-data=f5faa464-c2f2-4cc3-89d2-a90452dc3a07 -#l3-interface-ipv4-address-list widget details -AAI.model-version-id.l3-interface-ipv4-address-list=41e76b6f-1e06-4fd4-82cd-81c50fc4574b -AAI.model-invariant-id.l3-interface-ipv4-address-list=aad85df2-09be-40fa-b867-16415e4e10e2 -#l3-interface-ipv6-address-list widget details -AAI.model-invariant-id.l3-interface-ipv6-address-list=82966045-43ee-4982-8307-7e9610866140 -AAI.model-version-id.l3-interface-ipv6-address-list=d040621d-541a-477b-bb1b-a2b61b14e295 -#l3-network widget details -AAI.model-version-id.l3-network=9111f20f-e680-4001-b83f-19a2fc23bfc1 -AAI.model-invariant-id.l3-network=3d560d81-57d0-438b-a2a1-5334dba0651a -#lag-interface widget details -AAI.model-version-id.lag-interface=ce95f7c3-b61b-4758-ae9e-7e943b1c103d -AAI.model-invariant-id.lag-interface=e0ee9bde-c1fc-4651-a95d-8e0597bf7d70 -#lag-link widget details -AAI.model-version-id.lag-link=d29a087a-af59-4053-a3f8-0f95a92faa75 -AAI.model-invariant-id.lag-link=86ffe6e5-4d0e-4cec-80b5-5c38aa3eff98 -#license widget details -AAI.model-invariant-id.license=b9a9b337-1f86-42d3-b9f9-f987a089507c -AAI.model-version-id.license=6889274b-a1dc-40ab-9090-93677e13e2e6 -#license-key-resource widget details -AAI.model-invariant-id.license-key-resource=9022ebfe-b54f-4911-a6b2-8c3f5ec189b7 -AAI.model-version-id.license-key-resource=24b25f8c-b8bd-4c62-9421-87c12667aac9 -#l-interface widget details -AAI.model-version-id.l-interface=a32613fd-18b9-459e-aab8-fffb3912966a -AAI.model-invariant-id.l-interface=cea0a982-8d55-4093-921e-418fbccf7060 -#logical-link widget details -AAI.model-version-id.logical-link=a1481a38-f8ba-4ae4-bdf1-06c2c6af4c54 -AAI.model-invariant-id.logical-link=fe012535-2c31-4a39-a739-612374c638a0 -#metadatum widget details -AAI.model-invariant-id.metadatum=86dbb63a-265e-4614-993f-6771c30b56a5 -AAI.model-version-id.metadatum=6bae950e-8939-41d3-a6a7-251b03e4c1fc -#model widget details -AAI.model-invariant-id.model=06d1418a-5faa-452d-a94b-a2829df5f67b -AAI.model-version-id.model=1f51c05c-b164-4c27-9c03-5cbb239fd6be -#model-constraint widget details -AAI.model-invariant-id.model-constraint=c28966f3-e758-4483-b37b-a90b05d3dd33 -AAI.model-version-id.model-constraint=ad70dd19-f156-4fb5-a865-97b5563b0d37 -#model-element widget details -AAI.model-invariant-id.model-element=2076e726-3577-477a-a300-7fa65cd4df11 -AAI.model-version-id.model-element=753e813a-ba9e-4a1d-ab34-b2f6dc6eec0c -#multicast-configuration widget details -AAI.model-invariant-id.multicast-configuration=ea78c9e3-514d-4a0a-9162-13837fa54c35 -AAI.model-version-id.multicast-configuration=666a06ee-4b57-46df-bacf-908da8f10c3f -#named-query widget details -AAI.model-version-id.named-query=5c3b7c33-afa3-4be5-8da7-1a5ac6f99896 -AAI.model-invariant-id.named-query=80b712fd-0ad3-4180-a99c-8c995cf1cc32 -#named-query-element widget details -AAI.model-version-id.named-query-element=204c641a-3494-48c8-979a-86856f5fd32a -AAI.model-invariant-id.named-query-element=3c504d40-b847-424c-9d25-4fb7e0a3e994 -#network-policy widget details -AAI.model-invariant-id.network-policy=6aa05779-94d7-4d8b-9bee-59ef2ab0c246 -AAI.model-version-id.network-policy=a0ccd9dc-7062-4940-9bcc-e91dd28af510 -#network-profile widget details -AAI.model-version-id.network-profile=01f45471-4240-498c-a9e1-235dc0b8b4a6 -AAI.model-invariant-id.network-profile=2734b44a-b8a2-40f6-957d-6256589e5d00 -#newvce widget details -AAI.model-version-id.newvce=7c79e11f-a408-4593-aa86-ba948a1236af -AAI.model-invariant-id.newvce=4b05ec9c-c55d-4987-83ff-e08d6ddb694f -#oam-network widget details -AAI.model-invariant-id.oam-network=2851cf01-9c40-4064-87d4-6184a6fcff35 -AAI.model-version-id.oam-network=f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79 -#physical-link widget details -AAI.model-invariant-id.physical-link=c822d81f-822f-4304-9623-1025b53da568 -AAI.model-version-id.physical-link=9c523936-95b4-4d7f-9f53-6bdfe0cf2c05 -#p-interface widget details -AAI.model-invariant-id.p-interface=94043c37-4e73-439c-a790-0fdd697924cd -AAI.model-version-id.p-interface=d2cdb2d0-fc1f-4a57-a89e-591b1c4e3754 -#pnf widget details -AAI.model-version-id.pnf=e9f1fa7d-c839-418a-9601-03dc0d2ad687 -AAI.model-invariant-id.pnf=862b25a1-262a-4961-bdaa-cdc55d69785a -#port-group widget details -AAI.model-version-id.port-group=03e8bb6b-b48a-46ae-b5d4-e5af577e6844 -AAI.model-invariant-id.port-group=8ce940fb-55d7-4230-9e7f-a56cc2741f77 -#property-constraint widget details -AAI.model-version-id.property-constraint=81706bbd-981e-4362-ae20-995cbcb2d995 -AAI.model-invariant-id.property-constraint=f4a863c3-6886-470a-a6ae-05723837ea45 -#pserver widget details -AAI.model-invariant-id.pserver=6d932c8f-463b-4e76-83fb-87acfbaa2e2d -AAI.model-version-id.pserver=72f0d495-bc27-4653-9e1a-eef76bd34bc9 -#related-lookup widget details -AAI.model-invariant-id.related-lookup=468f6f5b-2996-41bb-b2a3-7cf9613ebb9b -AAI.model-version-id.related-lookup=0988bab5-bf4f-4938-a419-ab249867d12a -#reserved-prop-names widget details -AAI.model-invariant-id.reserved-prop-names=0c3e0ba3-618c-498d-9127-c8d42b00170f -AAI.model-version-id.reserved-prop-names=ac49d26d-9163-430e-934a-13b738a04f5c -#result-data widget details -AAI.model-version-id.result-data=4e9b50aa-5227-4f6f-b489-62e6bbc03c79 -AAI.model-invariant-id.result-data=ff656f23-6185-406f-9006-4b26834f3e1c -#route-table-reference widget details -AAI.model-version-id.route-table-reference=fed7e326-03a7-45ff-a3f2-471470d268c4 -AAI.model-invariant-id.route-table-reference=a8614b63-2636-4c4f-98df-fd448c4241db -#routing-instance widget details -AAI.model-invariant-id.routing-instance=1c2ded4f-8b01-4193-829c-966847dfec3e -AAI.model-version-id.routing-instance=3ccbcbc7-d19e-44d5-a52f-7e18aa8d69fa -#secondary-filter widget details -AAI.model-version-id.secondary-filter=1380619d-dd1a-4cec-b755-c6407833e065 -AAI.model-invariant-id.secondary-filter=738ff299-6290-4c00-8998-bd0e96a07b93 -#segmentation-assignment widget details -AAI.model-invariant-id.segmentation-assignment=6e814aee-46e1-4583-a9d4-0049bfd2b59b -AAI.model-version-id.segmentation-assignment=c5171ae0-44fb-4c04-b482-d56702241a44 -#service widget details -AAI.model-version-id.service=ecce2c42-3957-4ae0-9442-54bc6afe27b6 -AAI.model-invariant-id.service=07a3a60b-1b6c-4367-8173-8014386f89e3 -#service-capability widget details -AAI.model-invariant-id.service-capability=b1a7cc05-d19d-443b-a5d1-733e325c4232 -AAI.model-version-id.service-capability=f9cfec1b-18da-4bba-bd83-4b26cca115cd -#service-instance widget details -AAI.model-invariant-id.service-instance=82194af1-3c2c-485a-8f44-420e22a9eaa4 -AAI.model-version-id.service-instance=46b92144-923a-4d20-b85a-3cbd847668a9 -#service-subscription widget details -AAI.model-invariant-id.service-subscription=2e1a602a-acd8-4f78-94ff-618b802a303b -AAI.model-version-id.service-subscription=5e68299a-79f2-4bfb-8fbc-2bae877a2459 -#site-pair widget details -AAI.model-version-id.site-pair=7106bc02-6552-4fc3-8a56-4f3df9034531 -AAI.model-invariant-id.site-pair=db63f3e6-f8d1-484e-8d5e-191600b7914b -#site-pair-set widget details -AAI.model-invariant-id.site-pair-set=5d4dae3e-b402-4bfd-909e-ece12ff75d26 -AAI.model-version-id.site-pair-set=a5c6c1bc-dc38-468e-9459-bb08f87247df -#snapshot widget details -AAI.model-version-id.snapshot=962a7c8b-687f-4d32-a775-fe098e214bcd -AAI.model-invariant-id.snapshot=24de00ef-aead-4b52-995b-0adf8d4bd90d -#sriov-vf widget details -AAI.model-version-id.sriov-vf=1e8b331f-3d4a-4160-b7aa-f4d5a8916625 -AAI.model-invariant-id.sriov-vf=04b2935f-33c4-40a9-8af0-8b52690042dc -#start-node-filter widget details -AAI.model-version-id.start-node-filter=aad96fd3-e75f-42fc-9777-3450c36f1168 -AAI.model-invariant-id.start-node-filter=083093a3-e407-447a-ba5d-7583e4d23e1d -#subnet widget details -AAI.model-version-id.subnet=f902a6bc-6be4-4fe5-8458-a6ec0056b374 -AAI.model-invariant-id.subnet=1b2c9ba7-e449-4831-ba15-3073672f5ef2 -#tagged-inventory-item-list widget details -AAI.model-invariant-id.tagged-inventory-item-list=e78a7eaa-f65d-4919-9c2b-5b258c8c4d7e -AAI.model-version-id.tagged-inventory-item-list=c246f6e2-e3a1-4697-94c0-5672a7fbbf04 -#tenant widget details -AAI.model-invariant-id.tenant=97c26c99-6870-44c1-8a07-1d900d3f4ce6 -AAI.model-version-id.tenant=abcc54bc-bb74-49dc-9043-7f7171707545 -#tunnel-xconnect widget details -AAI.model-invariant-id.tunnel-xconnect=50b9e2fa-005c-4bbe-b651-3251dece4cd8 -AAI.model-version-id.tunnel-xconnect=e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5 -#update-node-key widget details -AAI.model-version-id.update-node-key=6004cfa6-eb6d-4062-971f-b1fde6b74aa0 -AAI.model-invariant-id.update-node-key=fe81c801-f65d-408a-b2b7-a729a18f8154 -#vce widget details -AAI.model-version-id.vce=b6cf54b5-ec45-43e1-be64-97b4e1513333 -AAI.model-invariant-id.vce=bab6dceb-e7e6-4301-a5e0-a7399b48d792 -#vf-module widget details -AAI.model-invariant-id.vf-module=ef86f9c5-2165-44f3-8fc3-96018b609ea5 -AAI.model-version-id.vf-module=c00563ae-812b-4e62-8330-7c4d0f47088a -#vig-server widget details -AAI.model-version-id.vig-server=8e8c22f1-fbdf-48ea-844c-8bdeb44e7b16 -AAI.model-invariant-id.vig-server=bed7c3b7-35d0-4cd9-abde-41b20e68b28e -#virtual-data-center widget details -AAI.model-invariant-id.virtual-data-center=5150abcf-0c5f-4593-9afe-a19c48fc4824 -AAI.model-version-id.virtual-data-center=6dd43ced-d789-47af-a759-d3abc14e3ac1 -#vlan widget details -AAI.model-version-id.vlan=257d88a5-a269-4c35-944f-aca04fbdb791 -AAI.model-invariant-id.vlan=d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8 -#vnfc widget details -AAI.model-invariant-id.vnfc=96129eb9-f0de-4e05-8af2-73146473f766 -AAI.model-version-id.vnfc=5761e0a7-c6df-4d8a-9ebd-b8f445054dec -#vnf-image widget details -AAI.model-invariant-id.vnf-image=f9a628ff-7aa0-40e2-a93d-02d91c950982 -AAI.model-version-id.vnf-image=c4d3e747-ba4a-4b17-9896-94c6f18c19d3 -#volume widget details -AAI.model-version-id.volume=0fbe2e8f-4d91-4415-a772-88387049b38d -AAI.model-invariant-id.volume=ddd739b4-2b25-46c4-affc-41a32af5cc42 -#volume-group widget details -AAI.model-invariant-id.volume-group=fcec1b02-b2d0-4834-aef8-d71be04717dd -AAI.model-version-id.volume-group=99d44c90-1f61-4418-b9a6-56586bf38c79 -#vpe widget details -AAI.model-invariant-id.vpe=053ec3a7-5b72-492d-b54d-123805a9b967 -AAI.model-version-id.vpe=203817d3-829c-42d4-942d-2a935478e993 -#vpls-pe widget details -AAI.model-version-id.vpls-pe=b1566228-6785-4ce1-aea2-053736f80341 -AAI.model-invariant-id.vpls-pe=457ba89b-334c-4fbd-acc4-160ac0e0cdc0 -#vpn-binding widget details -AAI.model-invariant-id.vpn-binding=9e23b675-db2b-488b-b459-57aa9857baa0 -AAI.model-version-id.vpn-binding=21a146e5-9901-448c-9197-723076770119 -#vserver widget details -AAI.model-invariant-id.vserver=ff69d4e0-a8e8-4108-bdb0-dd63217e63c7 -AAI.model-version-id.vserver=8ecb2c5d-7176-4317-a255-26274edfdd53 \ No newline at end of file diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb deleted file mode 100644 index 620fa2ec4d..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb +++ /dev/null @@ -1,29 +0,0 @@ -unless Dir.exist? "#{ENV['JETTY_BASE']}/temp" - directory "BE_tempdir_creation" do - path "#{ENV['JETTY_BASE']}/temp" - owner "#{ENV['JETTY_USER']}" - owner "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create - end -end - -unless Dir.exist? "#{ENV['JETTY_BASE']}/config" - directory "BE_create_config_dir" do - path "#{ENV['JETTY_BASE']}/config" - owner "#{ENV['JETTY_USER']}" - owner "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create - end -end - -unless Dir.exist? "#{ENV['JETTY_BASE']}/config/catalog-be" - directory "BE_create_catalog-be" do - path "#{ENV['JETTY_BASE']}/config/catalog-be" - owner "#{ENV['JETTY_USER']}" - owner "#{ENV['JETTY_GROUP']}" - mode '0755' - action :create - end -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb deleted file mode 100644 index d2ec242f05..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ /dev/null @@ -1,81 +0,0 @@ -# Set the cassandra replica number -replication_factor = node['cassandra']['replication_factor'] - -if node['Pair_EnvName'] == "" - janusgraph_dcname_with_rep = node['cassandra']['datacenter_name'] + "," + replication_factor.to_s - conf_dcname_with_rep = node['cassandra']['datacenter_name'] + "','" + replication_factor.to_s -else - janusgraph_dcname_with_rep = node['cassandra']['datacenter_name'] + "," + replication_factor.to_s + "," + node['cassandra']['cluster_name'] + node['Pair_EnvName'] + "," + replication_factor.to_s - conf_dcname_with_rep = node['cassandra']['datacenter_name'] + "','" + replication_factor.to_s + "','" + node['cassandra']['cluster_name'] + node['Pair_EnvName'] + "','" + replication_factor.to_s -end - -#Set random ID for DMaap configuration -if node['DMAAP']['random_id'].nil? - node.default['DMAAP']['random_id'] = Time.now.getutc.to_i -end - -template "janusgraph.properties" do - path "#{ENV['JETTY_BASE']}/config/catalog-be/janusgraph.properties" - source "BE-janusgraph.properties.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" - action :create_if_missing - variables({ - :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/, ''), - :cassandra_cql_port => node['cassandra'][:cassandra_port], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user], - :rep_factor => replication_factor, - :DC_NAME => node['cassandra']['datacenter_name'], - :DC_NAME_WITH_REP => janusgraph_dcname_with_rep, - :janus_connection_timeout => node['cassandra']['janusgraph_connection_timeout'], - :cassandra_keystore_path => node['cassandra'][:cassandra_keystore_path], - :cassandra_keystore_password => node['cassandra'][:cassandra_keystore_password], - :cassandra_truststore_path => node['cassandra'][:cassandra_truststore_path], - :cassandra_truststore_password => node['cassandra'][:cassandra_truststore_password], - :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", - :cassandra_read_consistency_level => node['cassandra'][:read_consistency_level], - :cassandra_write_consistency_level => node['cassandra'][:write_consistency_level], - :cassandra_db_cache => node['cassandra'][:db_cache] - }) -end - -template "catalog-be-config" do - path "#{ENV['JETTY_BASE']}/config/catalog-be/configuration.yaml" - source "BE-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" - action :create_if_missing - variables({ - :catalog_ip => node['Nodes']['BE'], - :catalog_port => node['BE'][:http_port], - :ssl_port => node['BE'][:https_port], - :basic_auth_flag => node['basic_auth']['enabled'], - :user_name => node['basic_auth'][:user_name], - :user_pass => node['basic_auth'][:user_pass], - :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/, ''), - :cassandra_port => node['cassandra']['cassandra_port'], - :rep_factor => replication_factor, - :DC_NAME => node['cassandra']['datacenter_name'], - :REP_STRING => conf_dcname_with_rep, - :janusgraph_Path => "#{ENV['JETTY_BASE']}/config/catalog-be/", - :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], - :socket_read_timeout => node['cassandra']['socket_read_timeout'], - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user], - :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", - :permittedAncestors => "#{ENV['permittedAncestors']}", - :dmaap_active => node['DMAAP']['active'] - }) -end - -template "distribution-engine-configuration" do - path "#{ENV['JETTY_BASE']}/config/catalog-be/distribution-engine-configuration.yaml" - source "BE-distribution-engine-configuration.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" - action :create_if_missing -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_setup_key_and_trust_store.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_setup_key_and_trust_store.rb deleted file mode 100644 index 66562d8ba9..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_3_setup_key_and_trust_store.rb +++ /dev/null @@ -1,21 +0,0 @@ -#Set the http module option -if node['BE'][:tls_cert] - execute "generate-keystore" do - command "openssl pkcs12 -inkey #{node['BE'][:tls_key]} -in #{node['BE'][:tls_cert]} -export -out /tmp/keystore.pkcs12 -passin pass:#{node['BE'][:tls_password]} -passout pass:#{node['BE'][:tls_password]}" - end - - execute "import-keystore" do - command "keytool -importkeystore -srcstoretype PKCS12 -srckeystore /tmp/keystore.pkcs12 -srcstorepass #{node['BE'][:tls_password]} -destkeystore #{ENV['JETTY_BASE']}/#{node['BE'][:keystore_path]} -deststorepass #{node['BE'][:keystore_password]} -noprompt" - end -end - -if node['BE'][:ca_cert] - execute "delete-existing-ca-alias" do - command "keytool -delete -alias sdc-be -storepass #{node['BE'][:truststore_password]} -keystore #{ENV['JETTY_BASE']}/#{node['BE'][:truststore_path]}" - returns [0, 1] - end - - execute "generate-truststore" do - command "keytool -import -alias sdc-be -file #{node['BE'][:ca_cert]} -storetype JKS -keystore #{ENV['JETTY_BASE']}/#{node['BE'][:truststore_path]} -storepass #{node['BE'][:truststore_password]} -noprompt" - end -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb deleted file mode 100644 index 172888c773..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb +++ /dev/null @@ -1,59 +0,0 @@ -#Set the http module option -if node['disableHttp'] - http_option = "#--module=http" -else - http_option = "--module=http" -end - -execute "create-jetty-modules" do - command "java -jar #{ENV['JETTY_HOME']}/start.jar --add-to-start=deploy && java -jar #{ENV['JETTY_HOME']}/start.jar --create-startd --add-to-start=http,https,setuid,rewrite" - cwd "#{ENV['JETTY_BASE']}" - action :run -end - -template "http-ini" do - path "#{ENV['JETTY_BASE']}/start.d/http.ini" - source "http-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :http_option => http_option , - :http_port => "#{node['BE'][:http_port]}" - }) - -end - -template "jetty-rewrite" do - path "#{ENV['JETTY_BASE']}/etc/rewrite-root-to-swagger-ui.xml" - source "BE-jetty-rewrite.yaml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0644" -end - - -template "https-ini" do - path "#{ENV['JETTY_BASE']}/start.d/https.ini" - source "https-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables :https_port => "#{node['BE'][:https_port]}" -end - -template "ssl-ini" do - path "#{ENV['JETTY_BASE']}/start.d/ssl.ini" - source "ssl-ini.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :https_port => "#{node['BE'][:https_port]}" , - :keystore_path => "#{node['BE'][:keystore_path]}" , - :keystore_password => "#{node['BE'][:keystore_password]}" , - :truststore_path => "#{node['BE'][:truststore_path]}" , - :truststore_password => "#{node['BE'][:truststore_password]}" - }) -end - diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_5_setup_elasticsearch.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_5_setup_elasticsearch.rb deleted file mode 100644 index 44e96f3477..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_5_setup_elasticsearch.rb +++ /dev/null @@ -1,21 +0,0 @@ -clusterName = node['elasticsearch'][:cluster_name]+node.chef_environment - -elasticsearch_list = '' - -node['Nodes']['ES'].each do |item| - elasticsearch_list += "- " + item + ":9300\n" -end - - - -template "elasticsearch.yml-config" do - path "#{ENV['JETTY_BASE']}/config/elasticsearch.yml" - source "BE-elasticsearch.yml.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :cluster_name => "#{clusterName}", - :es_host_ip => "#{elasticsearch_list}" - }) -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb deleted file mode 100644 index 5e37c29bf8..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb +++ /dev/null @@ -1,25 +0,0 @@ -template "template portal.properties" do - path "#{ENV['JETTY_BASE']}/resources/portal.properties" - source "BE-portal.properties.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :ecomp_rest_url => node['ECompP']['ecomp_rest_url'], - :ecomp_redirect_url => node['ECompP']['ecomp_redirect_url'], - :ecomp_portal_user => node['ECompP']['portal_user'], - :ecomp_portal_pass => node['ECompP']['portal_pass'], - :portal_app_name => node['ECompP']['portal_app_name'], - }) -end - -template "template key.properties" do - path "#{ENV['JETTY_BASE']}/resources/key.properties" - source "BE-key.properties.erb" - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - mode "0755" - variables ({ - :cipher_key => node['ECompP']['cipher_key'] - }) -end \ No newline at end of file diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb deleted file mode 100644 index 8dbebbb633..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb +++ /dev/null @@ -1,8 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/logback.xml" do - source "logback.xml" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - action :create_if_missing -end - diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb deleted file mode 100644 index cc059b4e06..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb +++ /dev/null @@ -1,16 +0,0 @@ -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/ecomp-error-configuration.yaml" do - source "ecomp-error-configuration.yaml" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - action :create_if_missing -end - -cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/error-configuration.yaml" do - source "error-configuration.yaml" - mode 0644 - owner "#{ENV['JETTY_USER']}" - group "#{ENV['JETTY_GROUP']}" - action :create_if_missing -end - diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb deleted file mode 100644 index 51e69ae7a9..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb +++ /dev/null @@ -1,17 +0,0 @@ -if node[:disableHttp] - protocol = "https" - port = "#{node['BE'][:https_port]}" -else - protocol = "http" - port = "#{node['BE'][:http_port]}" -end - -template "#{ENV['JETTY_BASE']}/ready-probe.sh" do - source "ready-probe.sh.erb" - sensitive true - mode 0755 - variables({ - :protocol => protocol, - :port => port - }) -end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb deleted file mode 100644 index 4c894b4106..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb +++ /dev/null @@ -1,30 +0,0 @@ -storage.backend=cql -storage.hostname=<%= @cassandra_ip %> -storage.port=<%= @cassandra_cql_port %> -storage.username=<%= @cassandra_usr %> -storage.password=<%= @cassandra_pwd %> -storage.connection-timeout=<%= @janus_connection_timeout %> -storage.cql.keyspace=sdctitan - -storage.cql.ssl.enabled=<%= @cassandra_ssl_enabled %> -storage.cql.ssl.keystore.location=<%= @cassandra_keystore_path %> -storage.cql.ssl.keystore.password=<%= @cassandra_keystore_password %> -storage.cql.ssl.truststore.location=<%= @cassandra_truststore_path %> -storage.cql.ssl.truststore.password=<%= @cassandra_truststore_password %> - -storage.cql.read-consistency-level=<%= @cassandra_read_consistency_level %> -storage.cql.write-consistency-level=<%= @cassandra_write_consistency_level %> -storage.cql.replication-strategy-class=NetworkTopologyStrategy -storage.cql.replication-strategy-options=<%= @DC_NAME_WITH_REP %> -storage.cql.local-datacenter=<%= @DC_NAME %> - - -cache.db-cache = <%= @cassandra_db_cache %> -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 - -cache.tx-cache-size = 1000000 - -storage.lock.retries=5 -graph.replace-instance-if-exists=true diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb deleted file mode 100644 index 4646661dfb..0000000000 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb +++ /dev/null @@ -1,5 +0,0 @@ -notifications: - pollingIntervalMsec: 2000 - selectionSize: 100 - beHost: <%= @catalog_ip %> - beHttpPort: <%= @catalog_port %> \ No newline at end of file diff --git a/catalog-be/src/main/docker/backend/chef-solo/LICENSE b/catalog-be/src/main/docker/backend/chef-solo/LICENSE deleted file mode 100644 index 11069edd79..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -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. diff --git a/catalog-be/src/main/docker/backend/chef-solo/README.md b/catalog-be/src/main/docker/backend/chef-solo/README.md deleted file mode 100644 index ddb0fda830..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Deprecated -========== - -Use of this repository is deprecated. We recommend using the `chef generate repo` command that comes with [ChefDK](http://downloads.chef.io/chef-dk/). - -Overview -======== - -Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code. - -While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code. - -Repository Directories -====================== - -This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef. - -* `cookbooks/` - Cookbooks you download or create. -* `data_bags/` - Store data bags and items in .json in the repository. -* `roles/` - Store roles in .rb or .json in the repository. -* `environments/` - Store environments in .rb or .json in the repository. - -Configuration -============= - -The repository contains a knife configuration file. - -* .chef/knife.rb - -The knife configuration file `.chef/knife.rb` is a repository specific configuration file for knife. If you're using Hosted Chef, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation. - -https://docs.chef.io/knife.html - -Next Steps -========== - -Read the README file in each of the subdirectories for more information about what goes in those directories. diff --git a/catalog-be/src/main/docker/backend/chef-solo/chefignore b/catalog-be/src/main/docker/backend/chef-solo/chefignore deleted file mode 100644 index ba30af6cff..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/chefignore +++ /dev/null @@ -1,11 +0,0 @@ -# Put files/directories that should be ignored in this file. -# Lines that start with '# ' are comments. - -# emacs -*~ - -# vim -*.sw[a-z] - -# subversion -*/.svn/* diff --git a/catalog-be/src/main/docker/backend/chef-solo/cookbooks/README.md b/catalog-be/src/main/docker/backend/chef-solo/cookbooks/README.md deleted file mode 100644 index 86ea46bfbb..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/cookbooks/README.md +++ /dev/null @@ -1,54 +0,0 @@ -This directory contains the cookbooks used to configure systems in your infrastructure with Chef. - -Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly. - - cookbook_path ["./cookbooks"] - -This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used: - - current_dir = File.dirname(__FILE__) - cookbook_path ["#{current_dir}/../cookbooks"] - -Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`). - -Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`. - - cookbook_copyright "Example, Com." - cookbook_email "cookbooks@example.com" - cookbook_license "apachev2" - -Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files. - -Create new cookbooks in this directory with Knife. - - knife cookbook create COOKBOOK - -This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe. - -You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is. - -The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife. - - knife cookbook site install COOKBOOK - -This will: - -* Download the cookbook tarball from cookbooks.opscode.com. -* Ensure its on the git master branch. -* Checks for an existing vendor branch, and creates if it doesn't. -* Checks out the vendor branch (chef-vendor-COOKBOOK). -* Removes the existing (old) version. -* Untars the cookbook tarball it downloaded in the first step. -* Adds the cookbook files to the git index and commits. -* Creates a tag for the version downloaded. -* Checks out the master branch again. -* Merges the cookbook into master. -* Repeats the above for all the cookbooks dependencies, downloading them from the community site - -The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates. - -If you're not using Git, use the site download subcommand to download the tarball. - - knife cookbook site download COOKBOOK - -This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool. diff --git a/catalog-be/src/main/docker/backend/chef-solo/data_bags/README.md b/catalog-be/src/main/docker/backend/chef-solo/data_bags/README.md deleted file mode 100644 index 0c15a391fa..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/data_bags/README.md +++ /dev/null @@ -1,63 +0,0 @@ -Data Bags ---------- - -This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag. - -First, create a directory for the data bag. - - mkdir data_bags/BAG - -Then create the JSON files for items that will go into that bag. - - $EDITOR data_bags/BAG/ITEM.json - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM". For example, - - { - "id": "foo" - } - -Next, create the data bag on the Chef Server. - - knife data bag create BAG - -Then upload the items in the data bag's directory to the Chef Server. - - knife data bag from file BAG ITEM.json - - -Encrypted Data Bags -------------------- - -Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key. - - openssl rand -base64 512 > secret_key - -You may use this secret_key to add items to a data bag during a create. - - knife data bag create --secret-file secret_key passwords mysql - -You may also use it when adding ITEMs from files, - - knife data bag create passwords - knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key - -The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example, - - { - "id": "mysql", - "password": "abc123" - } - -Without the secret_key, the contents are encrypted. - - knife data bag show passwords mysql - id: mysql - password: 2I0XUUve1TXEojEyeGsjhw== - -Use the secret_key to view the contents. - - knife data bag show passwords mysql --secret-file secret_key - id: mysql - password: abc123 - diff --git a/catalog-be/src/main/docker/backend/chef-solo/environments/README.md b/catalog-be/src/main/docker/backend/chef-solo/environments/README.md deleted file mode 100644 index 50ac48db2b..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/environments/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Requires Chef 0.10.0+. - -This directory is for Ruby DSL and JSON files for environments. For more information see the Chef wiki page: - -http://docs.chef.io/environments.html diff --git a/catalog-be/src/main/docker/backend/chef-solo/roles/README.md b/catalog-be/src/main/docker/backend/chef-solo/roles/README.md deleted file mode 100644 index b0ee0b4d21..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/roles/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife. - -For example, create `roles/base_example.rb`: - - name "base_example" - description "Example base role applied to all nodes." - # List of recipes and roles to apply. Requires Chef 0.8, earlier versions use 'recipes()'. - #run_list() - # Attributes applied if the node doesn't have it set already. - #default_attributes() - # Attributes applied no matter what the node has set already. - #override_attributes() - -Then upload it to the Chef Server: - - knife role from file roles/base_example.rb diff --git a/catalog-be/src/main/docker/backend/chef-solo/roles/catalog-be.json b/catalog-be/src/main/docker/backend/chef-solo/roles/catalog-be.json deleted file mode 100644 index 7dbd72a1ad..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/roles/catalog-be.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "catalog-be", - "description": "Installation application - catalogBE", - "json_class": "Chef::Role", - "default_attributes": { - - }, - "override_attributes": { - - }, - "chef_type": "role", - "run_list": [ - "recipe[sdc-catalog-be::BE_1_cleanup_jettydir]", - "recipe[sdc-catalog-be::BE_2_setup_configuration]", - "recipe[sdc-catalog-be::BE_3_setup_key_and_trust_store]", - "recipe[sdc-catalog-be::BE_4_jetty_Modules]", - "recipe[sdc-catalog-be::BE_6_setup_portal_and_key_properties]", - "recipe[sdc-catalog-be::BE_7_logback]", - "recipe[sdc-catalog-be::BE_8_errors_config]", - "recipe[sdc-catalog-be::BE_9_prepareProbeFile]" - ], - "env_run_lists": { - } -} - diff --git a/catalog-be/src/main/docker/backend/chef-solo/solo.json b/catalog-be/src/main/docker/backend/chef-solo/solo.json deleted file mode 100644 index ce096b3931..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/solo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run_list": [ "role[catalog-be]" ] -} - diff --git a/catalog-be/src/main/docker/backend/chef-solo/solo.rb b/catalog-be/src/main/docker/backend/chef-solo/solo.rb deleted file mode 100644 index 06c1af4592..0000000000 --- a/catalog-be/src/main/docker/backend/chef-solo/solo.rb +++ /dev/null @@ -1,16 +0,0 @@ -root = File.absolute_path(File.dirname(__FILE__)) -file_cache_path root -cookbook_path root + '/cookbooks' -json_attribs root + '/solo.json' -checksum_path root + '/checksums' -data_bag_path root + '/data_bags' -environment_path root + '/environments' -file_backup_path root + '/backup' -file_cache_path root + '/cache' -log_level :info -log_location STDOUT -rest_timeout 300 -role_path root + '/roles' -syntax_check_cache_path -umask 0022 -verbose_logging nil diff --git a/catalog-be/src/main/docker/backend/files/BE_3_setup_key_and_trust_store.sh b/catalog-be/src/main/docker/backend/files/BE_3_setup_key_and_trust_store.sh new file mode 100644 index 0000000000..7e02143ebf --- /dev/null +++ b/catalog-be/src/main/docker/backend/files/BE_3_setup_key_and_trust_store.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +# Extract values from environment variables +TLS_CERT=${TLS_CERT} +TLS_KEY=${TLS_KEY} +TLS_PASSWORD=${TLS_PASSWORD} +KEYSTORE_PATH=${KEYSTORE_PATH} +KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD} +CA_CERT=${CA_CERT} +TRUSTSTORE_PATH=${TRUSTSTORE_PATH} +TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} +JETTY_BASE=${JETTY_BASE:-"/app/jetty"} + +# Print extracted values +echo "Extracted environment variables:" +echo " TLS_CERT: $TLS_CERT" +echo " TLS_KEY: $TLS_KEY" +echo " TLS_PASSWORD: $TLS_PASSWORD" +echo " KEYSTORE_PATH: $KEYSTORE_PATH" +echo " KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD" +echo " CA_CERT: $CA_CERT" +echo " TRUSTSTORE_PATH: $TRUSTSTORE_PATH" +echo " TRUSTSTORE_PASSWORD: $TRUSTSTORE_PASSWORD" +echo " JETTY_BASE: $JETTY_BASE" + +# Main logic to generate keystore and truststore +if [ -n $TLS_CERT ]; then + echo "Generating keystore..." + openssl pkcs12 -inkey $TLS_KEY -in $TLS_CERT -export \ + -out /tmp/keystore.pkcs12 -passin pass:$TLS_PASSWORD -passout pass:$TLS_PASSWORD + + echo "Importing keystore..." + keytool -importkeystore -srcstoretype PKCS12 \ + -srckeystore /tmp/keystore.pkcs12 -srcstorepass $TLS_PASSWORD \ + -destkeystore $JETTY_BASE/$KEYSTORE_PATH -deststorepass $KEYSTORE_PASSWORD -noprompt +fi + +if [ -n $CA_CERT ]; then + echo "Deleting existing CA alias..." + keytool -delete -alias sdc-be \ + -storepass $TRUSTSTORE_PASSWORD -keystore $JETTY_BASE/$TRUSTSTORE_PATH || true + + echo "Generating truststore..." + keytool -import -alias sdc-be -file $CA_CERT -storetype JKS \ + -keystore $JETTY_BASE/$TRUSTSTORE_PATH -storepass $TRUSTSTORE_PASSWORD -noprompt +fi + +echo "Setup completed successfully." diff --git a/catalog-be/src/main/docker/backend/files/create_directories.sh b/catalog-be/src/main/docker/backend/files/create_directories.sh new file mode 100644 index 0000000000..3ff15428a1 --- /dev/null +++ b/catalog-be/src/main/docker/backend/files/create_directories.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Set environment variables (replace with actual values) +JETTY_BASE="/app/jetty" +#JETTY_USER="onap" # Replace with actual user +#JETTY_GROUP="onap" # Replace with actual group + +# Create the temp directory if it doesn't exist +if [ ! -d "$JETTY_BASE/temp" ]; then + mkdir -p "$JETTY_BASE/temp" + chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/temp" + chmod 755 "$JETTY_BASE/temp" + echo "Created $JETTY_BASE/temp directory." +fi + +# Create the config directory if it doesn't exist +if [ ! -d "$JETTY_BASE/config" ]; then + mkdir -p "$JETTY_BASE/config" + chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config" + chmod 755 "$JETTY_BASE/config" + echo "Created $JETTY_BASE/config directory." +fi + +# Create the config/catalog-be directory if it doesn't exist +if [ ! -d "$JETTY_BASE/config/catalog-be" ]; then + mkdir -p "$JETTY_BASE/config/catalog-be" + chown "$JETTY_USER:$JETTY_GROUP" "$JETTY_BASE/config/catalog-be" + chmod 755 "$JETTY_BASE/config/catalog-be" + echo "Created $JETTY_BASE/config/catalog-be directory." +fi + diff --git a/catalog-be/src/main/docker/backend/files/create_jetty_modules.sh b/catalog-be/src/main/docker/backend/files/create_jetty_modules.sh new file mode 100644 index 0000000000..414bcab6e7 --- /dev/null +++ b/catalog-be/src/main/docker/backend/files/create_jetty_modules.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# Define environment variables +export JETTY_HOME="/app/jetty/" # Replace with your Jetty home directory +export JETTY_BASE="/app/jetty/" # Replace with your Jetty base directory + +# Navigate to the Jetty base directory +cd "$JETTY_BASE" + +# Run the Jetty start-up jar with deploy module added +java -jar $JETTY_HOME/start.jar --add-to-start=deploy + +# Create startd configuration and add http, https, setuid modules +java -jar $JETTY_HOME/start.jar --create-startd --add-to-start=http,https,setuid,rewrite diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml b/catalog-be/src/main/docker/backend/files/ecomp-error-configuration.yaml similarity index 100% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml rename to catalog-be/src/main/docker/backend/files/ecomp-error-configuration.yaml diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml b/catalog-be/src/main/docker/backend/files/error-configuration.yaml similarity index 100% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml rename to catalog-be/src/main/docker/backend/files/error-configuration.yaml diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml b/catalog-be/src/main/docker/backend/files/logback.xml similarity index 100% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml rename to catalog-be/src/main/docker/backend/files/logback.xml diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-jetty-rewrite.yaml.erb b/catalog-be/src/main/docker/backend/files/rewrite-root-to-swagger-ui.xml similarity index 100% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-jetty-rewrite.yaml.erb rename to catalog-be/src/main/docker/backend/files/rewrite-root-to-swagger-ui.xml diff --git a/catalog-be/src/main/docker/backend/startup.sh b/catalog-be/src/main/docker/backend/startup.sh index 0f778a315e..18b19b9563 100644 --- a/catalog-be/src/main/docker/backend/startup.sh +++ b/catalog-be/src/main/docker/backend/startup.sh @@ -10,9 +10,6 @@ export JAVA_OPTIONS="$JAVA_OPTIONS -Dconfig.home=$JETTY_BASE/config \ -Djavax.net.ssl.trustStore=$JETTY_BASE/etc/org.onap.sdc.trust.jks \ -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0" -cd $JETTY_BASE/chef-solo -chef-solo -c solo.rb -E ${ENVNAME} - # Execute Jetty cd $JETTY_HOME echo "jetty.httpConfig.sendServerVersion=false" >> $JETTY_HOME/start.d/start.ini diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml index 969ce27ded..1f712b44cf 100644 --- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml @@ -61,6 +61,12 @@ services: models: [ "AUTOMATION COMPOSITION" ] + NSST: + name: "NSST" + icons: [ 'nsst' ] + models: [ + "SDC AID" + ] resources: NetworkLayer23: name: "Network L2-3" diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index 24bed4d567..222f89547e 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -3496,3 +3496,244 @@ tosca.dataTypes.tmf.milestoneJeopardyData: type: string required: false valid_values: [normal, critical, hazard] + +tosca.datatypes.3gpp.ServAttrCom: + derived_from: tosca.datatypes.Root + properties: + category: + type: string + required: false + description: > + This attribute specifies the category of a service requirement/attribute of GST (see GSMA NG.116 ). + constraints: + - valid_values: ["CHARACTER", "SCALABILITY"] + exposure: + type: string + required: false + description: > + This attribute specifies exposure mode of a service requirement/attribute of GST (see GSMA NG.116 ). + constraints: + - valid_values: ["API", "KPI"] + tagging: + type: string + required: false + description: > + This attribute specifies the tagging of a service requirement/attribute of GST in character category (see GSMA NG.116). + constraints: + - valid_values: ["PERFORMANCE", "FUNCTION", "OPERATION"] + +tosca.datatypes.3gpp.PlmnId: + derived_from: tosca.datatypes.Root + properties: + mcc: + type: string + required: false + description: > + Mobile Country Code (MCC) of the PLMN identifier. See 3GPP TS 23.003 subclause 2.2 and 12.1. + mnc: + type: string + required: false + description: > + Mobile Network Code (MNC) of the PLMN identifier. See 3GPP TS 23.003 subclause 2.2 and 12.1. + +tosca.datatypes.3gpp.Snssai: + derived_from: tosca.datatypes.Root + properties: + sst: + type: string + required: false + description: > + This attribute specifies the Slice/Service type (SST) of the network slice. + sd: + type: integer + required: false + description: > + This attribute specifies the Slice Differentiator (SD), which is optional information that complements the slice/service type(s) to differentiate amongst multiple Network Slices. + Pattern: '^[A-Fa-f0-9]{6}$' + +tosca.datatypes.3gpp.CoverageArea: + derived_from: tosca.datatypes.Root + properties: + geoPoint: + type: tosca.datatypes.3gpp.GeoCoordinate + required: false + description: > + Sample description + convexGeoPolygon: + type: list + required: false + description: > + Sample description + entry_schema: + type: tosca.datatypes.3gpp.GeoCoordinate + +tosca.datatypes.3gpp.DelayTolerance: + derived_from: tosca.datatypes.Root + properties: + servAttrCom: + type: tosca.datatypes.3gpp.ServAttrCom + required: false + description: > + Represents the common properties of service requirement related attributes (see GSMA NG.116 corresponding to Attribute categories, tagging and exposure). + support: + type: string + required: false + description: > + An attribute specifies whether or not the network slice supports service delivery flexibility, especially for the vertical services that are not chasing a high system performance. + constraints: + - valid_values: ["NOT_SUPPORTED", "SUPPORTED"] + +tosca.datatypes.3gpp.DeterministicComm: + derived_from: tosca.datatypes.Root + properties: + servAttrCom: + type: tosca.datatypes.3gpp.ServAttrCom + required: false + description: > + Represents the common properties of service requirement related attributes (see GSMA NG.116 corresponding to Attribute categories, tagging and exposure). + availability: + type: string + required: false + description: > + This parameter describes if the network slice supports deterministic communication. + constraints: + - valid_values: ["NOT_SUPPORTED", "SUPPORTED"] + periodicityList: + type: list + required: false + description: > + An attribute specifies a list of periodicities supported by the network slice for deterministic communication. Each instance of periodicity is expressed in seconds, refer to GSMA NG.116. + entry_schema: + type: integer + +tosca.datatypes.3gpp.GeoCoordinate: + derived_from: tosca.datatypes.Root + properties: + latitude: + type: float + required: false + description: > + Latitude value + longitude: + type: float + required: false + description: > + Longitude value + altitude: + type: float + required: false + description: > + Altitude value + +tosca.datatypes.3gpp.KpiMonitoring: + derived_from: tosca.datatypes.Root + properties: + servAttrCom: + type: tosca.datatypes.3gpp.ServAttrCom + required: false + description: > + Represents the common properties of service requirement related attributes (see GSMA NG.116 corresponding to Attribute categories, tagging and exposure). + kpiList: + type: list + required: false + description: > + An attribute specifies the name list of KQIs and KPIs available for performance monitoring. + entry_schema: + type: string + +tosca.datatypes.3gpp.PlmnInfo: + derived_from: tosca.datatypes.Root + properties: + plmnId: + type: tosca.datatypes.3gpp.PlmnId + required: false + description: > + Represents the information of a PLMN identification. + snssai: + type: tosca.datatypes.3gpp.Snssai + required: false + description: > + In order to identify a Network Slice end to end, the 5GS uses information called S-NSSAI (Single Network Slice Selection Assistance Information) + +tosca.datatypes.3gpp.Positioning: + derived_from: tosca.datatypes.Root + properties: + servAttrCom: + type: tosca.datatypes.3gpp.ServAttrCom + required: false + description: > + Represents the common properties of service requirement related attributes (see GSMA NG.116 corresponding to Attribute categories, tagging and exposure). + availability: + type: string + required: false + description: > + Specifies if this attribute is provided by the RAN domain of the network slice and contains a list of positioning methods provided by the RAN domain. If the list is empty this attribute is not available in the RAN domain and the other parameters might be ignored, see GSMA NG.116 . Comma separated multiple values are allowed + Allowed Values: CIDE_CID, OTDOA, RF_FINGERPRINTING, AECID, HYBRID_POSITIONING, NET_RTK. + predictionFrequency: + type: string + required: false + description: > + Specifies how often location information is provided. This parameter simply defines how often the customer is allowed to request location information. This is not related to the time it takes to determine the location, which is a characteristic of the positioning method, see GSMA NG.116. + constraints: + - valid_values: ["PERSEC", "PERMIN", "PERHOUR"] + accuracy: + type: string + required: false + description: > + Specifies the accuracy of the location information. Accuracy depends on the respective positioning solution applied in the RAN domain of the network slice, measurement unit is meter, see GSMA NG.116. + +tosca.datatypes.3gpp.Synchronicity: + derived_from: tosca.datatypes.Root + properties: + servAttrCom: + type: tosca.datatypes.3gpp.ServAttrCom + required: false + description: > + Represents the common properties of service requirement related attributes (see GSMA NG.116 corresponding to Attribute categories, tagging and exposure). + availability: + type: string + required: false + description: > + The synchronicity between devices over PC5 in absence of the network is not in scope of this parameter. + Note: Not including this parameter is equal to setting it to Not supported. + constraints: + - valid_values: ["NOT_SUPPORTED", "BETWEEN_BS_AND_UE", "BETWEEN_BS_AND_UE_AND_UE_AND_UE"] + accuracy: + type: float + required: false + description: > + Specifies the accuracy of the synchronicity, see GSMA NG.116 + +tosca.datatypes.3gpp.TermDensity: + derived_from: tosca.datatypes.Root + properties: + servAttrCom: + type: tosca.datatypes.3gpp.ServAttrCom + required: false + description: > + Represents the common properties of service requirement related attributes (see GSMA NG.116 corresponding to Attribute categories, tagging and exposure). + density: + type: integer + required: false + description: > + An attribute specifies the overall user density over the coverage area of the network slice. See Table 7.1-1 of 3GPP TS 22.261 . + +tosca.datatypes.3gpp.XlThpt: + derived_from: tosca.datatypes.Root + properties: + servAttrCom: + type: tosca.datatypes.3gpp.ServAttrCom + required: false + description: > + Represents the common properties of service requirement related attributes (see GSMA NG.116 corresponding to Attribute categories, tagging and exposure). + guaThpt: + type: float + required: false + description: > + This attribute describes the guaranteed data rate. + maxThpt: + type: float + required: false + description: > + This attribute describes the maximum data rate. + diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 50bd730290..e329cf6ee5 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -30,7 +30,7 @@ Modifications copyright (c) 2018 Nokia org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index cad5d1d5cd..50e4fc87b4 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 20cb6ad0fb..9d29311d24 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml index 77d4d63156..96f532a5fe 100644 --- a/catalog-ui/pom.xml +++ b/catalog-ui/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index d0882ac4b7..f2022fe167 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml index fcf40c5843..42be52209d 100644 --- a/common-app-logging/pom.xml +++ b/common-app-logging/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml index a9472be76d..31d8678521 100644 --- a/common-be-tests-utils/pom.xml +++ b/common-be-tests-utils/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common-be/pom.xml b/common-be/pom.xml index 85affbddf6..fa3e596ee0 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml index 8becd078c1..fae482042b 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml @@ -10,7 +10,7 @@ onap-common-configuration-management org.onap.sdc.common - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index 55c6760c4e..ec22798123 100755 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -26,7 +26,7 @@ onap-common-configuration-management org.onap.sdc.common - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common/onap-common-configuration-management/pom.xml b/common/onap-common-configuration-management/pom.xml index 6b046b8fcb..af20df55ef 100755 --- a/common/onap-common-configuration-management/pom.xml +++ b/common/onap-common-configuration-management/pom.xml @@ -10,7 +10,7 @@ org.onap.sdc.common onap-common-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml index d3d31db2a8..bd3e5615d2 100644 --- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml +++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-component-tests/pom.xml @@ -7,7 +7,7 @@ org.onap.sdc.common onap-generic-artifact-browser - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT onap-generic-artifact-browser-component-tests diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml index 1568bdcfc0..e4408dac14 100644 --- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml +++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml @@ -7,7 +7,7 @@ org.onap.sdc.common onap-generic-artifact-browser - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT onap-generic-artifact-browser-service diff --git a/common/onap-generic-artifact-browser/pom.xml b/common/onap-generic-artifact-browser/pom.xml index 67f02ff19f..c61227161d 100644 --- a/common/onap-generic-artifact-browser/pom.xml +++ b/common/onap-generic-artifact-browser/pom.xml @@ -5,7 +5,7 @@ onap-common-lib org.onap.sdc.common - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT 4.0.0 diff --git a/common/onap-tosca-datatype/pom.xml b/common/onap-tosca-datatype/pom.xml index f9685f80fc..a087da2c1a 100644 --- a/common/onap-tosca-datatype/pom.xml +++ b/common/onap-tosca-datatype/pom.xml @@ -25,7 +25,7 @@ onap-common-lib org.onap.sdc.common - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 16fddd80cf..30c0112e9d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ org.openecomp.sdc sdc-onboarding - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT ../onboarding/pom.xml diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml similarity index 91% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb rename to integration-tests/catalog-be-resources/catalog-be/configuration.yaml index 3f5ec422ad..3552acb8b6 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml @@ -6,33 +6,29 @@ identificationHeaderFields: - HTTP_CSP_WSTYPE # catalog backend hostname -beFqdn: <%= @catalog_ip %> +beFqdn: sdc-BE # catalog backend http port -beHttpPort: <%= @catalog_port %> +beHttpPort: 8080 # catalog backend http context beContext: /sdc/rest/config/get # catalog backend protocol -<% if node[:disableHttp] -%> -beProtocol: https -<% else %> beProtocol: http -<% end -%> -tlsCert: <%= node['BE']['tls_cert'] %> -tlsKey: <%= node['BE']['tls_key'] %> -caCert: <%= node['BE']['ca_cert'] %> +tlsCert: +tlsKey: +caCert: # catalog backend ssl port -beSslPort: <%= @ssl_port %> +beSslPort: 8443 version: 1.1.0 released: 2012-11-30 toscaConformanceLevel: 11.0 minToscaConformanceLevel: 3.0 -janusGraphCfgFile: <%= node['cassandra']['janusgraph_config_file'] %> +janusGraphCfgFile: /app/jetty/config/catalog-be/janusgraph.properties janusGraphInMemoryGraph: false janusGraphLockTimeout: 1800 # The interval to try and reconnect to JanusGraph DB when it is down during ASDC startup: @@ -86,32 +82,32 @@ users: bob: passwd basicAuth: - enabled: <%= @basic_auth_flag %> - userName: <%= @user_name %> - userPass: <%= @user_pass %> + enabled: false + userName: testName + userPass: testPass excludedUrls: "/sdc2/rest/healthCheck" cassandraConfig: - cassandraHosts: [<%= @cassandra_ip %>] - cassandraPort: <%= @cassandra_port %> - localDataCenter: <%= @DC_NAME %> + cassandraHosts: [sdc-cs] + cassandraPort: 9042 + localDataCenter: SDC-CS-integration-test reconnectTimeout : 30000 - socketReadTimeout: <%= @socket_read_timeout %> - socketConnectTimeout: <%= @socket_connect_timeout %> + socketReadTimeout: 40000 + socketConnectTimeout: 40000 authenticate: true - username: <%= @cassandra_usr %> - password: <%= @cassandra_pwd %> - ssl: <%= @cassandra_ssl_enabled %> - keystorePath: <%= @cassandra_keystore_password %> - keystorePassword: <%= @cassandra_ssl_enabled %> - truststorePath: <%= @cassandra_truststore_path %> - truststorePassword: <%= @cassandra_truststore_password %> + username: asdc_user + password: Aa1234%^! + ssl: false + keystorePath: + keystorePassword: false + truststorePath: + truststorePassword: keySpaces: - - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} - - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @REP_STRING %>']} + - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} licenseTypes: - User @@ -939,14 +935,9 @@ heatEnvArtifactHeader: "" heatEnvArtifactFooter: "" onboarding: - host: <%= node['ONBOARDING_BE_VIP'] %> - <% if node[:disableHttp] -%> - protocol: https - port: <%= node['ONBOARDING_BE'][:https_port] %> - <% else %> + host: sdc-onboard-BE protocol: http - port: <%= node['ONBOARDING_BE'][:http_port] %> - <% end -%> + port: 8081 getVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s?versionId=%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId?versionId=:vspVersionId getLatestVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId getVspUri: "/onboarding-api/v1.0/vendor-software-products/%s/versions/%s" # /onboarding-api/v1.0/vendor-software-products/:vspId/versions/:vspVersionId @@ -1105,7 +1096,7 @@ gabConfig: searchable: false dmaapConsumerConfiguration: - active: <%= @dmaap_active %> + active: false hosts: localhost:3905 consumerGroup: sdc consumerId: mama @@ -1137,32 +1128,32 @@ dmaapConsumerConfiguration: dmaapProducerConfiguration: active: true - hosts: <%= node['DMAAP']['producer']['host']%> - consumerGroup: sdc-<%= node.chef_environment %>-<%= node['DMAAP']['random_id'] %> - consumerId: sdc-<%= node.chef_environment %>1-<%= node['DMAAP']['random_id'] %> + hosts: olsd004.com:3905 + consumerGroup: sdc-integration-test-1737011830 + consumerId: sdc-integration-test1-1737011830 timeoutMs: 15000 limit: 1 pollingInterval: 2 - topic: <%= node['DMAAP']['producer']['topic'] %> + topic: SDC-FACADE-NOTIF-v1 latitude: 32.109333 longitude: 34.855499 version: 1.0 - serviceName: <%= node['DMAAP']['producer']['serviceName'] %> - environment: <%= node['DMAAP']['producer']['environment'] %> + serviceName: dmaap.com:3905/events + environment: integration-test partner: BOT_R routeOffer: MR1 - protocol: <%= node['http_protocol'] %> + protocol: contenttype: application/json dme2TraceOn: true - aftEnvironment: <%= node['DMAAP']['producer']['aftEnvironment']%> + aftEnvironment: aftDme2ConnectionTimeoutMs: 15000 aftDme2RoundtripTimeoutMs: 240000 aftDme2ReadTimeoutMs: 50000 - dme2preferredRouterFilePath: <%= node['DMAAP']['producer']['dme2preferredRouterFilePath'] %> + dme2preferredRouterFilePath: timeLimitForNotificationHandleMs: 120000 credential: - username: <%= node['DMAAP']['producer']['username'] %> - password: <%= node['DMAAP']['producer']['password'] %> + username: user1@sdc.com + password: password== aftDme2SslEnable: true aftDme2ClientSslCertAlias: certman @@ -1212,7 +1203,7 @@ healthStatusExclude: #Auto Healing enableAutoHealing: false -appVersion: <%= @app_version %> +appVersion: artifactGeneratorConfig: Artifact-Generator.properties resourcesForUpgrade: @@ -1260,4 +1251,5 @@ componentInstanceCounterDelimiter: " " dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize" #Space separated list of permitted ancestors -permittedAncestors: <%= @permittedAncestors %> +permittedAncestors: + diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb b/integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml similarity index 66% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb rename to integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml index 0989def1f9..4fec28925d 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb +++ b/integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml @@ -1,24 +1,15 @@ uebServers: - <% node['UEB']['fqdn'].each do |conn| -%> - - <%= conn %> - <% end -%> - -uebPublicKey: <%= node['UEB']['PublicKey'] %> -uebSecretKey: <%= node['UEB']['SecretKey'] %> - -<% if node.exist?('DistributionTopics','notificationTopicName') -%> -distributionNotifTopicName: <%= node['DistributionTopics']['notificationTopicName'] %> -<% else %> -distributionNotifTopicName: SDC-DISTR-NOTIF-TOPIC -<% end -%> - -<% if node.exist?('DistributionTopics','statusTopicName') -%> -distributionStatusTopicName: <%= node['DistributionTopics']['statusTopicName'] %> -<% else %> + - 10.0.11.1 + - 10.0.11.1 + +uebPublicKey: iPIxkpAMI8qTcQj8 +uebSecretKey: Ehq3WyT4bkif4zwgEbvshGal + +distributionNotifTopicName: SDC-DISTR-NOTIF-TOPIC-INT + distributionStatusTopicName: SDC-DISTR-STATUS-TOPIC -<% end -%> -kafkaBootStrapServers: <%= node['Kafka']['bootstrap'] %> +kafkaBootStrapServers: kafka-bootstrap-int:9092 initRetryIntervalSec: 5 initMaxIntervalSec: 60 @@ -33,13 +24,13 @@ distribNotifResourceArtifactTypes: - DG-XML environments: - - <%= node.chef_environment %> + - integration-test distributionStatusTopic: pollingIntervalSec: 60 fetchTimeSec: 15 - consumerGroup: sdc-<%= node.chef_environment %> - consumerId: sdc-<%= node.chef_environment %>1 + consumerGroup: sdc-integration-test + consumerId: sdc-integration-test1 distributionNotificationTopic: @@ -89,5 +80,4 @@ msoConfig: userName: asdc password: OTLEp5lfVhYdyw5EAtTUBQ== numOfRetries: 3 - -currentArtifactInstallationTimeout: 120 + diff --git a/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties b/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties new file mode 100644 index 0000000000..7361a3ccc4 --- /dev/null +++ b/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties @@ -0,0 +1,30 @@ +storage.backend=cql +storage.hostname=sdc-cs +storage.port=9042 +storage.username=asdc_user +storage.password=Aa1234%^! +storage.connection-timeout=20000 +storage.cql.keyspace=sdctitan + +storage.cql.ssl.enabled=false +storage.cql.ssl.keystore.location= +storage.cql.ssl.keystore.password= +storage.cql.ssl.truststore.location= +storage.cql.ssl.truststore.password= + +storage.cql.read-consistency-level=ONE +storage.cql.write-consistency-level=ALL +storage.cql.replication-strategy-class=NetworkTopologyStrategy +storage.cql.replication-strategy-options=SDC-CS-integration-test,1 +storage.cql.local-datacenter=SDC-CS-integration-test + + +cache.db-cache = true +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.5 + +cache.tx-cache-size = 1000000 + +storage.lock.retries=5 +graph.replace-instance-if-exists=true diff --git a/integration-tests/catalog-be-resources/init-script/check_backend.sh b/integration-tests/catalog-be-resources/init-script/check_backend.sh new file mode 100644 index 0000000000..cf7d6e4053 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/check_backend.sh @@ -0,0 +1,48 @@ +#!/bin/sh + + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +# Initialize optional flags as empty strings +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" +basic_auth_config="" + +# Set TLS configuration flags if using HTTPS +if [ "$protocol" = "https" ]; then + [ -n "$TLS_CERT" ] && tls_cert="--tls_cert $TLS_CERT" + [ -n "$TLS_KEY" ] && tls_key="--tls_key $TLS_KEY" + [ -n "$TLS_KEY_PW" ] && tls_key_pw="--tls_key_pw $TLS_KEY_PW" + [ -n "$CA_CERT" ] && ca_cert="--ca_cert $CA_CERT" +fi + + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdccheckbackend..." + +sdccheckbackend -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdccheckbackend." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh b/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh new file mode 100644 index 0000000000..3b7267c356 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +basic_auth_config="" + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + + +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" + +if [ "$protocol" = "https" ]; then + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +fi + +# Execute sdcuserinit command +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcuserinit..." + +sdcuserinit -i $BE_IP -p $be_port $basic_auth_config $user_conf_dir $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert +echo "sdcuserinit executed successfully." + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcconsumerinit..." +sdcconsumerinit -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdcuserinit and sdcconsumerinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/integration-tests/catalog-be-resources/init-script/import_normatives.sh b/integration-tests/catalog-be-resources/init-script/import_normatives.sh new file mode 100644 index 0000000000..e21e1b01b0 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/import_normatives.sh @@ -0,0 +1,65 @@ +#!/bin/sh + + +# Set protocol and port based on DISABLE_HTTP +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + be_port=$BE_HTTPS_PORT + param="-i $BE_IP -p $be_port --https" + + # Set TLS flags if certificates are provided + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +else + protocol="http" + be_port="$BE_HTTP_PORT" + param="-i $BE_IP -p $be_port" +fi + +# Set basic authentication if enabled +if [ "$BASIC_AUTH_ENABLED" = "true" ]; then + basic_auth_user="${BASIC_AUTH_USER:-}" + basic_auth_pass="${BASIC_AUTH_PASS:-}" + + if [ -n "$basic_auth_user" ] && [ -n "$basic_auth_pass" ]; then + basic_auth_config="--header $(echo -n "$basic_auth_user:$basic_auth_pass" | base64)" + else + basic_auth_config="" + fi +else + basic_auth_config="" +fi + +# Extract normatives tarball and run the initialization command +echo "Extracting normatives.tar.gz and initializing SDC..." +cd /var/tmp/ || exit 1 +cp /home/onap/normatives.tar.gz /var/tmp/ +tar -xvf /var/tmp/normatives.tar.gz + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcinit..." + +# Run sdcinit command with the constructed parameters +cd /var/tmp/normatives/import/tosca || exit 1 +sdcinit $param $basic_auth_config $tls_cert $tls_key $tls_key_pw $ca_cert > "/home/onap/logs/init.log" 2>&1 + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Done sdcinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" + +echo "SDC initialization Done. Logs can be found at ${ONAP_LOG}/init.log" + diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb b/integration-tests/catalog-be-resources/ready-probe.sh similarity index 72% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb rename to integration-tests/catalog-be-resources/ready-probe.sh index 6592943b8f..bb730ab272 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb +++ b/integration-tests/catalog-be-resources/ready-probe.sh @@ -1,5 +1,5 @@ #!/bin/sh -health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' <%= @protocol %>://127.0.0.1:<%= @port %>/sdc2/rest/healthCheck) +health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8080/sdc2/rest/healthCheck) if [ "$health_check_http_code" -eq 200 ]; then exit 0 diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb b/integration-tests/catalog-be-resources/resource/key.properties similarity index 97% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb rename to integration-tests/catalog-be-resources/resource/key.properties index 007a36e350..b6bf4b7e91 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-key.properties.erb +++ b/integration-tests/catalog-be-resources/resource/key.properties @@ -33,9 +33,9 @@ # # ============LICENSE_END============================================ # -# +# ### # Properties read by the ECOMP Framework library (epsdk-fw) -cipher.enc.key = <%= @cipher_key %> \ No newline at end of file +cipher.enc.key = AGLDdG4D04BKm2IxIWEr8o== diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb b/integration-tests/catalog-be-resources/resource/portal.properties similarity index 90% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb rename to integration-tests/catalog-be-resources/resource/portal.properties index 159a6cce15..888ce76a68 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb +++ b/integration-tests/catalog-be-resources/resource/portal.properties @@ -64,10 +64,10 @@ role_access_centralized = remote csp_gate_keeper_prod_key = PROD # URL of the Portal where this app is onboarded -ecomp_redirect_url = <%= @ecomp_redirect_url %> +ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm # URL of the ECOMP Portal REST API -ecomp_rest_url = <%= @ecomp_rest_url %> +ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi # Connection and Read timeout values ext_req_connection_timeout = 15000 @@ -77,9 +77,9 @@ ext_req_read_timeout = 20000 portal.api.impl.class = org.openecomp.sdc.be.ecomp.PortalRestApiCentralServiceImpl #Portal user & key -portal_app_name = <%= @portal_app_name %> -portal_pass = <%= @ecomp_portal_pass %> -portal_user = <%= @ecomp_portal_user %> +portal_app_name = Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA= +portal_pass = j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI= +portal_user = Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA= # UEB key generated while on-boarding diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/http-ini.erb b/integration-tests/catalog-be-resources/start.d/http.ini similarity index 93% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/http-ini.erb rename to integration-tests/catalog-be-resources/start.d/http.ini index 8f2669032b..555c1dd204 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/http-ini.erb +++ b/integration-tests/catalog-be-resources/start.d/http.ini @@ -1,6 +1,6 @@ # --------------------------------------- # Module: http -<%= @http_option %> +--module=http ### HTTP Connector Configuration @@ -8,7 +8,7 @@ # jetty.http.host=0.0.0.0 ## Connector port to listen on -jetty.http.port=<%= @http_port %> +jetty.http.port=8080 ## Connector idle timeout in milliseconds jetty.http.idleTimeout=30000 diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/https-ini.erb b/integration-tests/catalog-be-resources/start.d/https.ini similarity index 95% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/https-ini.erb rename to integration-tests/catalog-be-resources/start.d/https.ini index 9999a4109b..bafdfddaa2 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/https-ini.erb +++ b/integration-tests/catalog-be-resources/start.d/https.ini @@ -8,7 +8,7 @@ # jetty.https.host=0.0.0.0 ## Connector port to listen on -jetty.https.port=<%= @https_port %> +jetty.https.port=8443 ## Connector idle timeout in milliseconds jetty.https.idleTimeout=30000 diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb b/integration-tests/catalog-be-resources/start.d/ssl.ini similarity index 72% rename from catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb rename to integration-tests/catalog-be-resources/start.d/ssl.ini index d3c8bc187c..46eb7f15c9 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ssl-ini.erb +++ b/integration-tests/catalog-be-resources/start.d/ssl.ini @@ -8,7 +8,7 @@ # jetty.ssl.host=0.0.0.0 ## Connector port to listen on -jetty.ssl.port=<%= @https_port %> +jetty.ssl.port=8443 ## Connector idle timeout in milliseconds # jetty.ssl.idleTimeout=30000 @@ -42,42 +42,27 @@ jetty.ssl.port=<%= @https_port %> ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html ## Keystore file path (relative to $jetty.base) -<% unless @keystore_path.nil? || @keystore_path.strip.empty? -%> -jetty.sslContext.keyStorePath=<%= @keystore_path %> -<% end -%> ## Truststore file path (relative to $jetty.base) -<% unless @truststore_path.nil? || @truststore_path.strip.empty? -%> -jetty.sslContext.trustStorePath=<%= @truststore_path %> -<% end -%> ## Keystore password -<% unless @keystore_password.nil? || @keystore_password.strip.empty? -%> -jetty.sslContext.keyStorePassword=<%= @keystore_password %> -<% end -%> ## Keystore type and provider # jetty.sslContext.keyStoreType=JKS # jetty.sslContext.keyStoreProvider= ## KeyManager password -<% unless @keystore_password.nil? || @keystore_password.strip.empty? -%> -jetty.sslContext.keyManagerPassword=<%= @keystore_password %> -<% end -%> ## Truststore password -# tp<%= @truststore_password %>end -# kp<%= @keystore_password %>end -<% unless @truststore_password.nil? || @truststore_password.strip.empty? -%> -jetty.sslContext.trustStorePassword=<%= @truststore_password %> -<% end -%> +# tpend +# kpend ## Truststore type and provider # jetty.sslContext.trustStoreType=JKS # jetty.sslContext.trustStoreProvider= ## whether client certificate authentication is required -jetty.sslContext.needClientAuth=<%= !@truststore_password.nil? && !@truststore_password.strip.empty? %> +jetty.sslContext.needClientAuth=false ## Whether client certificate authentication is desired # jetty.sslContext.wantClientAuth=false diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index f1752bc25a..15c691ef69 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -32,7 +32,7 @@ limitations under the License. org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT @@ -47,6 +47,7 @@ limitations under the License. asdc_user Aa1234%^! ${project.build.directory}/chef-config + ${project.build.directory}/catalog-be-resources ${project.build.directory}/plugins/sdc-be /tmp/sdc-integration-tests latest @@ -425,6 +426,63 @@ limitations under the License. + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-resources + prepare-package + + copy-resources + + + ${it.catalog.resource} + + + catalog-be-resources + + **/* + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + set-executable-permissions + prepare-package + + + + + + + + + + + + + + + run + + + + + + maven-resources-plugin @@ -455,6 +513,9 @@ limitations under the License. + + + copy-sdc-be-plugins pre-integration-test @@ -545,6 +606,10 @@ limitations under the License. + + + + org.codehaus.mojo wagon-maven-plugin @@ -774,7 +839,7 @@ limitations under the License. - + SdcSchemaFileImport successfully completed @@ -784,6 +849,7 @@ limitations under the License. + ${docker.namespace}/sdc-onboard-cassandra-init:${it.docker.version} sdc-cassandra-onboard-init @@ -818,6 +884,7 @@ limitations under the License. + ${docker.namespace}/sdc-onboard-backend:${it.docker.version} sdc-onboard-backend @@ -871,6 +938,7 @@ limitations under the License. + ${docker.namespace}/sdc-backend-all-plugins:${it.docker.version} sdc-backend @@ -892,14 +960,24 @@ limitations under the License. sdc-BE - - ${project.basedir}/integration-tests-init/BE-configuration.yaml.erb:/app/jetty/chef-solo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb - - ${it.chef.config}:/app/jetty/chef-solo/environments + + + + ${it.catalog.resource}/catalog-be/configuration.yaml:/app/jetty/config/catalog-be/configuration.yaml + ${it.catalog.resource}/catalog-be/distribution-engine-configuration.yaml:/app/jetty/config/catalog-be/distribution-engine-configuration.yaml + ${it.catalog.resource}/catalog-be/janusgraph.properties:/app/jetty/config/catalog-be/janusgraph.properties + ${it.catalog.resource}/resource/key.properties:/app/jetty/resources/key.properties + ${it.catalog.resource}/resource/portal.properties:/app/jetty/resources/portal.properties + ${it.catalog.resource}/start.d/http.ini:/app/jetty/start.d/http.ini + ${it.catalog.resource}/start.d/https.ini:/app/jetty/start.d/https.ini + ${it.catalog.resource}/start.d/ssl.ini:/app/jetty/start.d/ssl.ini + ${it.catalog.resource}/ready-probe.sh:/app/jetty/ready-probe.sh ${it.shared.volume}:/app/jetty/logs - + + ${project.basedir}/src/test/resources/cert/catalog-be:/app/jetty/onap/cert + @@ -926,28 +1004,44 @@ limitations under the License. + ${docker.namespace}/sdc-backend-init:${it.docker.version} sdc-backend-init + + ${project.basedir}/../catalog-be/sdc-backend-init + sdc-backend ${it.env.name} + false + 8080 + 8443 + sdc-BE + true + testName + testPass + "" + "" + "" + "" sdc-BE-init - - ${it.chef.config}:/home/onap/chef-solo/environments - ${it.shared.volume}:/home/onap/logs + /bin/sh -c "/home/onap/check_backend.sh" + /bin/sh -c "/home/onap/create_consumer_and_user.sh" + /bin/sh -c "/home/onap/import_normatives.sh" + - Chef Client finished + Done custom @@ -956,7 +1050,9 @@ limitations under the License. - + + + ${docker.namespace}/sdc-frontend:${it.docker.version} sdc-frontend @@ -1157,6 +1253,7 @@ limitations under the License. + @@ -1331,3 +1428,4 @@ limitations under the License. + diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 454ea6e935..3d41b0bd23 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index 09d8754bfc..a64e246311 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc.onboarding action-library-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml index 26aa8d44f4..1406420062 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-types/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc.onboarding action-library-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml index 151cddecd1..ed574ac70a 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT /action-library-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml index 932c2b32ad..91b7425f98 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc application-config-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml index 1fe6c6ae38..a8bcebec3f 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-types/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc application-config-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml index e67aa32f59..c86fab0093 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml index 06bdbc35ed..c15853fee5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc conflict-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT conflict-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml index 27f58fb159..9105126c1c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc conflict-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT conflict-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml index abf543894d..8a4ccf408c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/pom.xml @@ -19,7 +19,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT conflict-rest diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml index 50ff961426..ac2be49bde 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/externaltesting-rest-services/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc.onboarding externaltesting-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml index 51be102932..a211d57ed5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/externaltesting-rest/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml index 97905ecb62..ae3af3351e 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc healthcheck-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT healthcheck-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml index aa9c9418a8..25b403f04f 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc healthcheck-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT healthcheck-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml index e39936028f..e9a234686a 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT healthcheck-rest diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml index 3747ea83b2..c1afc016b7 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-services/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc item-permissions-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT item-permissions-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml index a1e7c999b0..cc0bfce3b0 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml @@ -14,7 +14,7 @@ org.openecomp.sdc item-permissions-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT item-permissions-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml index d8ff9ea736..abe879e20f 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT item-permissions-rest diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml index 09a36c2e80..4cf0abd493 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-services/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc item-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT item-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml index ead5f1655f..4dd9cb46cb 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc item-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT item-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml index 5b11424e56..64ead02598 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT item-rest diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml index c50f162de1..5fe9f49aab 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/metrics-rest/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT 4.0.0 diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index a08c34697b..886540828f 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml index b8d254cb42..291432554c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-services/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc notifications-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT notifications-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml index cebf93b267..203cf6924d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml @@ -14,7 +14,7 @@ org.openecomp.sdc notifications-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT notifications-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml index c5afc8eb94..173c154ce5 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT org.openecomp.sdc diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index d117c6e261..b4632dbc46 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index 9344fc889d..fa043ab591 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml index e7a8091857..1e382378ce 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-api - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml index c00a5646be..adc3bffe2b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT togglz-rest diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml index 46d7202d53..92f47c4e2c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc togglz-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT togglz-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml index 53549d524a..cb347e77e7 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc togglz-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT togglz-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml index dbe7932ee0..3b14ab85fb 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT unique-type-rest diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml index 04016f8fa2..be806ed9f4 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc unique-type-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT unique-type-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml index b5fab23bbd..61039e675c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-types/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc unique-type-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT unique-type-rest-types diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml index 7277e80d52..4c94cbf641 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml index ed65446ead..a608cb3f78 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-services/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc.onboarding validation-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml index 9f6512a05c..fe63d5044d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/validation-rest/validation-rest-types/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc.onboarding validation-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml index cc5ca3861c..828fe281ef 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 963e61385a..15965f4840 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc.onboarding vendor-license-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml index 6c71cf7423..ee3b504508 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc.onboarding vendor-license-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml index 210dfe9c2d..b95c3ccaae 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-rest-webapp - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml index 2ebc9ab5dc..0e4cc05261 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc.onboarding vendor-software-products-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml index 2a30216b82..0b4b2ba2e0 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc.onboarding vendor-software-products-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml index 8992563664..d0caef2af4 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc.onboarding vendor-software-products-rest - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/api/pom.xml b/openecomp-be/api/pom.xml index a3d44ee232..2122f1372c 100644 --- a/openecomp-be/api/pom.xml +++ b/openecomp-be/api/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml index 912bf69ccc..2d9c371924 100644 --- a/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-action-manager/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml index 163b89bfa5..a7b39bc98e 100644 --- a/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-activity-log-manager/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml index b2659c8714..c7c6b2f5d1 100644 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml index 9c61f5889a..4993c4cfe5 100644 --- a/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-conflict-manager/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-sdc-conflict-manager diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml index 9b83095d4f..e9c348e8cb 100644 --- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml @@ -23,7 +23,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-sdc-healthcheck-manager diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml index b7d4c81e55..1474019305 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-sdc-item-permissions-manager diff --git a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml index d19585c78f..837e91d21f 100644 --- a/openecomp-be/backend/openecomp-sdc-security-util/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-security-util/pom.xml @@ -5,7 +5,7 @@ backend org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT 4.0.0 diff --git a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml index 3e7776c8fb..482cd6454e 100644 --- a/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-validation-manager/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml index 993b51a9ab..7d1cdd4cf6 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml @@ -25,7 +25,7 @@ backend org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index 0b4ce0d786..babd77bcd0 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -28,7 +28,7 @@ org.openecomp.sdc backend - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/backend/pom.xml b/openecomp-be/backend/pom.xml index 0ac156419d..604d7e2353 100644 --- a/openecomp-be/backend/pom.xml +++ b/openecomp-be/backend/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/dist/pom.xml b/openecomp-be/dist/pom.xml index 18ef42e59e..f5db41e0ce 100644 --- a/openecomp-be/dist/pom.xml +++ b/openecomp-be/dist/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml index e128313712..3fe26a286c 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-docker-dist - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml index 2db4a663ba..6fec1e5c8d 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-docker-dist - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml index 641c07598d..8438cfb6d4 100644 --- a/openecomp-be/lib/openecomp-common-lib/pom.xml +++ b/openecomp-be/lib/openecomp-common-lib/pom.xml @@ -11,7 +11,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml index c66c18a9bc..a3bf74b6c6 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc openecomp-conflict-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-conflict-api diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml index 8def7698dc..27acd8e4ac 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml @@ -6,7 +6,7 @@ org.openecomp.sdc openecomp-conflict-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-conflict-lib/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/pom.xml index 0b82f30e46..d1cfd4992a 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/pom.xml +++ b/openecomp-be/lib/openecomp-conflict-lib/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-conflict-lib diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml index 4b509f5c6a..7aee24c0e8 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc.core openecomp-core-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml index 590d282bc1..2adc19f1ac 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-api/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc.core openecomp-facade-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml index e4361a8d8c..97efc7b510 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/pom.xml @@ -8,7 +8,7 @@ openecomp-facade-lib org.openecomp.sdc.core - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml index 8a55852f26..1ee654d1eb 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/pom.xml @@ -9,7 +9,7 @@ openecomp-core-lib org.openecomp.sdc.core - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml index cbcf6f3ea5..fd6670e97b 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/pom.xml @@ -24,7 +24,7 @@ openecomp-nosqldb-lib org.openecomp.sdc.core - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml index 11cd98e2b1..8ce4181662 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml @@ -25,7 +25,7 @@ openecomp-nosqldb-lib org.openecomp.sdc.core - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml index 7142b95d6d..6648d7309c 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/pom.xml @@ -9,7 +9,7 @@ openecomp-core-lib org.openecomp.sdc.core - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml index d21475bf36..49575326c1 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-session-lib/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc.core openecomp-core-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-session-lib diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml index 872ea1c53f..89cdaaaa0a 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml @@ -25,7 +25,7 @@ openecomp-core-lib org.openecomp.sdc.core - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml index f6cd227819..9ade32ba53 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc.core openecomp-zusammen-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml index c732d00c92..4c100befe8 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc.core openecomp-zusammen-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml index ef5afadb89..c0a2920cba 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc.core openecomp-core-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-core-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/pom.xml index 83ffe39663..b8db19dc40 100644 --- a/openecomp-be/lib/openecomp-core-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml index 5690d765d7..672eb0484c 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-healing-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml index 901ef6126c..31dacc1883 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc openecomp-healing-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml index cea8e8f0b8..41f7cb3f59 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc openecomp-healing-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-healing-lib/pom.xml b/openecomp-be/lib/openecomp-healing-lib/pom.xml index 0a760fe444..42ca1e2df1 100644 --- a/openecomp-be/lib/openecomp-healing-lib/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index 9da3271214..6fb7e5d642 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -26,7 +26,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml index abd9dd2ce9..a77847155a 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc openecomp-item-permissions-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-item-permissions-api diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 93584fb2c5..6b33f2263a 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc openecomp-item-permissions-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-item-permissions-core diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml index 79a4e289d9..45d99fef63 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-impl/pom.xml @@ -6,7 +6,7 @@ org.openecomp.sdc openecomp-item-permissions-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-item-permissions-impl diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml index 6e271b59ee..ffa0cddfcf 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/pom.xml @@ -7,7 +7,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-item-permissions-lib diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml index 13eea00152..0987806088 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-action-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml index b0b71898c9..5e37100287 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-core/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-action-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml index a2b0285ff0..3ab89d6e8c 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-action-lib/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml index 6561037b85..5f4085cbad 100644 --- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-activity-log-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml index e849b12ae6..96b8d779c0 100644 --- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-activity-log-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml index 6b87e03863..8393460361 100644 --- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml index 925d98650f..1b5feeba20 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml @@ -24,7 +24,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml index 85eb14dcae..226c50c0a8 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc openecomp-sdc-enrichment-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index 26f8a7cb49..0cb6e48e85 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc openecomp-sdc-enrichment-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index bcf885c0d9..129d68883e 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc openecomp-sdc-enrichment-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml index cae9126069..adbbd541dc 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml index da590eb451..9bcb782999 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-externaltesting-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml index 71f4ecb3ee..2f29214a6b 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-impl/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-externaltesting-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml index 62ef25abc1..785de9f1e5 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml index dd620c0020..b7b963f356 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-logging-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml index 0a1a580d70..78448420be 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-logging-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml index 3686c74573..b35e5ab97a 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-spring/pom.xml @@ -22,7 +22,7 @@ openecomp-sdc-logging-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT 4.0.0 diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml index f30ec67f1d..ceb8c43ca4 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/pom.xml @@ -11,7 +11,7 @@ org.openecomp.sdc openecomp-sdc-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml index 4782c956c1..54ccc227c9 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-model-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml index a9b3be7e8e..615e163e4e 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-model-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml index 03bf172453..b3ea1e01da 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml index 0e3a32db56..5bab4e68c7 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-api/pom.xml @@ -23,7 +23,7 @@ org.openecomp.sdc openecomp-sdc-notification-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml index ad3ff4ca20..24ec2b1b23 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-notification-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml index b09725e6a4..4cf97b517a 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-websocket/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-notification-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml index 1d5d1f0d6f..2172ede92d 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-notification-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml index c641aa1c93..9b73949e0d 100644 --- a/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-notification-lib/pom.xml @@ -9,7 +9,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml index df8d01d3a0..b9f567b444 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-tosca-generator-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml index da80ec4495..42be536d1b 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-tosca-generator-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml index b2710d66a7..8698b2af74 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/pom.xml @@ -9,7 +9,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml index 6e9f22170a..67e147e8d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-translator-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index eb0e9f3fde..87b8eb48ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-translator-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml index 8e3dcddc2e..0cf5518d9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml index 015a0b99c1..407b5066bf 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-api/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-validation-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index b19b02affe..4b384a6adf 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -26,7 +26,7 @@ org.openecomp.sdc openecomp-sdc-validation-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml index c49d01ae48..58334a4714 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml @@ -27,7 +27,7 @@ org.openecomp.sdc openecomp-sdc-validation-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml index 5c63c2205e..356f60ca92 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc openecomp-sdc-validation-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml index 8d2681813b..be3c1b2e27 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml index d0eb48e25b..f2a0f95507 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc openecomp-sdc-vendor-license-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml index aaecf56906..3330f3ec9a 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-vendor-license-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml index eecc2d9ec5..857440f4db 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/pom.xml @@ -9,7 +9,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml index 9fe9603253..a2bb06ccb5 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-vendor-software-product-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-sdc-vendor-software-product-api diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml index abe3dec23c..7b0e0ea511 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml @@ -25,7 +25,7 @@ org.openecomp.sdc openecomp-sdc-vendor-software-product-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml index f44bdfa8a7..bdbb258880 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/pom.xml @@ -9,7 +9,7 @@ org.openecomp.sdc openecomp-sdc-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml index 16397f17ec..2586516554 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-api/pom.xml @@ -24,7 +24,7 @@ org.openecomp.sdc openecomp-sdc-versioning-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml index 0db447e4e9..5f9d8df472 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc openecomp-sdc-versioning-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml index d62ca2e7ce..d3bc47f6ed 100644 --- a/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/pom.xml @@ -10,7 +10,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml index 710f7a4ef8..774580be45 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml @@ -14,7 +14,7 @@ org.openecomp.sdc openecomp-tosca-converter-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-tosca-converter-api diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml index 2bd3efcd9e..80fbd9d790 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml @@ -56,7 +56,7 @@ org.openecomp.sdc openecomp-tosca-converter-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-tosca-converter-core diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml index 9be44097e1..be082e47ed 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml @@ -7,7 +7,7 @@ org.openecomp.sdc openecomp-sdc-lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT openecomp-tosca-converter-lib diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 6d773d130f..f6c243f811 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -26,7 +26,7 @@ openecomp-sdc-lib org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/lib/pom.xml b/openecomp-be/lib/pom.xml index 9bd8adadba..c3720b88f8 100644 --- a/openecomp-be/lib/pom.xml +++ b/openecomp-be/lib/pom.xml @@ -9,7 +9,7 @@ openecomp-sdc org.openecomp.sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index 20b9c9e473..c5acd3ef40 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -28,7 +28,7 @@ org.openecomp.sdc sdc-onboarding - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT ../onboarding/pom.xml diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 59bcac02f7..0d6aaca650 100644 --- a/openecomp-be/tools/swagger-ui/pom.xml +++ b/openecomp-be/tools/swagger-ui/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdc openecomp-sdc - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT ../../ diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 7eedc6435d..eefbd82476 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -27,7 +27,7 @@ org.openecomp.sdc openecomp-sdc-lib ../../lib - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml index 33f2ea1faf..e94a0d6abd 100644 --- a/openecomp-ui/pom.xml +++ b/openecomp-ui/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc sdc-onboarding - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT ../onboarding diff --git a/pom.xml b/pom.xml index a93772cac5..2cd38e0d22 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ Modifications copyright (c) 2018-2019 Nokia org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT pom sdc diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index cc37a2ab61..324c3ceaad 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index 79e64ccad3..9c79bd790e 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -10,7 +10,7 @@ org.openecomp.sdc sdc-main - 1.13.7-SNAPSHOT + 1.13.8-SNAPSHOT ../../ -- 2.16.6