diff options
Diffstat (limited to 'asdc-controller/src/main/resources')
6 files changed, 130 insertions, 25 deletions
diff --git a/asdc-controller/src/main/resources/META-INF/services/org.onap.so.client.RestProperties b/asdc-controller/src/main/resources/META-INF/services/org.onap.so.client.RestProperties new file mode 100644 index 0000000000..a17b39d872 --- /dev/null +++ b/asdc-controller/src/main/resources/META-INF/services/org.onap.so.client.RestProperties @@ -0,0 +1 @@ +org.onap.so.asdc.tenantIsolation.AaiClientPropertiesImpl
\ No newline at end of file diff --git a/asdc-controller/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties b/asdc-controller/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties deleted file mode 100644 index 3745ddd908..0000000000 --- a/asdc-controller/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties +++ /dev/null @@ -1 +0,0 @@ -org.openecomp.mso.asdc.tenantIsolation.AaiClientPropertiesImpl
\ No newline at end of file diff --git a/asdc-controller/src/main/resources/application-local.yaml b/asdc-controller/src/main/resources/application-local.yaml new file mode 100644 index 0000000000..28900f4f95 --- /dev/null +++ b/asdc-controller/src/main/resources/application-local.yaml @@ -0,0 +1,83 @@ +# will be used as entry in DB to say SITE OFF/ON for healthcheck + +server-port: 8080 +ssl-enable: false + + + +# H2 +spring: + datasource: + url: jdbc:mariadb://localhost:3306/catalogdb + username: root + password: password + driver-class-name: org.mariadb.jdbc.Driver + initialize: true + + jpa: + show-sql: true + hibernate: + ddl-auto: validate + naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy + enable-lazy-load-no-trans: true + database-platform: org.hibernate.dialect.MySQL5InnoDBDialect + security: + usercredentials: + - + username: asdc + password: '$2a$12$4R2QhxH7elzoZYoC.HJKTOHYDoaC9LbJD44Q9/tm4t/UzPF9Cgifi' + role: Asdc-Client + - + username: mso_admin + password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa' + role: ACTUATOR +request: + datasource: + url: jdbc:mariadb://localhost:3306/requestdb + username: root + password: password + driver-class-name: org.mariadb.jdbc.Driver + initialize: true + initialization-mode: never + +#Actuator +management: + context-path: /manage + + +mso: + logPath: logs + catalog: + db: + spring: + endpoint: "http://localhost:8090" + db: + auth: Basic YnBlbDptc28tZGItMTUwNyE= + site-name: siteName + aai: + endpoint: https://localhost:8443 + asdc-connections: + asdc-controller1: + user: msopreist + consumerGroup: msoasdc-id-local + consumerId: msoasdc-id-local + environmentName: Pre-IST + asdcAddress: localhost:8443 + password: 658D6E9E0C087547284339181615C358 + pollingInterval: 30 + pollingTimeout: 30 + relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL + activateServerTLSAuth: false + keyStorePassword: + keyStorePath: + watchDogTimeout: 1 + isFitlerInEmptyResources: true + messageBusAddress: localhost,localhost,localhost + asdc: + config: + key: 566B754875657232314F5548556D3665 + components: + count: 3, + componentNames: SO,AAI,SDNC + scheduling: + enabled: false diff --git a/asdc-controller/src/main/resources/application.yaml b/asdc-controller/src/main/resources/application.yaml new file mode 100644 index 0000000000..ced8ab78fc --- /dev/null +++ b/asdc-controller/src/main/resources/application.yaml @@ -0,0 +1,45 @@ + +server: + port: 8080 + +spring: + datasource: + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: org.mariadb.jdbc.Driver + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true + jpa: + show-sql: true + hibernate: + dialect: org.hibernate.dialect.MySQL5Dialect + ddl-auto: validate + naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy + enable-lazy-load-no-trans: true + +request: + datasource: + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: org.mariadb.jdbc.Driver + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true + +#Actuator +management: + context-path: /manage + metrics: + se-global-registry: false + export: + prometheus: + enabled: true # Whether exporting of metrics to Prometheus is enabled. + step: 1m # Step size (i.e. reporting frequency) to use. + diff --git a/asdc-controller/src/main/resources/config-key.properties b/asdc-controller/src/main/resources/config-key.properties deleted file mode 100644 index 66b32275ef..0000000000 --- a/asdc-controller/src/main/resources/config-key.properties +++ /dev/null @@ -1,23 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ECOMP MSO -# ================================================================================ -# 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========================================================= -### - -asdc.config.key=566B754875657232314F5548556D3665 -password.attribute.name=password -key.store.password=keyStorePassword diff --git a/asdc-controller/src/main/resources/resource-examples/notif-structure.json b/asdc-controller/src/main/resources/resource-examples/notif-structure.json index 16c46a51b9..35f9278905 100644 --- a/asdc-controller/src/main/resources/resource-examples/notif-structure.json +++ b/asdc-controller/src/main/resources/resource-examples/notif-structure.json @@ -22,7 +22,7 @@ { "resourceInstanceName": "resource-1", "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134", - "resourceCustomizationUUID": "6402d92d-0050-46a9-8202-623a46680ba7", + "resourceCustomizationUUID": "6402d92d-0050-46a9-8202-623a46680ba7", "resourceName": "resourceName-1", "resourceType": "VF", "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136", |