From 30ec390479c9b7eeeaa90f036be02162c29ae918 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 14 Sep 2021 12:32:24 +0200 Subject: [PATCH] [COMMON] Add and run pre-commit linters via tox - create a .pre-commit-config.yaml configuration file with * gitlint * trailing blanks linter * tabs removal linter - exclude .git folder from it - exclude Makefiles since tabs are mandatory by default in them - create a tox pre-commit profile to run it from tox note gitlint is not runnable at this pre-commit stage - create pre-commit-install and pre-commit-uninstall tox profiles to (un)install hooks locally and (un)perform tests at each "git commit" call (i.e. without calling manually the pre-commit tox profile) - precise pre-commit stages/types in the pre-commit configuration file so that hooks are installed correctly. This avoids messages about skipped tests when they are run at a wrong stage. Issue-ID: OOM-2643 Signed-off-by: guillaume.lambert Change-Id: Ie95bb4f6f90be80b05a1398973caffeff7936881 --- .pre-commit-config.yaml | 18 + docs/helm-search.txt | 82 ++-- kubernetes/a1policymanagement/values.yaml | 2 +- .../aai-babel/resources/config/logback.xml | 20 +- .../aai-babel/resources/config/tosca-mappings.json | 382 +++++++-------- .../resources/config/localhost-access-logback.xml | 28 +- .../aai-graphadmin/resources/config/logback.xml | 58 +-- .../resources/config/log/logback.xml | 10 +- .../config/localhost-access-logback.xml | 28 +- .../aai-traversal/resources/config/logback.xml | 10 +- .../resources/config/RestServer_config | 26 +- .../onap/appc/data/properties/aaiclient.properties | 4 +- .../opt/onap/appc/data/properties/appc.properties | 14 +- .../opt/onap/appc/data/properties/cadi.properties | 4 +- .../ccsdk/data/properties/aaiclient.properties | 4 +- kubernetes/appc/templates/statefulset.yaml | 2 +- kubernetes/common/postgres/configs/setup.sql | 6 +- .../certs/client-cert-onap.crt.pem | 2 +- .../certs/client-cert-onap.key.pem | 2 +- .../config/initializers/custom_fields.yml | 4 +- .../dns-server-for-vhost-ingress-testing/README.md | 8 +- .../templates/_deployment.tpl | 2 +- .../external/schemas/sa91-rel16/5gcNrm.yaml | 16 +- .../schemas/sa91-rel16/FileDataReportingMnS.yaml | 2 +- .../external/schemas/sa91-rel16/comDefs.yaml | 2 +- .../external/schemas/sa91-rel16/faultMnS.yaml | 10 +- .../external/schemas/sa91-rel16/genericNrm.yaml | 22 +- .../external/schemas/sa91-rel16/nrNrm.yaml | 28 +- .../external/schemas/sa91-rel16/perfMnS.yaml | 2 +- .../external/schemas/sa91-rel16/sliceNrm.yaml | 12 +- .../components/dcae-cloudify-manager/README.md | 14 +- .../resources/log4js/log4js.json | 60 +-- kubernetes/dmaap/components/dmaap-bc/README.md | 2 +- kubernetes/helm/plugins/deploy/plugin.yaml | 4 +- kubernetes/helm/plugins/undeploy/plugin.yaml | 4 +- .../resources/config/onap-pipeline.conf | 6 +- .../modeling-etsicatalog/templates/service.yaml | 4 +- .../msb-discovery/resources/config/logback.xml | 4 +- .../msb-eag/resources/config/logback.xml | 4 +- .../msb-iag/resources/config/logback.xml | 4 +- .../prometheus-alertmanager/templates/service.yaml | 2 +- .../properties/ONAPPORTAL/fusion.properties | 2 +- .../deliveries/properties/ONAPPORTAL/logback.xml | 516 ++++++++++----------- .../properties/ONAPPORTAL/system.properties | 26 +- .../components/portal-app/resources/server/web.xml | 234 +++++----- .../docker-entrypoint-initdb.d/portal_single.cql | 4 +- .../properties/ONAPPORTALSDK/portal.properties | 2 +- .../properties/ONAPPORTALSDK/system.properties | 8 +- .../robot/resources/config/lighttpd/ssl/README.TXT | 2 +- .../sdc-be/resources/config/logging/logback.xml | 6 +- .../resources/config/logging/logback.xml | 6 +- ...g.opendaylight.controller.cluster.datastore.cfg | 2 +- kubernetes/sdnc/resources/config/conf/setenv | 2 +- .../sdnc/resources/geo/bin/sdnc.isPrimaryCluster | 10 +- kubernetes/sniro-emulator/templates/NOTES.txt | 2 +- .../db-sql-scripts/mariadb_engine_7.14.0.sql | 6 +- .../config/log/logback.apihandler-infra.xml | 44 +- .../so/resources/config/log/logback.appc.xml | 44 +- .../so/resources/config/log/logback.asdc.xml | 44 +- .../so/resources/config/log/logback.bpmn.xml | 2 +- .../config/log/logback.msorequestsdbadapter.xml | 44 +- .../so/resources/config/log/logback.network.xml | 46 +- .../so/resources/config/log/logback.sdnc.xml | 42 +- .../so/resources/config/log/logback.tenant.xml | 46 +- kubernetes/so/resources/config/log/logback.vfc.xml | 44 +- kubernetes/so/resources/config/log/logback.vnf.xml | 46 +- kubernetes/so/templates/NOTES.txt | 4 +- kubernetes/uui/components/uui-server/values.yaml | 2 +- .../vid/resources/config/log/vid/logback.xml | 40 +- tox.ini | 27 ++ 70 files changed, 1117 insertions(+), 1104 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..6bfce7af6c --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,18 @@ +--- +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.0.1 + hooks: + - id: trailing-whitespace + #exclude: '^ordmodels/' + - repo: https://github.com/jorisroovers/gitlint + rev: v0.15.1 + hooks: + - id: gitlint + stages: [commit-msg] + - repo: https://github.com/Lucas-C/pre-commit-hooks + rev: v1.1.10 + hooks: + - id: remove-tabs + stages: [commit] + exclude: '^(.git/|docs/make.bat|.*/Makefile$)' diff --git a/docs/helm-search.txt b/docs/helm-search.txt index 7fa7621e30..66fddcf869 100644 --- a/docs/helm-search.txt +++ b/docs/helm-search.txt @@ -1,41 +1,41 @@ -NAME CHART VERSION APP VERSION DESCRIPTION -local/onap 8.0.0 Honolulu Open Network Automation Platform (ONAP) -local/aaf 8.0.0 ONAP Application Authorization Framework -local/aai 8.0.0 ONAP Active and Available Inventory -local/appc 8.0.0 Application Controller -local/cassandra 8.0.0 ONAP cassandra -local/cds 8.0.0 ONAP Controller Design Studio (CDS) -local/clamp 8.0.0 ONAP Clamp -local/cli 8.0.0 ONAP Command Line Interface -local/common 8.0.0 Common templates for inclusion in other charts -local/consul 8.0.0 ONAP Consul Agent -local/contrib 8.0.0 ONAP optional tools -local/cps 8.0.0 ONAP Configuration Persistene Service (CPS) -local/dcaegen2 8.0.0 ONAP DCAE Gen2 -local/dgbuilder 8.0.0 D.G. Builder application -local/dmaap 8.0.0 ONAP DMaaP components -local/log 8.0.0 ONAP Logging ElasticStack -local/mariadb-galera 8.0.0 Chart for MariaDB Galera cluster -local/mongo 8.0.0 MongoDB Server -local/msb 8.0.0 ONAP MicroServices Bus -local/multicloud 8.0.0 ONAP multicloud broker -local/music 8.0.0 MUSIC - Multi-site State Coordination Service -local/mysql 8.0.0 MySQL Server -local/nbi 8.0.0 ONAP Northbound Interface -local/network-name-gen 8.0.0 Name Generation Micro Service -local/nfs-provisioner 8.0.0 NFS provisioner -local/oof 8.0.0 ONAP Optimization Framework -local/policy 8.0.0 ONAP Policy Administration Point -local/pomba 8.0.0 ONAP Post Orchestration Model Based Audit -local/portal 8.0.0 ONAP Web Portal -local/postgres 8.0.0 ONAP Postgres Server -local/robot 8.0.0 A helm Chart for kubernetes-ONAP Robot -local/sdc 8.0.0 Service Design and Creation Umbrella Helm charts -local/sdnc 8.0.0 SDN Controller -local/sdnc-prom 8.0.0 ONAP SDNC Policy Driven Ownership Management -local/sniro-emulator 8.0.0 ONAP Mock Sniro Emulator -local/so 8.0.0 ONAP Service Orchestrator -local/uui 8.0.0 ONAP uui -local/vfc 8.0.0 ONAP Virtual Function Controller (VF-C) -local/vid 8.0.0 ONAP Virtual Infrastructure Deployment -local/vnfsdk 8.0.0 ONAP VNF SDK +NAME CHART VERSION APP VERSION DESCRIPTION +local/onap 8.0.0 Honolulu Open Network Automation Platform (ONAP) +local/aaf 8.0.0 ONAP Application Authorization Framework +local/aai 8.0.0 ONAP Active and Available Inventory +local/appc 8.0.0 Application Controller +local/cassandra 8.0.0 ONAP cassandra +local/cds 8.0.0 ONAP Controller Design Studio (CDS) +local/clamp 8.0.0 ONAP Clamp +local/cli 8.0.0 ONAP Command Line Interface +local/common 8.0.0 Common templates for inclusion in other charts +local/consul 8.0.0 ONAP Consul Agent +local/contrib 8.0.0 ONAP optional tools +local/cps 8.0.0 ONAP Configuration Persistene Service (CPS) +local/dcaegen2 8.0.0 ONAP DCAE Gen2 +local/dgbuilder 8.0.0 D.G. Builder application +local/dmaap 8.0.0 ONAP DMaaP components +local/log 8.0.0 ONAP Logging ElasticStack +local/mariadb-galera 8.0.0 Chart for MariaDB Galera cluster +local/mongo 8.0.0 MongoDB Server +local/msb 8.0.0 ONAP MicroServices Bus +local/multicloud 8.0.0 ONAP multicloud broker +local/music 8.0.0 MUSIC - Multi-site State Coordination Service +local/mysql 8.0.0 MySQL Server +local/nbi 8.0.0 ONAP Northbound Interface +local/network-name-gen 8.0.0 Name Generation Micro Service +local/nfs-provisioner 8.0.0 NFS provisioner +local/oof 8.0.0 ONAP Optimization Framework +local/policy 8.0.0 ONAP Policy Administration Point +local/pomba 8.0.0 ONAP Post Orchestration Model Based Audit +local/portal 8.0.0 ONAP Web Portal +local/postgres 8.0.0 ONAP Postgres Server +local/robot 8.0.0 A helm Chart for kubernetes-ONAP Robot +local/sdc 8.0.0 Service Design and Creation Umbrella Helm charts +local/sdnc 8.0.0 SDN Controller +local/sdnc-prom 8.0.0 ONAP SDNC Policy Driven Ownership Management +local/sniro-emulator 8.0.0 ONAP Mock Sniro Emulator +local/so 8.0.0 ONAP Service Orchestrator +local/uui 8.0.0 ONAP uui +local/vfc 8.0.0 ONAP Virtual Function Controller (VF-C) +local/vid 8.0.0 ONAP Virtual Infrastructure Deployment +local/vnfsdk 8.0.0 ONAP VNF SDK diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml index 4768349736..5c9c32186a 100644 --- a/kubernetes/a1policymanagement/values.yaml +++ b/kubernetes/a1policymanagement/values.yaml @@ -21,7 +21,7 @@ global: nodePortPrefix: 302 persistence: {} - + secrets: - uid: controller-secret type: basicAuth diff --git a/kubernetes/aai/components/aai-babel/resources/config/logback.xml b/kubernetes/aai/components/aai-babel/resources/config/logback.xml index 878d8c05d0..c29da77d84 100644 --- a/kubernetes/aai/components/aai-babel/resources/config/logback.xml +++ b/kubernetes/aai/components/aai-babel/resources/config/logback.xml @@ -28,20 +28,20 @@ + value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%.-5level|%logger|%mdc{ClassName}|%msg%n" /> + value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" /> + value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{BeginTimestamp}|%mdc{EndTimestamp}|%mdc{RequestId}|%mdc{ServiceInstanceId}|%thread|%mdc{ServerFQDN}|%mdc{ServiceName}|%mdc{PartnerName}|%mdc{TargetEntity}|%mdc{TargetServiceName}|%mdc{StatusCode}|%mdc{ResponseCode}|%mdc{ResponseDescription}|%logger|%.-5level|||%mdc{ElapsedTime}|%mdc{RemoteHost}|%mdc{ClientAddress}|%mdc{ClassName}|||%msg%n" /> + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${generalLogName}.log ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip @@ -66,7 +66,7 @@ from other components, or it can be eliminated to record these events as part of the application root log. --> + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${auditLogName}.log ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip @@ -83,7 +83,7 @@ + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${metricsLogName}.log ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip @@ -101,7 +101,7 @@ + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${debugLogName}.log @@ -119,9 +119,9 @@ - - e.level.toInt() < INFO.toInt() - + + e.level.toInt() < INFO.toInt() + DENY NEUTRAL diff --git a/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json b/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json index fa3a9c9952..65798e1972 100644 --- a/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json +++ b/kubernetes/aai/components/aai-babel/resources/config/tosca-mappings.json @@ -1,193 +1,193 @@ { - "instanceGroupTypes": [ - "org.openecomp.groups.NetworkCollection", - "org.openecomp.groups.VfcInstanceGroup", - "org.openecomp.groups.ResourceInstanceGroup" - ], - "widgetTypes": [ - { - "type": "SERVICE", - "name": "service-instance", - "deleteFlag": true, - "modelVersionId": "46b92144-923a-4d20-b85a-3cbd847668a9", - "modelInvariantId": "82194af1-3c2c-485a-8f44-420e22a9eaa4" - }, - { - "type": "VF", - "name": "generic-vnf", - "deleteFlag": true, - "modelVersionId": "93a6166f-b3d5-4f06-b4ba-aed48d009ad9", - "modelInvariantId": "acc6edd8-a8d4-4b93-afaa-0994068be14c" - }, - { - "type": "VFC", - "name": "vnfc", - "deleteFlag": true, - "modelVersionId": "5761e0a7-c6df-4d8a-9ebd-b8f445054dec", - "modelInvariantId": "96129eb9-f0de-4e05-8af2-73146473f766" - }, - { - "type": "VSERVER", - "name": "vserver", - "deleteFlag": true, - "modelVersionId": "8ecb2c5d-7176-4317-a255-26274edfdd53", - "modelInvariantId": "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7" - }, - { - "type": "VOLUME", - "name": "volume", - "deleteFlag": true, - "modelVersionId": "0fbe2e8f-4d91-4415-a772-88387049b38d", - "modelInvariantId": "ddd739b4-2b25-46c4-affc-41a32af5cc42" - }, - { - "type": "FLAVOR", - "name": "flavor", - "deleteFlag": false, - "modelVersionId": "36200fb5-f251-4f5d-a520-7c5ad5c2cd4b", - "modelInvariantId": "bace8d1c-a261-4041-9e37-823117415d0f" - }, - { - "type": "TENANT", - "name": "tenant", - "deleteFlag": false, - "modelVersionId": "abcc54bc-bb74-49dc-9043-7f7171707545", - "modelInvariantId": "97c26c99-6870-44c1-8a07-1d900d3f4ce6" - }, - { - "type": "VOLUME_GROUP", - "name": "volume-group", - "deleteFlag": true, - "modelVersionId": "99d44c90-1f61-4418-b9a6-56586bf38c79", - "modelInvariantId": "fcec1b02-b2d0-4834-aef8-d71be04717dd" - }, - { - "type": "LINT", - "name": "l-interface", - "deleteFlag": true, - "modelVersionId": "a32613fd-18b9-459e-aab8-fffb3912966a", - "modelInvariantId": "cea0a982-8d55-4093-921e-418fbccf7060" - }, - { - "type": "L3_NET", - "name": "l3-network", - "deleteFlag": true, - "modelVersionId": "9111f20f-e680-4001-b83f-19a2fc23bfc1", - "modelInvariantId": "3d560d81-57d0-438b-a2a1-5334dba0651a" - }, - { - "type": "VFMODULE", - "name": "vf-module", - "deleteFlag": true, - "modelVersionId": "c00563ae-812b-4e62-8330-7c4d0f47088a", - "modelInvariantId": "ef86f9c5-2165-44f3-8fc3-96018b609ea5" - }, - { - "type": "IMAGE", - "name": "image", - "deleteFlag": false, - "modelVersionId": "f6a038c2-820c-42ba-8c2b-375e24e8f932", - "modelInvariantId": "3f4c7204-739b-4bbb-87a7-8a6856439c90" - }, - { - "type": "OAM_NETWORK", - "name": "oam-network", - "deleteFlag": true, - "modelVersionId": "f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79", - "modelInvariantId": "2851cf01-9c40-4064-87d4-6184a6fcff35" - }, - { - "type": "ALLOTTED_RESOURCE", - "name": "allotted-resource", - "deleteFlag": true, - "modelVersionId": "7ad0915f-25c0-4a70-b9bc-185a75f87564", - "modelInvariantId": "f6d6a23d-a1a9-48ff-8419-b6530da2d381" - }, - { - "type": "TUNNEL_XCONNECT", - "name": "tunnel-xconnect", - "deleteFlag": true, - "modelVersionId": "e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5", - "modelInvariantId": "50b9e2fa-005c-4bbe-b651-3251dece4cd8" - }, - { - "type": "CONFIGURATION", - "name": "configuration", - "deleteFlag": true, - "modelVersionId": "5a175add-57e4-4a5d-8b02-c36f1d69c52b", - "modelInvariantId": "166c050d-f69d-4305-943e-0bc58c3a26cf" - }, - { - "type": "CR", - "name": "cr", - "deleteFlag": true, - "modelVersionId": "3f908abc-3a15-40d0-b674-2a639e52884d", - "modelInvariantId": "8bac3599-9a1c-4b7f-80e5-c1838f744c23" - }, - { - "type": "INSTANCE_GROUP", - "name": "instance-group", - "deleteFlag": true, - "modelVersionId": "8e6ee9dc-9017-444a-83b3-219edb018128", - "modelInvariantId": "3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd" - }, - { - "type": "PNF", - "name": "pnf", - "deleteFlag": true, - "modelVersionId": "e9f1fa7d-c839-418a-9601-03dc0d2ad687", - "modelInvariantId": "862b25a1-262a-4961-bdaa-cdc55d69785a" - } - ], - "widgetMappings": [ - { - "prefix": "org.openecomp.resource.vfc", - "type": "widget", - "widget": "VSERVER", - "deleteFlag": true - }, - { - "prefix": "org.openecomp.resource.cp", - "type": "widget", - "widget": "LINT", - "deleteFlag": true - }, - { - "prefix": "org.openecomp.cp", - "type": "widget", - "widget": "LINT", - "deleteFlag": true - }, - { - "prefix": "org.openecomp.resource.vl", - "widget": "L3_NET", - "deleteFlag": false - }, - { - "prefix": "org.openecomp.resource.vf", - "widget": "VF", - "deleteFlag": true - }, - { - "prefix": "org.openecomp.groups.vfmodule", - "widget": "VFMODULE", - "deleteFlag": true - }, - { - "prefix": "org.openecomp.groups.VfModule", - "widget": "VFMODULE", - "deleteFlag": true - }, - { - "prefix": "org.openecomp.resource.vfc.nodes.heat.cinder", - "type": "widget", - "widget": "VOLUME", - "deleteFlag": true - }, - { - "prefix": "org.openecomp.resource.pnf", - "widget": "PNF", - "deleteFlag": true - } - ] + "instanceGroupTypes": [ + "org.openecomp.groups.NetworkCollection", + "org.openecomp.groups.VfcInstanceGroup", + "org.openecomp.groups.ResourceInstanceGroup" + ], + "widgetTypes": [ + { + "type": "SERVICE", + "name": "service-instance", + "deleteFlag": true, + "modelVersionId": "46b92144-923a-4d20-b85a-3cbd847668a9", + "modelInvariantId": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "type": "VF", + "name": "generic-vnf", + "deleteFlag": true, + "modelVersionId": "93a6166f-b3d5-4f06-b4ba-aed48d009ad9", + "modelInvariantId": "acc6edd8-a8d4-4b93-afaa-0994068be14c" + }, + { + "type": "VFC", + "name": "vnfc", + "deleteFlag": true, + "modelVersionId": "5761e0a7-c6df-4d8a-9ebd-b8f445054dec", + "modelInvariantId": "96129eb9-f0de-4e05-8af2-73146473f766" + }, + { + "type": "VSERVER", + "name": "vserver", + "deleteFlag": true, + "modelVersionId": "8ecb2c5d-7176-4317-a255-26274edfdd53", + "modelInvariantId": "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7" + }, + { + "type": "VOLUME", + "name": "volume", + "deleteFlag": true, + "modelVersionId": "0fbe2e8f-4d91-4415-a772-88387049b38d", + "modelInvariantId": "ddd739b4-2b25-46c4-affc-41a32af5cc42" + }, + { + "type": "FLAVOR", + "name": "flavor", + "deleteFlag": false, + "modelVersionId": "36200fb5-f251-4f5d-a520-7c5ad5c2cd4b", + "modelInvariantId": "bace8d1c-a261-4041-9e37-823117415d0f" + }, + { + "type": "TENANT", + "name": "tenant", + "deleteFlag": false, + "modelVersionId": "abcc54bc-bb74-49dc-9043-7f7171707545", + "modelInvariantId": "97c26c99-6870-44c1-8a07-1d900d3f4ce6" + }, + { + "type": "VOLUME_GROUP", + "name": "volume-group", + "deleteFlag": true, + "modelVersionId": "99d44c90-1f61-4418-b9a6-56586bf38c79", + "modelInvariantId": "fcec1b02-b2d0-4834-aef8-d71be04717dd" + }, + { + "type": "LINT", + "name": "l-interface", + "deleteFlag": true, + "modelVersionId": "a32613fd-18b9-459e-aab8-fffb3912966a", + "modelInvariantId": "cea0a982-8d55-4093-921e-418fbccf7060" + }, + { + "type": "L3_NET", + "name": "l3-network", + "deleteFlag": true, + "modelVersionId": "9111f20f-e680-4001-b83f-19a2fc23bfc1", + "modelInvariantId": "3d560d81-57d0-438b-a2a1-5334dba0651a" + }, + { + "type": "VFMODULE", + "name": "vf-module", + "deleteFlag": true, + "modelVersionId": "c00563ae-812b-4e62-8330-7c4d0f47088a", + "modelInvariantId": "ef86f9c5-2165-44f3-8fc3-96018b609ea5" + }, + { + "type": "IMAGE", + "name": "image", + "deleteFlag": false, + "modelVersionId": "f6a038c2-820c-42ba-8c2b-375e24e8f932", + "modelInvariantId": "3f4c7204-739b-4bbb-87a7-8a6856439c90" + }, + { + "type": "OAM_NETWORK", + "name": "oam-network", + "deleteFlag": true, + "modelVersionId": "f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79", + "modelInvariantId": "2851cf01-9c40-4064-87d4-6184a6fcff35" + }, + { + "type": "ALLOTTED_RESOURCE", + "name": "allotted-resource", + "deleteFlag": true, + "modelVersionId": "7ad0915f-25c0-4a70-b9bc-185a75f87564", + "modelInvariantId": "f6d6a23d-a1a9-48ff-8419-b6530da2d381" + }, + { + "type": "TUNNEL_XCONNECT", + "name": "tunnel-xconnect", + "deleteFlag": true, + "modelVersionId": "e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5", + "modelInvariantId": "50b9e2fa-005c-4bbe-b651-3251dece4cd8" + }, + { + "type": "CONFIGURATION", + "name": "configuration", + "deleteFlag": true, + "modelVersionId": "5a175add-57e4-4a5d-8b02-c36f1d69c52b", + "modelInvariantId": "166c050d-f69d-4305-943e-0bc58c3a26cf" + }, + { + "type": "CR", + "name": "cr", + "deleteFlag": true, + "modelVersionId": "3f908abc-3a15-40d0-b674-2a639e52884d", + "modelInvariantId": "8bac3599-9a1c-4b7f-80e5-c1838f744c23" + }, + { + "type": "INSTANCE_GROUP", + "name": "instance-group", + "deleteFlag": true, + "modelVersionId": "8e6ee9dc-9017-444a-83b3-219edb018128", + "modelInvariantId": "3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd" + }, + { + "type": "PNF", + "name": "pnf", + "deleteFlag": true, + "modelVersionId": "e9f1fa7d-c839-418a-9601-03dc0d2ad687", + "modelInvariantId": "862b25a1-262a-4961-bdaa-cdc55d69785a" + } + ], + "widgetMappings": [ + { + "prefix": "org.openecomp.resource.vfc", + "type": "widget", + "widget": "VSERVER", + "deleteFlag": true + }, + { + "prefix": "org.openecomp.resource.cp", + "type": "widget", + "widget": "LINT", + "deleteFlag": true + }, + { + "prefix": "org.openecomp.cp", + "type": "widget", + "widget": "LINT", + "deleteFlag": true + }, + { + "prefix": "org.openecomp.resource.vl", + "widget": "L3_NET", + "deleteFlag": false + }, + { + "prefix": "org.openecomp.resource.vf", + "widget": "VF", + "deleteFlag": true + }, + { + "prefix": "org.openecomp.groups.vfmodule", + "widget": "VFMODULE", + "deleteFlag": true + }, + { + "prefix": "org.openecomp.groups.VfModule", + "widget": "VFMODULE", + "deleteFlag": true + }, + { + "prefix": "org.openecomp.resource.vfc.nodes.heat.cinder", + "type": "widget", + "widget": "VOLUME", + "deleteFlag": true + }, + { + "prefix": "org.openecomp.resource.pnf", + "widget": "PNF", + "deleteFlag": true + } + ] } diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml index c84cb5a62f..449ea3032c 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml @@ -20,22 +20,22 @@ */}} --> - - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} - - - - %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - - - + + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} + + + + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + + + - + --> @@ -55,8 +55,8 @@ - %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} - + %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} + @@ -65,8 +65,7 @@ ${logDirectory}/rest/sane.log.%d{yyyy-MM-dd} - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n @@ -77,8 +76,7 @@ ${logDirectory}/rest/metrics.log - ${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd} - + ${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd} ${metricPattern} @@ -128,7 +126,7 @@ ${logDirectory}/rest/audit.log ${logDirectory}/rest/audit.log.%d{yyyy-MM-dd} - + ${auditPattern} @@ -147,8 +145,7 @@ ${logDirectory}/rest/translog.log - ${logDirectory}/rest/translog.log.%d{yyyy-MM-dd} - + ${logDirectory}/rest/translog.log.%d{yyyy-MM-dd} ${transLogPattern} @@ -165,8 +162,7 @@ ${logDirectory}/dmaapAAIEventConsumer/error.log - ${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd} - + ${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd} ${"errorPattern"} @@ -195,8 +191,7 @@ ${logDirectory}/dmaapAAIEventConsumer/debug.log - ${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd} - + ${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd} ${debugPattern} @@ -211,7 +206,7 @@ ${logDirectory}/dmaapAAIEventConsumer/metrics.log ${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd} - + ${metricPattern} @@ -224,7 +219,7 @@ ${logDirectory}/external/external.log ${logDirectory}/external/external.log.%d{yyyy-MM-dd} - + ${debugPattern} @@ -749,8 +744,7 @@ - + @@ -770,8 +764,7 @@ - + @@ -789,11 +782,9 @@ - ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log - + ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log - ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip - + ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip 1 9 @@ -806,11 +797,9 @@ - ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log - + ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log - ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip - + ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip 1 9 @@ -827,8 +816,7 @@ ${logDirectory}/auth/auth.log - ${logDirectory}/auth/auth.log.%d{yyyy-MM-dd} - + ${logDirectory}/auth/auth.log.%d{yyyy-MM-dd} %d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml index 3c12026407..cd36e799d6 100644 --- a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml +++ b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml @@ -27,7 +27,7 @@ + value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|ModelLoader|%mdc{PartnerName}|%logger||%.-5level|%msg%n" /> @@ -47,7 +47,7 @@ log --> + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${generalLogName}.log ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip @@ -67,7 +67,7 @@ + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${auditLogName}.log ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip @@ -83,7 +83,7 @@ + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${metricsLogName}.log ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip @@ -99,7 +99,7 @@ + class="ch.qos.logback.core.rolling.RollingFileAppender"> ${logDirectory}/${debugLogName}.log ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip diff --git a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml index c2099d6b77..d062835849 100644 --- a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml @@ -20,22 +20,22 @@ --> */}} - - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} - - - - %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - - - + + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} + + + + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + + + {{/* - @@ -57,7 +57,7 @@ - %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} + %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} diff --git a/kubernetes/appc/components/appc-ansible-server/resources/config/RestServer_config b/kubernetes/appc/components/appc-ansible-server/resources/config/RestServer_config index dc0859985e..090aa557f5 100644 --- a/kubernetes/appc/components/appc-ansible-server/resources/config/RestServer_config +++ b/kubernetes/appc/components/appc-ansible-server/resources/config/RestServer_config @@ -15,26 +15,26 @@ */}} # Host definition -ip: 0.0.0.0 -port: {{.Values.service.internalPort}} +ip: 0.0.0.0 +port: {{.Values.service.internalPort}} # Security (controls use of TLS encrypton and RestServer authentication) -tls: no -auth: no +tls: no +auth: no # TLS certificates (must be built on application host) -priv: provide_privated_key.pem -pub: provide_public_key.pem +priv: provide_privated_key.pem +pub: provide_public_key.pem # Mysql -host: {{.Values.config.mariadbGaleraSVCName}} +host: {{.Values.config.mariadbGaleraSVCName}} # Playbooks -from_files: yes -ansible_path: /opt/onap/ccsdk/Playbooks -ansible_inv: Ansible_inventory -ansible_temp: PlaybooksTemp -timeout_seconds: 60 +from_files: yes +ansible_path: /opt/onap/ccsdk/Playbooks +ansible_inv: Ansible_inventory +ansible_temp: PlaybooksTemp +timeout_seconds: 60 # Blocking on GetResults -getresults_block: yes +getresults_block: yes diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties index bf5432163c..24b10bcb89 100644 --- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/aaiclient.properties @@ -9,9 +9,9 @@ # 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. diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties index 9fa4625049..3b7f02d6f7 100644 --- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/appc.properties @@ -22,9 +22,9 @@ ### */}} -### ### +### ### ### Properties for demo ### -### ### +### ### appc.demo.poolMembers=message-router.{{.Release.Namespace}}:3904 appc.demo.topic.read=APPC-CL appc.demo.topic.write=APPC-CL @@ -53,9 +53,9 @@ org.onap.appc.db.user.sdnctl=${SDNC_DB_USER} org.onap.appc.db.pass.sdnctl=${SDNC_DB_PASSWD} -### ### +### ### ### OpenStack credentials (these properties also are used in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle) ### -### ### +### ### provider1.type={{.Values.config.openStackType}} provider1.name={{.Values.config.openStackName}} provider1.identity={{.Values.config.openStackKeyStoneUrl}} @@ -64,11 +64,11 @@ provider1.tenant1.domain={{.Values.config.openStackDomain}} provider1.tenant1.userid={{.Values.config.openStackUserName}} provider1.tenant1.password={{.Values.config.openStackEncryptedPassword}} -### ### -### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is 10.0.11.1:3904 ### +### ### +### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is 10.0.11.1:3904 ### ### which is what the Master HEAT Template to instantiate OpenECOMP is pointing to (version R1). All other default values are ### ### left there since these are pre-defined as part of APP-C/OpenECOMP default instantiation with Master HEAT Template ### -### ### +### ### # Property below is valid in appc-command-executor-core, appc-license-manager-core, appc-lifecycle-management-core, diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties index 1a2b1f6508..0592f8b06f 100644 --- a/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/data/properties/cadi.properties @@ -8,9 +8,9 @@ # 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. diff --git a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/data/properties/aaiclient.properties b/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/data/properties/aaiclient.properties index 9e76b27acf..fb56680a1d 100644 --- a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/data/properties/aaiclient.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/data/properties/aaiclient.properties @@ -9,9 +9,9 @@ # 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. diff --git a/kubernetes/appc/templates/statefulset.yaml b/kubernetes/appc/templates/statefulset.yaml index 208315495b..d67e1687ba 100644 --- a/kubernetes/appc/templates/statefulset.yaml +++ b/kubernetes/appc/templates/statefulset.yaml @@ -203,7 +203,7 @@ spec: subPath: org.onap.appc.keyfile resources: {{ include "common.resources" . | indent 12 }} - {{- if .Values.nodeSelector }} + {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} {{- end -}} diff --git a/kubernetes/common/postgres/configs/setup.sql b/kubernetes/common/postgres/configs/setup.sql index f60b473242..b564e4cec1 100644 --- a/kubernetes/common/postgres/configs/setup.sql +++ b/kubernetes/common/postgres/configs/setup.sql @@ -32,9 +32,9 @@ CREATE EXTENSION IF NOT EXISTS pgaudit; CREATE SCHEMA IF NOT EXISTS "${PG_USER}"; CREATE TABLE IF NOT EXISTS "${PG_USER}".testtable ( - name varchar(30) PRIMARY KEY, - value varchar(50) NOT NULL, - updatedt timestamp NOT NULL + name varchar(30) PRIMARY KEY, + value varchar(50) NOT NULL, + updatedt timestamp NOT NULL ); INSERT INTO "${PG_USER}".testtable (name, value, updatedt) VALUES ('CPU', '256', now()); diff --git a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem index 5696aa3570..b842710c11 100644 --- a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem +++ b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem @@ -1,6 +1,6 @@ Bag Attributes friendlyName: tomcat - localKeyID: 54 69 6D 65 20 31 34 39 33 33 32 33 39 32 32 37 35 31 + localKeyID: 54 69 6D 65 20 31 34 39 33 33 32 33 39 32 32 37 35 31 subject=/C=CA/ST=Ontario/L=Ottawa/O=ONAP/OU=ONAP/CN=ONAP issuer=/C=CA/ST=Ontario/L=Ottawa/O=ONAP/OU=ONAP/CN=ONAP -----BEGIN CERTIFICATE----- diff --git a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem index c7e386e55f..95de561981 100644 --- a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem +++ b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem @@ -1,6 +1,6 @@ Bag Attributes friendlyName: tomcat - localKeyID: 54 69 6D 65 20 31 34 39 33 33 32 33 39 32 32 37 35 31 + localKeyID: 54 69 6D 65 20 31 34 39 33 33 32 33 39 32 32 37 35 31 Key Attributes: -----BEGIN PRIVATE KEY----- MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCbEKYweVNHsWR1 diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/custom_fields.yml b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/custom_fields.yml index c23e29a11d..05bbfc7738 100755 --- a/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/custom_fields.yml +++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/custom_fields.yml @@ -1,8 +1,8 @@ -external-key: +external-key: description: "The external-key uniquely identify the resources to a service within ONAP." filterable: true label: ONAP external key - on_objects: + on_objects: - ipam.models.IPAddress required: true type: text diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/README.md b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/README.md index dced68d7c6..72f522a000 100644 --- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/README.md +++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/README.md @@ -14,10 +14,10 @@ See post deploy info 1. You can add the following entry after DNS deploy on running cluster at the end of cluster.yaml file (rke) ~~~yaml dns: - provider: coredns - upstreamnameservers: - - :31555 + provider: coredns + upstreamnameservers: + - :31555 ~~~ 2. You can edit coredns configuration with command: - kubectl -n kube-system edit configmap coredns + kubectl -n kube-system edit configmap coredns diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl index 8738b1099e..6be03de27b 100644 --- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl +++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl @@ -207,7 +207,7 @@ The sidecar is included if .Values.policies is set. The Policy-sync sidecar polls PolicyEngine (PDP) periodically based on .Values.policies.duration and configuration retrieved is shared with DCAE Microservice container by common volume. Policy can be retrieved based on -list of policyID or filter. An optional policyRelease parameter can be specified +list of policyID or filter. An optional policyRelease parameter can be specified to override the default policy helm release (used for retreiving the secret containing pdp username and password) diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml index eb40832285..16a01b44c8 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/5gcNrm.yaml @@ -486,7 +486,7 @@ components: $ref: '#/components/schemas/SmfFunction-Multiple' UpfFunction: $ref: '#/components/schemas/UpfFunction-Multiple' - N3iwfFunction: + N3iwfFunction: $ref: '#/components/schemas/N3iwfFunction-Multiple' PcfFunction: $ref: '#/components/schemas/PcfFunction-Multiple' @@ -520,7 +520,7 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' - + AmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -1562,8 +1562,8 @@ components: configurable5QIs: type: array items: - $ref: '#/components/schemas/FiveQICharacteristics' - + $ref: '#/components/schemas/FiveQICharacteristics' + Dynamic5QISet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -1576,8 +1576,8 @@ components: dynamic5QIs: type: array items: - $ref: '#/components/schemas/FiveQICharacteristics' - + $ref: '#/components/schemas/FiveQICharacteristics' + GtpUPathQoSMonitoringControl-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -1664,7 +1664,7 @@ components: predefinedPccRules: type: array items: - $ref: '#/components/schemas/PccRule' + $ref: '#/components/schemas/PccRule' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -1774,7 +1774,7 @@ components: type: array items: $ref: '#/components/schemas/AmfRegion-Single' - + EP_N2-Multiple: type: array items: diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml index 2d1a4fb16d..01ff52f92e 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/FileDataReportingMnS.yaml @@ -14,7 +14,7 @@ servers: variables: MnSRoot: description: See subclause 4.4 of TS 32.158 - default: http://example.com/3GPPManagement + default: http://example.com/3GPPManagement version: description: Indicates the current version of the specification default: 16.5.0 diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml index fb6d7f4db9..0528135d2b 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/comDefs.yaml @@ -12,7 +12,7 @@ externalDocs: paths: {} components: schemas: - + Float: type: number format: float diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml index 7ccf280316..752ead6b1e 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/faultMnS.yaml @@ -464,7 +464,7 @@ components: schemas: #---- Definition of AlarmRecord ----------------------------------------------------# - + AlarmId: type: string AlarmType: @@ -649,7 +649,7 @@ components: type: string #---- Definition of alarm notifications --------------------------------------------# - + AlarmNotificationTypes: type: string enum: @@ -721,7 +721,7 @@ components: - perceivedSeverity - serviceUser - serviceProvider - - securityAlarmDetector + - securityAlarmDetector properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -947,7 +947,7 @@ components: $ref: '#/components/schemas/AlarmListAlignmentRequirement' #---- Definition of query parameters -----------------------------------------------# - + AlarmAckState: type: string enum: @@ -957,7 +957,7 @@ components: - ALL_ACTIVE_AND_UNACKNOWLEDGED_ALARMS - ALL_CLEARED_AND_UNACKNOWLEDGED_ALARMS - ALL_UNACKNOWLEDGED_ALARMS - + #---- Definition of patch documents ------------------------------------------------# MergePatchAcknowledgeAlarm: diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml index aedf3c4fb8..7e7576c90f 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/genericNrm.yaml @@ -180,7 +180,7 @@ components: enum: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - STREAM_BASED monitorGranularityPeriods: type: array items: @@ -216,7 +216,7 @@ components: type: integer #-------- Definition of types used in Trace control NRM fragment------------------ - + tjJobType-Type: type: string description: Specifies whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined Trace and MDT job. Applicable for Trace, MDT, RCEF and RLF reporting. See 3GPP TS 32.422 clause 5.9a for additional details. @@ -657,7 +657,7 @@ components: required: - TargetIdType - TargetIdValue - + tjTriggeringEvent-Type: type: object description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. @@ -682,14 +682,14 @@ components: required: - NetworkElement - EventBitmap - + tjMDTAnonymizationOfData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. type: string enum: - NO_IDENTITY - TAC_OF_IMEI - + tjMDTAreaConfigurationForNeighCell-Type: description: Used for logged NR MDT and defines the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. For additional details see 3GPP TS 32.422 clause 5.10.26. type: array @@ -700,12 +700,12 @@ components: type: string cell: type: string - + tjMDTAreaScope-Type: description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2. allOf: - $ref: 'comDefs.yaml#/components/schemas/DnList' - + tjMDTCollectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string @@ -737,7 +737,7 @@ components: - 5120ms - 10240ms - 1min - + tjMDTCollectionPeriodRrmNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string @@ -764,7 +764,7 @@ components: type: integer minimum: 0 maximum: 97 - EventThresholdRSRQ: + EventThresholdRSRQ: type: integer minimum: 0 maximum: 34 @@ -846,7 +846,7 @@ components: - 3600s - 5400s - 7200s - + tjMDTLoggingInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.8. type: string @@ -1183,7 +1183,7 @@ components: tjJobType: $ref: '#/components/schemas/tjJobType-Type' tjListOfInterfaces: - $ref: '#/components/schemas/tjListOfInterfaces-Type' + $ref: '#/components/schemas/tjListOfInterfaces-Type' tjListOfNeTypes: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml index 3de2c63a6c..3ff7a21ec1 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/nrNrm.yaml @@ -82,12 +82,12 @@ components: GGnbIdList: type: array - items: + items: $ref: '#/components/schemas/GGnbId' GEnbIdList: type: array - items: + items: $ref: '#/components/schemas/GEnbId' NrPci: @@ -408,7 +408,7 @@ components: RSSetId: type: integer maximum: 4194303 - + RSSetType: type: string enum: @@ -450,7 +450,7 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE RIMRSScrambleTimerMultiplier: type: integer RIMRSScrambleTimerOffset: @@ -511,12 +511,12 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE enablenearfarIndicationRS2: type: string enum: - ENABLE - - DISABLE + - DISABLE RimRSReportInfo: type: object @@ -531,7 +531,7 @@ components: - RS1 - RS2 - RS1forEnoughMitigation - - RS1forNotEnoughMitigation + - RS1forNotEnoughMitigation RimRSReportConf: type: object @@ -540,7 +540,7 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE reportInterval: type: integer nrofRIMRSReportInfo: @@ -1289,7 +1289,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object properties: - attributes: + attributes: type: object properties: dmroControl: @@ -1758,7 +1758,7 @@ components: type: array items: $ref: '#/components/schemas/ExternalNrCellCu-Single' - + ExternalENBFunction-Multiple: type: array items: @@ -1831,7 +1831,7 @@ components: - $ref: '#/components/schemas/CommonBeamformingFunction-Single' - $ref: '#/components/schemas/Beam-Single' - $ref: '#/components/schemas/RRMPolicyRatio-Single' - + - $ref: '#/components/schemas/NRCellRelation-Single' - $ref: '#/components/schemas/EUtranCellRelation-Single' - $ref: '#/components/schemas/NRFreqRelation-Single' @@ -1844,10 +1844,10 @@ components: - $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CESManagementFunction-Single' - + - $ref: '#/components/schemas/RimRSGlobal-Single' - $ref: '#/components/schemas/RimRSSet-Single' - + - $ref: '#/components/schemas/ExternalGnbDuFunction-Single' - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Single' - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Single' @@ -1865,4 +1865,4 @@ components: - $ref: '#/components/schemas/EP_NgU-Single' - $ref: '#/components/schemas/EP_X2U-Single' - $ref: '#/components/schemas/EP_S1U-Single' - + diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml index 1fd64a7d22..dec612785a 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/perfMnS.yaml @@ -16,7 +16,7 @@ servers: description: >- The open API server of the performance threshold monitoring service is located in the consumer side, see monitoringNotifTarget attribute of - the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. + the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. default: http://example.com/3GPPManagement paths: /notificationSink: diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml index 1fa8d70ff3..9bf5319fc4 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa91-rel16/sliceNrm.yaml @@ -215,7 +215,7 @@ components: ServiceProfile: type: object properties: - serviceProfileId: + serviceProfileId: type: string plmnInfoList: $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList' @@ -296,7 +296,7 @@ components: type: array items: $ref: '#/components/schemas/ServiceProfile' - + SliceProfileList: type: array items: @@ -379,14 +379,14 @@ components: ipAddress: $ref: '#/components/schemas/IpAddress' logicInterfaceId: - type: string + type: string nextHopInfo: - type: string + type: string qosProfile: - type: string + type: string epApplicationRefs: $ref: 'comDefs.yaml#/components/schemas/DnList' - + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: type: array diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/README.md b/kubernetes/dcaegen2/components/dcae-cloudify-manager/README.md index c995a62c09..fa2d597caa 100644 --- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/README.md +++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/README.md @@ -18,15 +18,15 @@ # DCAE Cloudify Manager Chart -This chart is used to deploy a containerized version of +This chart is used to deploy a containerized version of [Cloudify Manager](http://docs.getcloudify.org/4.3.0/intro/cloudify-manager/), -the orchestration tool used by DCAE. DCAE uses Cloudify Manager ("CM") to +the orchestration tool used by DCAE. DCAE uses Cloudify Manager ("CM") to deploy the rest of the DCAE platform as well to deploy DCAE monitoring and analytics services dynamically, in response to network events such as VNF startups. -Deployment of CM is the first of two steps in deploying DCAE into ONAP. After this chart -brings up CM, a second chart (the "bootstrap" chart) installs some plugin extensions onto CM -and uses CM to deploy some DCAE components. +Deployment of CM is the first of two steps in deploying DCAE into ONAP. After this chart +brings up CM, a second chart (the "bootstrap" chart) installs some plugin extensions onto CM +and uses CM to deploy some DCAE components. ## Prerequisites The chart requires one Kubernetes secret to be available in the namespace where it is @@ -37,10 +37,10 @@ being deployed: ## DCAE Namespace DCAE will use CM deploy a number of containers into the ONAP Kubernetes cluster. In a production environment, DCAE's dynamic deployment of monitoring and analytics services could result in dozens -of containers being launched. This chart allows the configuration, through the `dcae_ns` property +of containers being launched. This chart allows the configuration, through the `dcae_ns` property in the `values.yaml` of a separate namespace used by CM when it needs to deploy containers into Kubernetes. If `dcae_ns` is set, this chart will: - - create the namespace. + - create the namespace. - create the Docker registry key secret in the namespace. - create some Kubernetes `Services` (of the `ExternalName` type) to map some addresses from the common namespace into the DCAE namespace. diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json index a93c8c5bbe..a1a8b4a1f4 100644 --- a/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json +++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json @@ -1,32 +1,32 @@ { - "appenders": { - "out": {"type": "stdout"}, - "audit": { - "type": "file", - "filename": "log/audit.log", - "maxLogSize": 10240000, - "backups": 10, - "layout": { - "type": "messagePassThrough" - } - }, - "metrics": { - "type": "file", - "filename": "log/metrics.log", - "maxLogSize": 10240000, - "backups": 10, - "layout": { - "type": "messagePassThrough" - } - }, - "error": {"type": "stdout"}, - "debug": {"type": "stdout"} - }, - "categories": { - "default": {"appenders": ["out"], "level": "debug"}, - "audit": {"appenders": ["audit"], "level": "info"}, - "metrics": {"appenders": ["metrics"], "level": "info"}, - "error": {"appenders": ["error"], "level": "error"}, - "debug": {"appenders": ["debug"], "level": "debug"} - } + "appenders": { + "out": {"type": "stdout"}, + "audit": { + "type": "file", + "filename": "log/audit.log", + "maxLogSize": 10240000, + "backups": 10, + "layout": { + "type": "messagePassThrough" + } + }, + "metrics": { + "type": "file", + "filename": "log/metrics.log", + "maxLogSize": 10240000, + "backups": 10, + "layout": { + "type": "messagePassThrough" + } + }, + "error": {"type": "stdout"}, + "debug": {"type": "stdout"} + }, + "categories": { + "default": {"appenders": ["out"], "level": "debug"}, + "audit": {"appenders": ["audit"], "level": "info"}, + "metrics": {"appenders": ["metrics"], "level": "info"}, + "error": {"appenders": ["error"], "level": "error"}, + "debug": {"appenders": ["debug"], "level": "debug"} + } } \ No newline at end of file diff --git a/kubernetes/dmaap/components/dmaap-bc/README.md b/kubernetes/dmaap/components/dmaap-bc/README.md index a799fd44dd..a6115477ec 100644 --- a/kubernetes/dmaap/components/dmaap-bc/README.md +++ b/kubernetes/dmaap/components/dmaap-bc/README.md @@ -22,4 +22,4 @@ ONAP includes the following Kubernetes services available in ONAP Beijing Releas # Service Dependencies message-router depends on AAF -dmaap-prov depends on AAF and Postgresql. +dmaap-prov depends on AAF and Postgresql. diff --git a/kubernetes/helm/plugins/deploy/plugin.yaml b/kubernetes/helm/plugins/deploy/plugin.yaml index fc7f7d0f88..533ffeea6f 100644 --- a/kubernetes/helm/plugins/deploy/plugin.yaml +++ b/kubernetes/helm/plugins/deploy/plugin.yaml @@ -1,7 +1,7 @@ name: "deploy" version: "1.0.0" -usage: "install (upgrade if release exists) parent chart and subcharts as separate +usage: "install (upgrade if release exists) parent chart and subcharts as separate but related releases" -description: "install (upgrade if release exists) parent charty and all subcharts as separate +description: "install (upgrade if release exists) parent charty and all subcharts as separate but related releases" command: "$HELM_PLUGIN_DIR/deploy.sh" \ No newline at end of file diff --git a/kubernetes/helm/plugins/undeploy/plugin.yaml b/kubernetes/helm/plugins/undeploy/plugin.yaml index 02999fd04c..22f8ad2997 100644 --- a/kubernetes/helm/plugins/undeploy/plugin.yaml +++ b/kubernetes/helm/plugins/undeploy/plugin.yaml @@ -1,7 +1,7 @@ name: "undeploy" version: "1.0.0" -usage: "delete parent chart and subcharts that were deployed as separate +usage: "delete parent chart and subcharts that were deployed as separate releases" -description: "delete parent chart and subcharts that were deployed as separate +description: "delete parent chart and subcharts that were deployed as separate releases" command: "$HELM_PLUGIN_DIR/undeploy.sh" \ No newline at end of file diff --git a/kubernetes/log/components/log-logstash/resources/config/onap-pipeline.conf b/kubernetes/log/components/log-logstash/resources/config/onap-pipeline.conf index d6b0696b81..b224bf3173 100644 --- a/kubernetes/log/components/log-logstash/resources/config/onap-pipeline.conf +++ b/kubernetes/log/components/log-logstash/resources/config/onap-pipeline.conf @@ -92,14 +92,14 @@ filter { if event.get("[mdcname]") $num = event.get("[mdcname]").length end - if $num != 0 + if $num != 0 until $i > $num do if event.get("[mdcname]").at($i) and event.get("[mdcvalue]").at($i) event.set(event.get("[mdcname]").at($i), event.get("[mdcvalue]").at($i)) end $i=$i+1 end - end + end ' } @@ -151,7 +151,7 @@ filter { gsub => [ 'message', ' = ', '=', 'message', '= ', '=null', - 'message', '=\t', '=null ', #This null is followed by a tab + 'message', '=\t', '=null\t', #This null is followed by a tab 'message', '\t$', '\t' ] } diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml index f424cc644e..20d3fd22ab 100644 --- a/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml +++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml @@ -44,7 +44,7 @@ metadata: "enable_ssl": {{ .Values.config.ssl_enabled }}, "visualRange":"1" }, - { + { "serviceName": "nsd", "version": "v1", "url": "/api/nsd/v1", @@ -53,7 +53,7 @@ metadata: "enable_ssl": {{ .Values.config.ssl_enabled }}, "visualRange":"1" }, - { + { "serviceName": "vnfpkgm", "version": "v1", "url": "/api/vnfpkgm/v1", diff --git a/kubernetes/msb/components/msb-discovery/resources/config/logback.xml b/kubernetes/msb/components/msb-discovery/resources/config/logback.xml index 3781d96328..174a6c5f9b 100644 --- a/kubernetes/msb/components/msb-discovery/resources/config/logback.xml +++ b/kubernetes/msb/components/msb-discovery/resources/config/logback.xml @@ -57,7 +57,7 @@ ${auditPattern} - + 256 @@ -128,7 +128,7 @@ - + diff --git a/kubernetes/msb/components/msb-eag/resources/config/logback.xml b/kubernetes/msb/components/msb-eag/resources/config/logback.xml index 6dc4443d6e..472d8ce735 100644 --- a/kubernetes/msb/components/msb-eag/resources/config/logback.xml +++ b/kubernetes/msb/components/msb-eag/resources/config/logback.xml @@ -57,7 +57,7 @@ ${auditPattern} - + 256 @@ -128,7 +128,7 @@ - + diff --git a/kubernetes/msb/components/msb-iag/resources/config/logback.xml b/kubernetes/msb/components/msb-iag/resources/config/logback.xml index 65ff43485a..a93d4ec56f 100644 --- a/kubernetes/msb/components/msb-iag/resources/config/logback.xml +++ b/kubernetes/msb/components/msb-iag/resources/config/logback.xml @@ -57,7 +57,7 @@ ${auditPattern} - + 256 @@ -128,7 +128,7 @@ - + diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml index da5156a93a..a21ec43d9b 100644 --- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml +++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml @@ -39,7 +39,7 @@ spec: targetPort: {{ .Values.service.internalPort }} {{- end}} protocol: TCP -{{- if .Values.service.meshpeer.enabled }} +{{- if .Values.service.meshpeer.enabled }} - name: {{ .Values.service.meshpeer.portName }} port: {{ .Values.service.meshpeer.port }} targetPort: {{ .Values.service.meshpeer.port }} diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties index 3dbf434322..7020a40bb4 100755 --- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties +++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties @@ -44,7 +44,7 @@ account_admin_role_id = 999 restricted_app_role_id = 900 # Home Page index html -home_page = /index.html +home_page = /index.html authentication_mechanism =DBAUTH diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml index e707e259ca..325da8e9e3 100644 --- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml +++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml @@ -4,7 +4,7 @@ ONAP Portal =================================================================== Copyright © 2017 AT&T Intellectual Property. All rights reserved. - Modifications Copyright © 2018 Amdocs, Bell Canada + Modifications Copyright © 2018 Amdocs, Bell Canada ==================================================================== Unless otherwise specified, all software contained herein is licensed under the Apache License, Version 2.0 (the “License”); @@ -37,264 +37,264 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${applicationLoggerPattern} - - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - - ${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip - - 30 - - - ${applicationLoggerPattern} - - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - ${logDirectory}/${auditLogName}.log - - - ${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip - - 30 - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - - ${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip - - 30 - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - - ${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip - - 30 - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - - ${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip - - 30 - - - ${defaultLoggerPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${applicationLoggerPattern} + + + + + + + + + + + + ${logDirectory}/${generalLogName}.log + + + ${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${applicationLoggerPattern} + + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + ${logDirectory}/${auditLogName}.log + + + ${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${auditLoggerPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}.log + + + ${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${metricsLoggerPattern} + + + + + + 256 + + + + + ${logDirectory}/${errorLogName}.log + + + ${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${errorLoggerPattern} + + + + + 256 + + + + + ${debugLogDirectory}/${debugLogName}.log + + + ${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip + + 30 + + + ${defaultLoggerPattern} + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties index d246a6b0b1..34c7f1dee0 100755 --- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties +++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties @@ -45,20 +45,20 @@ application_user_id = 30000 post_default_role_id = 1 #Enable Fusion Mobile capabilities for the application -mobile_enable = false +mobile_enable = false cache_config_file_path = /WEB-INF/conf/cache.ccf cache_switch = 1 cache_load_on_startup = false -user_name = fullName -decryption_key = AGLDdG4D04BKm2IxIWEr8o== +user_name = fullName +decryption_key = AGLDdG4D04BKm2IxIWEr8o== #Cron Schedules cron_site_name = one log_cron = 0 * * * * ? * -sessiontimeout_feed_cron = 0 0/5 * * * ? * +sessiontimeout_feed_cron = 0 0/5 * * * ? * #Front end URL frontend_url = https://{{.Values.global.portalHostName}}:{{.Values.global.portalFEPort}}/ONAPPORTAL/applicationsHome @@ -69,22 +69,22 @@ frontend_url = https://{{.Values.global.portalHostName}}:{{.Val # This value must be generated and updated at the time of # the deployment. # Online Unique UUID generator - https://www.uuidgenerator.net/ -instance_uuid = 90bc9497-10e6-49fe-916b-dcdfaa972383 +instance_uuid = 90bc9497-10e6-49fe-916b-dcdfaa972383 -elastic_search_url = http:// -contact_us_link = http:// -user_guide_link = http:// +elastic_search_url = http:// +contact_us_link = http:// +user_guide_link = http:// # Contact Us page properties -ush_ticket_url = http:// -feedback_email_address = portal@lists.onap.org -portal_info_url = https:// +ush_ticket_url = http:// +feedback_email_address = portal@lists.onap.org +portal_info_url = https:// #Online user bar refresh interval, in seconds -online_user_update_rate = 30 +online_user_update_rate = 30 #Online user bar refresh total duration, in seconds -online_user_update_duration = 300 +online_user_update_duration = 300 #authenticate user server authenticate_user_server=http://{{.Values.global.portalHostName}}:8383/openid-connect-server-webapp/allUsers diff --git a/kubernetes/portal/components/portal-app/resources/server/web.xml b/kubernetes/portal/components/portal-app/resources/server/web.xml index 8f88e12666..7c4f2a7275 100644 --- a/kubernetes/portal/components/portal-app/resources/server/web.xml +++ b/kubernetes/portal/components/portal-app/resources/server/web.xml @@ -5,151 +5,151 @@ =================================================================== Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. =================================================================== - + Unless otherwise specified, all software contained herein is licensed under the Apache License, Version 2.0 (the "License"); you may not use this software 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. - + Unless otherwise specified, all documentation contained herein is licensed under the Creative Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except in compliance with the License. You may obtain a copy of the License at - + https://creativecommons.org/licenses/by/4.0/ - + Unless required by applicable law or agreed to in writing, documentation distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + ============LICENSE_END============================================ - - + + --> - fusion - - - - - - - - - - - org.onap.portalapp.portal.listener.UserSessionListener - - - - CorsFilter - org.apache.catalina.filters.CorsFilter - - cors.allowed.origins - http://www.portal.onap.org:9200,http://www.portal.onap.org:9000 - - - cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT,DELETE - - - cors.allowed.headers - EPService,JSESSIONID,X-ECOMP-RequestID,X-Widgets-Type,Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers - - - cors.exposed.headers - Access-Control-Allow-Origin,Access-Control-Allow-Credentials - - - cors.support.credentials - true - - - cors.preflight.maxage - 10 - - - + fusion + + + + + + + + + + + org.onap.portalapp.portal.listener.UserSessionListener + + + + CorsFilter + org.apache.catalina.filters.CorsFilter + + cors.allowed.origins + http://www.portal.onap.org:9200,http://www.portal.onap.org:9000 + + + cors.allowed.methods + GET,POST,HEAD,OPTIONS,PUT,DELETE + + + cors.allowed.headers + EPService,JSESSIONID,X-ECOMP-RequestID,X-Widgets-Type,Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers + + + cors.exposed.headers + Access-Control-Allow-Origin,Access-Control-Allow-Credentials + + + cors.support.credentials + true + + + cors.preflight.maxage + 10 + + + CorsFilter /* - - - SecurityXssFilter - org.onap.portalapp.filter.SecurityXssFilter - - - - SecurityXssFilter - /* - - - - - - + + + SecurityXssFilter + org.onap.portalapp.filter.SecurityXssFilter + + + + SecurityXssFilter + /* + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql b/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql index 7827727ebc..a9771bfa5d 100644 --- a/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql +++ b/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql @@ -19,7 +19,7 @@ CREATE KEYSPACE IF NOT EXISTS admin 'replication_factor': 1 } AND DURABLE_WRITES = true; - + CREATE TABLE IF NOT EXISTS admin.keyspace_master ( uuid uuid, keyspace_name text, @@ -86,7 +86,7 @@ CREATE TABLE portal.spring_session_attributes ( AND min_index_interval = 128 AND read_repair_chance = 0.0 AND speculative_retry = '99PERCENTILE'; - + CREATE KEYSPACE IF NOT EXISTS portalsdk diff --git a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties index 4bb51c1a8a..4d26240be4 100755 --- a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties +++ b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties @@ -59,4 +59,4 @@ ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-APP1 # Use the special tag '{UUID}' to generate a unique one for each sdk-app server. ueb_app_consumer_group_name = {UUID} -decryption_key = AGLDdG4D04BKm2IxIWEr8o== +decryption_key = AGLDdG4D04BKm2IxIWEr8o== diff --git a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties index aad5044fbf..3873da13a9 100755 --- a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties +++ b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties @@ -26,15 +26,15 @@ post_default_role_id = 16 clustered = true #Enable Fusion Mobile capabilities for the application -mobile_enable = false +mobile_enable = false # Cache config file is needed on the classpath cache_config_file_path = /WEB-INF/classes/cache.ccf cache_switch = 199 cache_load_on_startup = false -user_name = fullName -decryption_key = AGLDdG4D04BKm2IxIWEr8o== +user_name = fullName +decryption_key = AGLDdG4D04BKm2IxIWEr8o== ########################################################################## # The following properties MAY require changes by partner applications. @@ -61,7 +61,7 @@ element_map_icon_path = app/fusionapp/icons/ #Cron Schedules log_cron = 0 0/1 * * * ?; mylogins_feed_cron = 0 0/60 * * * ?; -#sessiontimeout_feed_cron = 0 * * * * ? * +#sessiontimeout_feed_cron = 0 * * * * ? * my_login_feed_output_dir = /tmp/MyLogins # Link shown in Help menu diff --git a/kubernetes/robot/resources/config/lighttpd/ssl/README.TXT b/kubernetes/robot/resources/config/lighttpd/ssl/README.TXT index 4a56cb5dfa..fe43e0cc6f 100644 --- a/kubernetes/robot/resources/config/lighttpd/ssl/README.TXT +++ b/kubernetes/robot/resources/config/lighttpd/ssl/README.TXT @@ -5,7 +5,7 @@ You can replace them with your own if appropriate using this process or official # create key and csr openssl req -new -newkey rsa:2048 -nodes -keyout onap-robot.onap.key -out onap-robot.onap.csr -# sign csr +# sign csr # 10 year self signed certificate openssl x509 -req -days 3650 -in onap-robot.onap.csr -signkey onap-robot.onap.key -out onap-robot.onap.crt diff --git a/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml b/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml index 0f044d7646..28fd910d76 100644 --- a/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml +++ b/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml @@ -92,10 +92,8 @@ ${logDirectory}/${debugLogName}.log - - + + TRANSACTION_MARKER diff --git a/kubernetes/sdc/components/sdc-onboarding-be/resources/config/logging/logback.xml b/kubernetes/sdc/components/sdc-onboarding-be/resources/config/logging/logback.xml index 515076fe30..b537709925 100644 --- a/kubernetes/sdc/components/sdc-onboarding-be/resources/config/logging/logback.xml +++ b/kubernetes/sdc/components/sdc-onboarding-be/resources/config/logging/logback.xml @@ -93,10 +93,8 @@ ${logDirectory}/${debugLogName}.log - - + + TRANSACTION_MARKER diff --git a/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg b/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg index 29dd0e54dd..95df4b84ad 100644 --- a/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg +++ b/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg @@ -96,7 +96,7 @@ operational.persistent=false #sync-index-threshold=10 # Record new transaction allocation stack trace, useful for debugging. This makes the log include -# the stack trace of the creator of the Tx when there is an exception when the transaction is submitted +# the stack trace of the creator of the Tx when there is an exception when the transaction is submitted # (e.g. for a failed validation). Defaults to false due to performance impact. #transaction-debug-context-enabled=true persistent-actor-restart-min-backoff-in-seconds={{.Values.config.odl.datastore.persistentActorRestartMinBackoffInSeconds}} diff --git a/kubernetes/sdnc/resources/config/conf/setenv b/kubernetes/sdnc/resources/config/conf/setenv index 85af48ac1d..303c3168d7 100644 --- a/kubernetes/sdnc/resources/config/conf/setenv +++ b/kubernetes/sdnc/resources/config/conf/setenv @@ -33,7 +33,7 @@ # # -# The following section shows the possible configuration options for the default +# The following section shows the possible configuration options for the default # karaf scripts # # export JAVA_HOME # Location of Java installation diff --git a/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster b/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster index ffd044854f..8b489e0ee4 100755 --- a/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster +++ b/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster @@ -26,10 +26,10 @@ fi case $IS_PRIMARY_CLUSTER in true|false) - echo $IS_PRIMARY_CLUSTER - ;; + echo $IS_PRIMARY_CLUSTER + ;; *) - echo "NOT CLUSTERED" - exit 1 - ;; + echo "NOT CLUSTERED" + exit 1 + ;; esac diff --git a/kubernetes/sniro-emulator/templates/NOTES.txt b/kubernetes/sniro-emulator/templates/NOTES.txt index 409d59e470..c233cade6b 100644 --- a/kubernetes/sniro-emulator/templates/NOTES.txt +++ b/kubernetes/sniro-emulator/templates/NOTES.txt @@ -1,6 +1,6 @@ {{/* # Copyright © 2017 Amdocs, AT&T, Bell Canada -# +# # 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 diff --git a/kubernetes/so/components/so-mariadb/resources/config/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_engine_7.14.0.sql b/kubernetes/so/components/so-mariadb/resources/config/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_engine_7.14.0.sql index f2e1e9fc00..be94321a6f 100644 --- a/kubernetes/so/components/so-mariadb/resources/config/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_engine_7.14.0.sql +++ b/kubernetes/so/components/so-mariadb/resources/config/docker-entrypoint-initdb.d/db-sql-scripts/mariadb_engine_7.14.0.sql @@ -978,9 +978,9 @@ create table ACT_HI_OP_LOG ( NEW_VALUE_ varchar(4000), TENANT_ID_ varchar(64), REMOVAL_TIME_ datetime(3), - CATEGORY_ varchar(64), - EXTERNAL_TASK_ID_ varchar(64), - ANNOTATION_ varchar(4000), + CATEGORY_ varchar(64), + EXTERNAL_TASK_ID_ varchar(64), + ANNOTATION_ varchar(4000), primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; diff --git a/kubernetes/so/resources/config/log/logback.apihandler-infra.xml b/kubernetes/so/resources/config/log/logback.apihandler-infra.xml index 3e0ea61ea6..6221c11477 100755 --- a/kubernetes/so/resources/config/log/logback.apihandler-infra.xml +++ b/kubernetes/so/resources/config/log/logback.apihandler-infra.xml @@ -2,11 +2,11 @@ - + - - @@ -29,15 +29,14 @@ - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -64,18 +63,17 @@ - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -91,12 +89,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -109,14 +107,14 @@ ${debugPattern} - + 256 true - - + + @@ -124,14 +122,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.appc.xml b/kubernetes/so/resources/config/log/logback.appc.xml index 588f6f39d2..9b67ebf8e2 100755 --- a/kubernetes/so/resources/config/log/logback.appc.xml +++ b/kubernetes/so/resources/config/log/logback.appc.xml @@ -2,11 +2,11 @@ - + - - @@ -28,15 +28,14 @@ - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -63,18 +62,17 @@ - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -90,12 +88,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -108,14 +106,14 @@ ${debugPattern} - + 256 true - - + + @@ -123,14 +121,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.asdc.xml b/kubernetes/so/resources/config/log/logback.asdc.xml index b4879e017f..df8433a749 100755 --- a/kubernetes/so/resources/config/log/logback.asdc.xml +++ b/kubernetes/so/resources/config/log/logback.asdc.xml @@ -2,11 +2,11 @@ - + - - @@ -28,15 +28,14 @@ - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -63,18 +62,17 @@ - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -90,12 +88,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -108,14 +106,14 @@ ${debugPattern} - + 256 true - - + + @@ -123,14 +121,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.bpmn.xml b/kubernetes/so/resources/config/log/logback.bpmn.xml index 3bc3ca157b..99ba8556d6 100755 --- a/kubernetes/so/resources/config/log/logback.bpmn.xml +++ b/kubernetes/so/resources/config/log/logback.bpmn.xml @@ -18,7 +18,7 @@ - + diff --git a/kubernetes/so/resources/config/log/logback.msorequestsdbadapter.xml b/kubernetes/so/resources/config/log/logback.msorequestsdbadapter.xml index 64a5022aa6..07a6bc6b76 100755 --- a/kubernetes/so/resources/config/log/logback.msorequestsdbadapter.xml +++ b/kubernetes/so/resources/config/log/logback.msorequestsdbadapter.xml @@ -2,11 +2,11 @@ - + - - @@ -28,15 +28,14 @@ - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -63,18 +62,17 @@ - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -90,12 +88,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -108,14 +106,14 @@ ${debugPattern} - + 256 true - - + + @@ -123,14 +121,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.network.xml b/kubernetes/so/resources/config/log/logback.network.xml index 542a8f6f00..ea8211a55c 100755 --- a/kubernetes/so/resources/config/log/logback.network.xml +++ b/kubernetes/so/resources/config/log/logback.network.xml @@ -2,11 +2,11 @@ - + - - @@ -23,21 +23,20 @@ - + - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -64,18 +63,17 @@ - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -91,12 +89,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -109,14 +107,14 @@ ${debugPattern} - + 256 true - - + + @@ -124,14 +122,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.sdnc.xml b/kubernetes/so/resources/config/log/logback.sdnc.xml index 1323a8961d..432c7fdcac 100755 --- a/kubernetes/so/resources/config/log/logback.sdnc.xml +++ b/kubernetes/so/resources/config/log/logback.sdnc.xml @@ -2,11 +2,11 @@ - + - - @@ -28,15 +28,15 @@ - - - - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -63,18 +63,18 @@ - ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -90,12 +90,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -108,14 +108,14 @@ ${debugPattern} - + 256 true - - + + @@ -123,14 +123,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.tenant.xml b/kubernetes/so/resources/config/log/logback.tenant.xml index a25c182e97..3243f1dd26 100755 --- a/kubernetes/so/resources/config/log/logback.tenant.xml +++ b/kubernetes/so/resources/config/log/logback.tenant.xml @@ -2,11 +2,11 @@ - + - - @@ -23,21 +23,20 @@ - + - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -64,18 +63,17 @@ - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -91,12 +89,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -109,14 +107,14 @@ ${debugPattern} - + 256 true - - + + @@ -124,14 +122,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.vfc.xml b/kubernetes/so/resources/config/log/logback.vfc.xml index d0b66be5bb..3b8dea43b0 100755 --- a/kubernetes/so/resources/config/log/logback.vfc.xml +++ b/kubernetes/so/resources/config/log/logback.vfc.xml @@ -2,11 +2,11 @@ - + - - @@ -28,15 +28,14 @@ - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -63,18 +62,17 @@ - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -90,12 +88,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -108,14 +106,14 @@ ${debugPattern} - + 256 true - - + + @@ -123,14 +121,14 @@ - + - + diff --git a/kubernetes/so/resources/config/log/logback.vnf.xml b/kubernetes/so/resources/config/log/logback.vnf.xml index 32f6e69f81..97425ecc25 100755 --- a/kubernetes/so/resources/config/log/logback.vnf.xml +++ b/kubernetes/so/resources/config/log/logback.vnf.xml @@ -2,11 +2,11 @@ - + - - @@ -28,15 +28,14 @@ - - - + + - + ${logDirectory}/${auditLogName}${jboss.server.name}.log @@ -54,7 +53,7 @@ - ${logDirectory}/${metricsLogName}${jboss.server.name}.log 30--> - + ${metricPattern} - - + + 256 - + ${logDirectory}/${errorLogName}${jboss.server.name}.log @@ -90,12 +88,12 @@ ${errorPattern} - + 256 - + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log @@ -108,14 +106,14 @@ ${debugPattern} - + 256 true - - + + @@ -123,14 +121,14 @@ - + - + diff --git a/kubernetes/so/templates/NOTES.txt b/kubernetes/so/templates/NOTES.txt index 5b970635fa..79b711fefd 100755 --- a/kubernetes/so/templates/NOTES.txt +++ b/kubernetes/so/templates/NOTES.txt @@ -4,11 +4,11 @@ -- bpmn-infra -- openstack-adapter -- sdnc-adapter --- vfc-adapter +-- vfc-adapter 2. dependencies included in charts sub directory -- db-secrets -- ssl-secrets -- catalog-db-adapter -- request-db-adapter 4. Run the following helm command to deploy chart(s), remove --dry-run option - helm upgrade -f ./helm/values.yaml --install --debug --dry-run so ./so + helm upgrade -f ./helm/values.yaml --install --debug --dry-run so ./so diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml index 14f5f48f0b..980e462b47 100644 --- a/kubernetes/uui/components/uui-server/values.yaml +++ b/kubernetes/uui/components/uui-server/values.yaml @@ -17,7 +17,7 @@ # Declare variables to be passed into your templates. global: uuiPortPrefix: 303 - + subChartsOnly: enabled: true diff --git a/kubernetes/vid/resources/config/log/vid/logback.xml b/kubernetes/vid/resources/config/log/vid/logback.xml index 018cca8a43..17af1c990f 100644 --- a/kubernetes/vid/resources/config/log/vid/logback.xml +++ b/kubernetes/vid/resources/config/log/vid/logback.xml @@ -8,9 +8,9 @@ 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. @@ -95,11 +95,11 @@ - - - - - ${logDirectory}/${auditLogName}.log diff --git a/tox.ini b/tox.ini index 5136a3b65d..efe3b38035 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ envlist = docs-linkcheck, gitlint, checkbashisms, + pre-commit, skipsdist=true [doc8] @@ -67,3 +68,29 @@ whitelist_externals = find commands = find kubernetes/ TOSCA/ docs/ -name *.py -exec pylint --max-line-length=120 --disable=missing-docstring --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" --reports=y --score=y --output-format=colorized \{\} + +[testenv:pre-commit-install] +basepython = python3 +deps = pre-commit +commands = + pre-commit install + pre-commit install --hook-type commit-msg + +[testenv:pre-commit-uninstall] +basepython = python3 +deps = pre-commit +commands = + pre-commit uninstall + pre-commit uninstall --hook-type commit-msg + +[testenv:pre-commit] +basepython = python3 +deps = pre-commit +passenv = HOME +commands = + pre-commit run --all-files --show-diff-on-failure + pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG + # Gitlint only proposes a pre-commit configuration for the commit-msg stage but none for the commit stage. + # Its default arguments --passed and --msg-filename are different from CI recommandations. + # As a result, the line above is always skipped in jenkins CI since there cannot be a .git/COMMIT_EDITMSG file. + # A dedicated gitlint profile for CI is proposed above. Also to behave fine locally, this profile must have access + # to the HOME variable so that Gitlint can retrieve Git user settings. -- 2.16.6