From bf2bea4aaee161d82c8093f8b723f0fd9b57a115 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 23 Apr 2021 13:02:22 -0400 Subject: Refactor GRA to separate docker creation from application code Refactor GRA so that application jar is created in a separate maven module from the docker build. Issue-ID: SDNC-1527 Change-Id: I4a9af7fe4df14faaf683588bc2567fcc3346886e Signed-off-by: Dan Timoney --- .../src/main/resources/application.properties | 24 + .../db/changelog/db.changelog-master.yaml | 546 +++++++++++++++++++++ ms/gra/gra-app/src/main/resources/dblib.properties | 38 ++ .../resources/generic-resource-api-dg.properties | 77 +++ .../gra-app/src/main/resources/log4j2.properties | 163 ++++++ .../gra-app/src/main/resources/svclogic.properties | 29 ++ 6 files changed, 877 insertions(+) create mode 100644 ms/gra/gra-app/src/main/resources/application.properties create mode 100644 ms/gra/gra-app/src/main/resources/db/changelog/db.changelog-master.yaml create mode 100644 ms/gra/gra-app/src/main/resources/dblib.properties create mode 100644 ms/gra/gra-app/src/main/resources/generic-resource-api-dg.properties create mode 100644 ms/gra/gra-app/src/main/resources/log4j2.properties create mode 100644 ms/gra/gra-app/src/main/resources/svclogic.properties (limited to 'ms/gra/gra-app/src/main/resources') diff --git a/ms/gra/gra-app/src/main/resources/application.properties b/ms/gra/gra-app/src/main/resources/application.properties new file mode 100644 index 0000000..2be250b --- /dev/null +++ b/ms/gra/gra-app/src/main/resources/application.properties @@ -0,0 +1,24 @@ + +springfox.documentation.swagger.v2.path=/api-docs +server.servlet.context-path=/restconf +server.port=8080 +spring.jackson.date-format=org.onap.sdnc.apps.ms.gra.swagger.RFC3339DateFormat +spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false +logging.level.com.att=${LOG_LEVEL} +logging.level.org.onap=${LOG_LEVEL} +spring.datasource.url=jdbc:mariadb://${MYSQL_DB_HOST}:3306/${MYSQL_DATABASE} +spring.datasource.hikari.data-source-properties.useUnicode=true +spring.datasource.hikari.data-source-properties.characterEncoding=UTF-8 +spring.datasource.username=${MYSQL_USER} +spring.datasource.password=${MYSQL_PASSWORD} +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.datasource.platform=mysql +spring.datasource.testWhileIdle=true +spring.datasource.validationQuery=SELECT 1 +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.default_schema=${MYSQL_DATABASE} +spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl +# spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy +spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + +spring.jpa.database=mysql diff --git a/ms/gra/gra-app/src/main/resources/db/changelog/db.changelog-master.yaml b/ms/gra/gra-app/src/main/resources/db/changelog/db.changelog-master.yaml new file mode 100644 index 0000000..087c324 --- /dev/null +++ b/ms/gra/gra-app/src/main/resources/db/changelog/db.changelog-master.yaml @@ -0,0 +1,546 @@ +databaseChangeLog: +- changeSet: + id: 20210211-1 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES + changes: + - createTable: + tableName: CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES + columns: + - column: + name: allottedResourceId + type: varchar(255) + constraints: + nullable: false + primaryKey: true + - column: + name: allottedResourceStatusAction + type: varchar(255) + - column: + name: allottedResourceStatusFinalIndicator + type: varchar(255) + - column: + name: allottedResourceStatusRequestStatus + type: varchar(255) + - column: + name: allottedResourceStatusResponseCode + type: varchar(255) + - column: + name: allottedResourceStatusResponseMessage + type: varchar(255) + - column: + name: allottedResourceStatusResponseTimestamp + type: varchar(255) + - column: + name: allottedResourceStatusRpcAction + type: varchar(255) + - column: + name: allottedResourceStatusRpcName + type: varchar(255) + - column: + name: arData + type: clob +- changeSet: + id: 20210211-2 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS + changes: + - createTable: + tableName: CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS + columns: + - column: + name: configurationId + type: varchar(255) + constraints: + nullable: false + primaryKey: true + - column: + name: pmcData + type: clob + - column: + name: portMirrorConfigurationStatusAction + type: varchar(255) + - column: + name: portMirrorConfigurationStatusFinalIndicator + type: varchar(255) + - column: + name: portMirrorConfigurationStatusRequestStatus + type: varchar(255) + - column: + name: portMirrorConfigurationStatusResponseCode + type: varchar(255) + - column: + name: portMirrorConfigurationStatusResponseMessage + type: varchar(255) + - column: + name: portMirrorConfigurationStatusResponseTimestamp + type: varchar(255) + - column: + name: portMirrorConfigurationStatusRpcAction + type: varchar(255) + - column: + name: portMirrorConfigurationStatusRpcName + type: varchar(255) +- changeSet: + id: 20210211-3 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: CONFIG_GRA_SERVICES + changes: + - createTable: + tableName: CONFIG_GRA_SERVICES + columns: + - column: + name: svcInstanceId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: serviceStatusAction + type: varchar(255) + - column: + name: serviceStatusFinalIndicator + type: varchar(255) + - column: + name: serviceStatusRequestStatus + type: varchar(255) + - column: + name: serviceStatusResponseCode + type: varchar(255) + - column: + name: serviceStatusResponseMessage + type: varchar(255) + - column: + name: serviceStatusResponseTimestamp + type: varchar(255) + - column: + name: serviceStatusRpcAction + type: varchar(255) + - column: + name: serviceStatusRpcName + type: varchar(255) + - column: + name: svcData + type: clob +- changeSet: + id: 20210211-4 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: CONFIG_PRELOAD_DATA + changes: + - createTable: + tableName: CONFIG_PRELOAD_DATA + columns: + - column: + name: preloadId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: preloadType + type: varchar(25) + constraints: + nullable: false + primaryKey: true + - column: + name: preloadData + type: clob +- changeSet: + id: 20210211-5 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: NODE_TYPES + changes: + - createTable: + tableName: NODE_TYPES + columns: + - column: + constraints: + nullable: false + primaryKey: true + name: nodetype + type: varchar(80) +- changeSet: + id: 20210211-6 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES + changes: + - createTable: + tableName: OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES + columns: + - column: + name: allottedResourceId + type: varchar(255) + constraints: + nullable: false + primaryKey: true + - column: + name: allottedResourceStatusAction + type: varchar(255) + - column: + name: allottedResourceStatusFinalIndicator + type: varchar(255) + - column: + name: allottedResourceStatusRequestStatus + type: varchar(255) + - column: + name: allottedResourceStatusResponseCode + type: varchar(255) + - column: + name: allottedResourceStatusResponseMessage + type: varchar(255) + - column: + name: allottedResourceStatusResponseTimestamp + type: varchar(255) + - column: + name: allottedResourceStatusRpcAction + type: varchar(255) + - column: + name: allottedResourceStatusRpcName + type: varchar(255) + - column: + name: arData + type: clob +- changeSet: + id: 20210211-7 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS + changes: + - createTable: + tableName: OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS + columns: + - column: + name: configurationId + type: varchar(255) + constraints: + nullable: false + primaryKey: true + - column: + name: pmcData + type: clob + - column: + name: portMirrorConfigurationStatusAction + type: varchar(255) + - column: + name: portMirrorConfigurationStatusFinalIndicator + type: varchar(255) + - column: + name: portMirrorConfigurationStatusRequestStatus + type: varchar(255) + - column: + name: portMirrorConfigurationStatusResponseCode + type: varchar(255) + - column: + name: portMirrorConfigurationStatusResponseMessage + type: varchar(255) + - column: + name: portMirrorConfigurationStatusResponseTimestamp + type: varchar(255) + - column: + name: portMirrorConfigurationStatusRpcAction + type: varchar(255) + - column: + name: portMirrorConfigurationStatusRpcName + type: varchar(255) +- changeSet: + id: 20210211-8 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: OPERATIONAL_GRA_SERVICES + changes: + - createTable: + tableName: OPERATIONAL_GRA_SERVICES + columns: + - column: + name: svcInstanceId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: serviceStatusAction + type: varchar(255) + - column: + name: serviceStatusFinalIndicator + type: varchar(255) + - column: + name: serviceStatusRequestStatus + type: varchar(255) + - column: + name: serviceStatusResponseCode + type: varchar(255) + - column: + name: serviceStatusResponseMessage + type: varchar(255) + - column: + name: serviceStatusResponseTimestamp + type: varchar(255) + - column: + name: serviceStatusRpcAction + type: varchar(255) + - column: + name: serviceStatusRpcName + type: varchar(255) + - column: + name: svcData + type: clob +- changeSet: + id: 20210211-9 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: OPERATIONAL_PRELOAD_DATA + changes: + - createTable: + tableName: OPERATIONAL_PRELOAD_DATA + columns: + - column: + name: preloadId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + constraints: + nullable: false + primaryKey: true + name: preloadType + type: varchar(25) + - column: + name: preloadData + type: clob +- changeSet: + id: 20210211-10 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: SVC_LOGIC + changes: + - createTable: + tableName: SVC_LOGIC + columns: + - column: + name: module + type: varchar(80) + constraints: + nullable: false + primaryKey: true + - column: + name: rpc + type: varchar(80) + constraints: + nullable: false + primaryKey: true + - column: + name: version + type: varchar(40) + constraints: + nullable: false + primaryKey: true + - column: + name: mode + type: varchar(5) + constraints: + nullable: false + primaryKey: true + - column: + name: active + type: varchar(1) + constraints: + nullable: false + - column: + name: graph + type: longblob + - column: + name: modified_timestamp + type: timestamp + constraints: + nullable: false + defaultValueComputed: CURRENT_TIMESTAMP + - column: + name: md5sum + type: varchar(128) +- changeSet: + id: 20210211-11 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: TEST_RESULT_CONFIG + changes: + - createTable: + tableName: TEST_RESULT_CONFIG + columns: + - column: + name: id + type: bigint + constraints: + nullable: false + primaryKey: true + - column: + name: results + type: varchar(255) + - column: + name: testIdentifier + type: varchar(255) +- changeSet: + id: 20210211-12 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: TEST_RESULT_OPERATIONAL + changes: + - createTable: + tableName: TEST_RESULT_OPERATIONAL + columns: + - column: + name: id + type: bigint + constraints: + nullable: false + primaryKey: true + - column: + name: results + type: varchar(255) + - column: + name: testIdentifier + type: varchar(255) +- changeSet: + id: 20210211-13 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: hibernate_sequence + changes: + - createTable: + tableName: hibernate_sequence + columns: + - column: + name: next_val + type: bigint +- changeSet: + id: 20210216-1 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: CONFIG_GRA_NETWORKS + changes: + - createTable: + tableName: CONFIG_GRA_NETWORKS + columns: + - column: + name: svcInstanceId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: networkId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: networkData + type: clob +- changeSet: + id: 20210216-2 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: CONFIG_GRA_VNFS + changes: + - createTable: + tableName: CONFIG_GRA_VNFS + columns: + - column: + name: svcInstanceId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: vnfId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: vnfData + type: clob +- changeSet: + id: 20210216-3 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - not: + - tableExists: + tableName: CONFIG_GRA_VF_MODULES + changes: + - createTable: + tableName: CONFIG_GRA_VF_MODULES + columns: + - column: + name: svcInstanceId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: vnfId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: vfModuleId + type: varchar(100) + constraints: + nullable: false + primaryKey: true + - column: + name: vfModuleData + type: clob diff --git a/ms/gra/gra-app/src/main/resources/dblib.properties b/ms/gra/gra-app/src/main/resources/dblib.properties new file mode 100644 index 0000000..568a9c4 --- /dev/null +++ b/ms/gra/gra-app/src/main/resources/dblib.properties @@ -0,0 +1,38 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +# dblib.properrties +org.onap.ccsdk.sli.dbtype=jdbc + +org.onap.ccsdk.sli.jdbc.hosts=dbhost +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver +org.onap.ccsdk.sli.jdbc.database=${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER} +org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD} +org.onap.ccsdk.sli.jdbc.connection.name=dbhost +org.onap.ccsdk.sli.jdbc.connection.timeout=50 +org.onap.ccsdk.sli.jdbc.request.timeout=100 +org.onap.ccsdk.sli.jdbc.limit.init=10 +org.onap.ccsdk.sli.jdbc.limit.min=10 +org.onap.ccsdk.sli.jdbc.limit.max=20 +org.onap.dblib.connection.recovery=false + diff --git a/ms/gra/gra-app/src/main/resources/generic-resource-api-dg.properties b/ms/gra/gra-app/src/main/resources/generic-resource-api-dg.properties new file mode 100644 index 0000000..3751142 --- /dev/null +++ b/ms/gra/gra-app/src/main/resources/generic-resource-api-dg.properties @@ -0,0 +1,77 @@ +restapi.templateDir=/opt/onap/sdnc/restapi/templates +controller.url=http://localhost:8080 +controller.user=${ODL_USER} +controller.pwd=${ODL_PASSWORD} +honeycomb.url=http://{honeycomb-instance-ip}:8183 +honeycomb.user=${HONEYCOMB_USER} +honeycomb.pwd=${HONEYCOMB_PASSWORD} +restapi.trustStoreFileName=/opt/onap/sdnc/config/truststoreONAPall.jks +restapi.trustStorePassword=${TRUSTSTORE_PASSWORD} +restapi.keyStoreFileName=/opt/onap/sdnc/config/org.onap.sdnc.p12 +restapi.keyStorePassword=${KEYSTORE_PASSWORD} +restapi.connection-oof-url=http://oof-osdf:8698/api/oof/v1/route +naming.gen-name.url=http://neng-serv:8080 +naming.gen-name.user=ccsdkapps +naming.gen-name.pwd=ccsdkapps +so.user=${SO_USER} +so.pwd=${SO_PASSWORD} +cds.url=http://cds-blueprints-processor-http:8080 +cds.user=${CDS_USER} +cds.pwd=${CDS_PASSWORD} + +# Templates +restapi.sz.templatefile=security-zone-allotted-resource.json +restapi.cr.templatefile=contrail-route-allotted-resource.json +restapi.brg.templatefile=brg-allotted-resource.json +restapi.vpp.vxlan-tunnel.templatefile=vcpe-vxlan-tunnel.json +restapi.vpp.bridge-domain.templatefile=vcpe-vpp-bridge-domain.json +restapi.vpp.xconnect.templatefile=vcpe-l2-interface.json +restapi.tx.templatefile=tunnelxconn-allotted-resource.json +restapi.parentsvc.templatefile=parent-provided-allotted-resource.json +restapi.network-ar.templatefile=network-provided-allotted-resources.json +restapi.vnf-ar.templatefile=vnf-provided-allotted-resources.json +restapi.services.templatefile=vcpe-services-service.json +restapi.services.vnf.vfmodule.templatefile=vfmodule-vim-parameters.vgw.json +restapi.sotn-attachment.templatefile=sotn-attachment-allotted-resource.json +restapi.sdwan-attachment.templatefile=sdwan-attachment-allotted-resource.json +restapi.oof-getpath.templatefile=oof-getpath.json +restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json +restapi.ss.pnf.templatefile=self-serve-pnf-assignments.json +restapi.ss.vnf.templatefile=self-serve-vnf-assignments.json +restapi.ss.vfmodule.templatefile=self-serve-vfmodule-assignments.json +restapi.ss.mS.vlan.tag.assign.templatefile=self-serve-mS-vlan-tag-assignments.json +restapi.ss.mS.vlan.tag.unassign.templatefile=self-serve-mS-vlan-tag-unassignments.json +restapi.ss.mS.mac.address.assign.templatefile=self-serve-mS-mac-address-assign.json +restapi.ss.mS.mac.address.unassign.templatefile=self-serve-mS-mac-address-unassign.json + +# Default cloud owner +cloud-region.cloud-owner=CloudOwner + +# URLs +restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/ +restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/ +restapi.brg-allottedresource=/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/ +restapi.vpp-honeycomb=/restconf/config/ietf-interfaces:interfaces/interface/{tunnel-name}/ +restapi.tx-allottedresource=/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/ +restapi.vnf-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/ +restapi.network-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/ +restapi.pm-configuration=/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/ +restapi.network=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/ +restapi.vnf=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/ +restapi.vnf-api.service-information=/restconf/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/ +restapi.parent-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}/ +restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources/ +restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/ +restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/ +restapi.connection-attachment-allottedresource=/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/ +restapi.naming.gen-name.service=/web/service/v1/genNetworkElementName +restapi.ss-pnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/ +restapi.ss-vnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/ +restapi.ss-vfmodule-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/ +restapi.ss-mS-vlan-tag-assign=/vlantagapi/v1/{action} +restapi.ss-mS-mac-address-assign=/api/macaddress/v1/service/assign/ +restapi.ss-mS-mac-address-unassign=/api/macaddress/v1/service/unassign/ +restapi.preload-network=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{network-name}/network/preload-data/preload-network-topology-information/ +restapi.preloadinformation=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/ +restapi.vf-module=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/ +restapi.vnf-assign=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/ diff --git a/ms/gra/gra-app/src/main/resources/log4j2.properties b/ms/gra/gra-app/src/main/resources/log4j2.properties new file mode 100644 index 0000000..9bc78a3 --- /dev/null +++ b/ms/gra/gra-app/src/main/resources/log4j2.properties @@ -0,0 +1,163 @@ + #- + # ============LICENSE_START======================================================= + # ONAP - CCSDK + # ================================================================================ + # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + # ================================================================================ + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + # ============LICENSE_END========================================================= + # + +property.logDir = ${env:LOG_PATH:-./target} +property.logLevel = ${env:LOG_LEVEL:-INFO} + +property.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{currentGraph} - %X{nodeId} | %m%n + +#default mdc values +property.ServiceName = INTERNAL +property.ErrorCode = 900 +property.ErrorDesc = UnknownError + +rootLogger.level = ${logLevel} +rootLogger.appenderRef.AppFile.ref = AppFile +rootLogger.appenderRef.Console.ref = Console +rootLogger.appenderRef.DebugFile.ref = DebugFile +rootLogger.appenderRef.ErrorFile.ref = ErrorFile +rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter +rootLogger.appenderRef.Console.filter.threshold.level = ${logLevel} + +appender.console.type = Console +appender.console.name = Console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = ${pattern} + +appender.app.type = RollingRandomAccessFile +appender.app.name = AppFile +appender.app.fileName = ${logDir}/app.log +appender.app.filePattern = ${logDir}/app.log.%i +appender.app.immediateFlush = true +appender.app.append = true +appender.app.layout.type = PatternLayout +appender.app.layout.pattern = ${pattern} +appender.app.policies.type = Policies +appender.app.policies.size.type = SizeBasedTriggeringPolicy +appender.app.policies.size.size = 10MB +appender.app.strategy.type = DefaultRolloverStrategy +appender.app.strategy.max = 100 +appender.app.strategy.fileIndex = min + +appender.debug.type = RollingRandomAccessFile +appender.debug.name = DebugFile +appender.debug.fileName = ${logDir}/debug.log +appender.debug.filePattern = ${logDir}/debug.log.%i +appender.debug.immediateFlush = true +appender.debug.append = true +appender.debug.layout.type = PatternLayout +appender.debug.layout.pattern = %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%-16.16t|%-5.5p|%-32.32c{1}|%X{currentGraph} - %X{nodeId}|%m%n +appender.debug.policies.type = Policies +appender.debug.policies.size.type = SizeBasedTriggeringPolicy +appender.debug.policies.size.size = 10MB +appender.debug.strategy.type = DefaultRolloverStrategy +appender.debug.strategy.max = 200 +appender.debug.strategy.fileIndex = min +appender.error.filter.threshold.type = ThresholdFilter +appender.error.filter.threshold.level = DEBUG + +appender.error.type = RollingRandomAccessFile +appender.error.name = ErrorFile +appender.error.fileName = ${logDir}/error.log +appender.error.filePattern = ${logDir}/error.log.%i +appender.error.immediateFlush = true +appender.error.append = true +appender.error.layout.type = PatternLayout +appender.error.layout.pattern = %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%-16.16t|$${ctx:ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%p|$${ctx:ErrorCode}|$${ctx:ErrorDesc}|%m%n + +appender.error.policies.type = Policies +appender.error.policies.size.type = SizeBasedTriggeringPolicy +appender.error.policies.size.size = 10MB +appender.error.strategy.type = DefaultRolloverStrategy +appender.error.strategy.max = 100 +appender.error.strategy.fileIndex = min +appender.error.filter.threshold.type = ThresholdFilter +appender.error.filter.threshold.level = WARN + +appender.metric.type = RollingRandomAccessFile +appender.metric.name = MetricFile +appender.metric.fileName = ${logDir}/metric.log +appender.metric.filePattern = ${logDir}/metric.log.%i +appender.metric.immediateFlush = true +appender.metric.append = true +appender.metric.layout.type = PatternLayout +appender.metric.layout.pattern=%X{InvokeTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|%p|%X{Severity}|192.168.23.111|%X{ElapsedTime}|${hostName}|%X{ClientIPAddress}|%C{1}|||%X{TargetElement}|%markerSimpleName|%X|%X{currentGraph} - %X{nodeId}||%m%n +appender.metric.policies.type = Policies +appender.metric.policies.size.type = SizeBasedTriggeringPolicy +appender.metric.policies.size.size = 10MB +appender.metric.strategy.type = DefaultRolloverStrategy +appender.metric.strategy.max = 100 +appender.metric.strategy.fileIndex = min + +appender.audit.type = RollingRandomAccessFile +appender.audit.name = AuditFile +appender.audit.fileName = ${logDir}/audit.log +appender.audit.filePattern = ${logDir}/audit.log.%i +appender.audit.immediateFlush = true +appender.audit.append = true +appender.audit.layout.type = PatternLayout +appender.audit.layout.pattern=%X{EntryTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|INFO|%X{Severity}|192.168.23.111|%X{ElapsedTime}|${hostName}|%X{ClientIPAddress}|%C{1}|%X{AUDIT-Unused}|%X{AUDIT-ProcessKey}|%markerSimpleName|%X|||%m%n +appender.audit.policies.type = Policies +appender.audit.policies.size.type = SizeBasedTriggeringPolicy +appender.audit.policies.size.size = 10MB +appender.audit.strategy.type = DefaultRolloverStrategy +appender.audit.strategy.max = 200 +appender.audit.strategy.fileIndex = min + +appender.rr.name = RequestResponseFile +appender.rr.type = RollingRandomAccessFile +appender.rr.fileName = ${logDir}/request-response.log +appender.rr.filePattern = ${logDir}/request-response.log.%i +appender.rr.immediateFlush = true +appender.rr.append = true +appender.rr.layout.type = PatternLayout +appender.rr.layout.pattern = %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%X{PartnerName}|%m%n +appender.rr.policies.type = Policies +appender.rr.policies.size.type = SizeBasedTriggeringPolicy +appender.rr.policies.size.size = 10MB +appender.rr.strategy.type = DefaultRolloverStrategy +appender.rr.strategy.max = 100 +appender.rr.strategy.fileIndex = min + +logger.metric.name = org.onap.ccsdk.sli.core.filters.metric +logger.metric.level = INFO +logger.metric.additivity = false +logger.metric.appenderRef.MetricFile.ref = MetricFile + +logger.metric2.name = org.onap.logging.filter.base.AbstractMetricLogFilter +logger.metric2.level = INFO +logger.metric2.additivity = false +logger.metric2.appenderRef.MetricFile.ref = MetricFile + +logger.audit.name = org.onap.logging.filter.base.AbstractAuditLogFilter +logger.audit.level = INFO +logger.audit.additivity = false +logger.audit.appenderRef.AuditFile.ref = AuditFile + +logger.rr.name = org.onap.logging.filter.base.PayloadLoggingServletFilter +logger.rr.level = INFO +logger.rr.additivity = false +logger.rr.appenderRef.RequestResponseFile.ref = RequestResponseFile + +logger.ccsdk.name = org.onap.ccsdk +logger.ccsdk.level = DEBUG + +logger.onaplogging.name = org.onap.logging +logger.onaplogging.level = DEBUG \ No newline at end of file diff --git a/ms/gra/gra-app/src/main/resources/svclogic.properties b/ms/gra/gra-app/src/main/resources/svclogic.properties new file mode 100644 index 0000000..8e49400 --- /dev/null +++ b/ms/gra/gra-app/src/main/resources/svclogic.properties @@ -0,0 +1,29 @@ +### +# ============LICENSE_START======================================================= +# ONAP : CCSDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +org.onap.ccsdk.sli.dbtype = jdbc +org.onap.ccsdk.sli.jdbc.url=jdbc:mariadb://dbhost:3306/${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver +org.onap.ccsdk.sli.jdbc.database = ${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.user = ${MYSQL_USER} +org.onap.ccsdk.sli.jdbc.password = ${MYSQL_PASSWORD} + +sliapi.serviceLogicDirectory=/opt/onap/sdnc/svclogic/graphs -- cgit 1.2.3-korg