8 files changed, 23 insertions, 10 deletions
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
--- /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 0000000000..e69de29bb2
--- /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 cb2f04d7ec..303d63d4a2 100644
--- a/adapters/mso-nssmf-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-nssmf-adapter/src/main/resources/application.yaml
@@ -25,11 +25,10 @@ logging:
 
 spring:
   datasource:
+    jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
+    username: ${DB_USERNAME}
+    password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
-    jdbcUrl: jdbc:mariadb://192.168.235.44:30444/requestdb
-    username: root
-    password: secretpassword
-
   jpa:
     show-sql: false
     hibernate:
@@ -37,6 +36,15 @@ spring:
       ddl-auto: validate
       naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
       enable-lazy-load-no-trans: true
+  security:
+    usercredentials:
+      - username: bpel
+        password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+        role: BPEL-Client
+      - username: mso_admin
+        password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+        role: ACTUATOR
+
 server:
   port: 8080
   tomcat:
@@ -46,8 +54,6 @@ mso:
   key: 07a7159d3bf51a0e53be7a8f89699be7
   site-name: localSite
   logPath: ./logs/nssmf
-  msb-ip: msb-iag.{{ include "common.namespace" . }}
-  msb-port: 80
   adapters:
     requestDb:
       endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
@@ -55,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
--- a/adapters/mso-nssmf-adapter/src/main/resources/nssmf.jks
+++ /dev/null
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
--- a/adapters/mso-nssmf-adapter/src/main/resources/nssmf.p12
+++ /dev/null
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
--- a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.jks
+++ /dev/null
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
--- a/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12
+++ b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.p12
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
--- /dev/null
+++ b/adapters/mso-nssmf-adapter/src/main/resources/org.onap.so.trust.jks