| commit | f2b1404192d00bab13200bb566f6b8455bc936d0 | [log] [tgz] |
|---|---|---|
| author | jananib <janani.b@huawei.com> | Tue Apr 07 11:19:20 2020 +0530 |
| committer | jananib <janani.b@huawei.com> | Tue Apr 07 11:19:20 2020 +0530 |
| tree | 13f8bfccd6d39d082835bbccff627be01c53d3cd | |
| parent | 75bf985a00799617a6ae8c278596e3d4f591f17e [diff] |
Health url addition Bug fix Change-Id: Ibd4d5085b62ba22f40a109c9bb92030652c08624 Issue-ID: SO-2775 Signed-off-by: jananib <janani.b@huawei.com>
diff --git a/adapters/mso-nssmf-adapter/pom.xml b/adapters/mso-nssmf-adapter/pom.xml index 3e9c2fe..b257ada 100644 --- a/adapters/mso-nssmf-adapter/pom.xml +++ b/adapters/mso-nssmf-adapter/pom.xml
@@ -66,6 +66,24 @@ <artifactId>jacoco-maven-plugin</artifactId> </plugin> </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <excludes> + <exclude>**/*.p12</exclude> + <exclude>**/*.jks</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*.p12</include> + <include>**/*.jks</include> + </includes> + </resource> + </resources> </build> <dependencies> <dependency>
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/application-aaf.yaml b/adapters/mso-nssmf-adapter/src/main/resources/application-aaf.yaml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/adapters/mso-nssmf-adapter/src/main/resources/application-aaf.yaml
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/application-basic.yaml b/adapters/mso-nssmf-adapter/src/main/resources/application-basic.yaml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/adapters/mso-nssmf-adapter/src/main/resources/application-basic.yaml
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/application.yaml b/adapters/mso-nssmf-adapter/src/main/resources/application.yaml index f8b28ef..303d63d 100644 --- a/adapters/mso-nssmf-adapter/src/main/resources/application.yaml +++ b/adapters/mso-nssmf-adapter/src/main/resources/application.yaml
@@ -44,6 +44,7 @@ - username: mso_admin password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' role: ACTUATOR + server: port: 8080 tomcat: @@ -60,7 +61,14 @@ #Actuator management: - security: - enabled: false - basic: - enabled: false \ No newline at end of file + endpoints: + web: + base-path: /manage + exposure: + include: "*" + 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/adapters/mso-nssmf-adapter/src/main/resources/nssmf.jks b/adapters/mso-nssmf-adapter/src/main/resources/nssmf.jks deleted file mode 100644 index 2ecce5b..0000000 --- a/adapters/mso-nssmf-adapter/src/main/resources/nssmf.jks +++ /dev/null Binary files differ
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/nssmf.p12 b/adapters/mso-nssmf-adapter/src/main/resources/nssmf.p12 deleted file mode 100644 index 25e7fbf..0000000 --- a/adapters/mso-nssmf-adapter/src/main/resources/nssmf.p12 +++ /dev/null Binary files differ
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.jks b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.jks deleted file mode 100644 index f7cd9e8..0000000 --- a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.jks +++ /dev/null Binary files differ
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12 b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12 index 1927b1f..79631bf 100644 --- a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12 +++ b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12 Binary files differ
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.trust.jks b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.trust.jks new file mode 100644 index 0000000..6f8168d --- /dev/null +++ b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.trust.jks Binary files differ