From f2b1404192d00bab13200bb566f6b8455bc936d0 Mon Sep 17 00:00:00 2001
From: jananib <janani.b@huawei.com>
Date: Tue, 7 Apr 2020 11:19:20 +0530
Subject: Health url addition

Bug fix

Change-Id: Ibd4d5085b62ba22f40a109c9bb92030652c08624
Issue-ID: SO-2775
Signed-off-by: jananib <janani.b@huawei.com>
---
 adapters/mso-nssmf-adapter/pom.xml                    |  18 ++++++++++++++++++
 .../src/main/resources/application-aaf.yaml           |   0
 .../src/main/resources/application-basic.yaml         |   0
 .../src/main/resources/application.yaml               |  16 ++++++++++++----
 .../mso-nssmf-adapter/src/main/resources/nssmf.jks    | Bin 1386 -> 0 bytes
 .../mso-nssmf-adapter/src/main/resources/nssmf.p12    | Bin 1616 -> 0 bytes
 .../src/main/resources/org.onap.so.jks                | Bin 1386 -> 0 bytes
 .../src/main/resources/org.onap.so.p12                | Bin 1616 -> 4095 bytes
 .../src/main/resources/org.onap.so.trust.jks          | Bin 0 -> 1413 bytes
 9 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 adapters/mso-nssmf-adapter/src/main/resources/application-aaf.yaml
 create mode 100644 adapters/mso-nssmf-adapter/src/main/resources/application-basic.yaml
 delete mode 100644 adapters/mso-nssmf-adapter/src/main/resources/nssmf.jks
 delete mode 100644 adapters/mso-nssmf-adapter/src/main/resources/nssmf.p12
 delete mode 100644 adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.jks
 create mode 100644 adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.trust.jks

(limited to 'adapters')

diff --git a/adapters/mso-nssmf-adapter/pom.xml b/adapters/mso-nssmf-adapter/pom.xml
index 3e9c2fe6d7..b257adaa96 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 0000000000..e69de29bb2
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 0000000000..e69de29bb2
diff --git a/adapters/mso-nssmf-adapter/src/main/resources/application.yaml b/adapters/mso-nssmf-adapter/src/main/resources/application.yaml
index f8b28efaf8..303d63d4a2 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 @@ spring:
       - username: mso_admin
         password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
         role: ACTUATOR
+
 server:
   port: 8080
   tomcat:
@@ -60,7 +61,14 @@ mso:
 
 #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 2ecce5bd3d..0000000000
Binary files a/adapters/mso-nssmf-adapter/src/main/resources/nssmf.jks and /dev/null 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 25e7fbfca9..0000000000
Binary files a/adapters/mso-nssmf-adapter/src/main/resources/nssmf.p12 and /dev/null 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 f7cd9e8f86..0000000000
Binary files a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.jks and /dev/null 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 1927b1f13f..79631bf344 100644
Binary files a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12 and b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12 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 0000000000..6f8168d896
Binary files /dev/null and b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.trust.jks differ
-- 
cgit 1.2.3-korg