1 files changed, 58 insertions, 48 deletions
diff --git a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml
index 33d865c1..ffae8eb2 100644
--- a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml
+++ b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml
@@ -11,54 +11,64 @@
 # 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.
-
 spring:
- h2:
-  console:
-  enabled: true
-  path: console
- datasource:
-  url: jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
-  username: admin
-  password: admin
- http:
-  converters:
-   preferred-json-mapper: gson
- security:
-  usercredentials:
-   - username: vnfm
-     password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-     role: BPEL-Client
-
+   h2:
+      console: null
+      enabled: true
+      path: console
+   datasource:
+      url: jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+      username: admin
+      password: admin
+   http:
+      converters:
+         preferred-json-mapper: gson
+   security:
+      usercredentials:
+      -  username: vnfm
+         password: $2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke
+         role: BPEL-Client
+   main:
+      allow-bean-definition-overriding: true
 server:
-  port: 9093
-  tomcat:
-    max-threads: 50
-  ssl:
-    key-alias: so@so.onap.org
-    key--store-password: '7Em3&j4.19xYiMelhD5?xbQ.'
-    key-store: classpath:so-vnfm-simulator.p12
-    key-store-type: PKCS12
-
+   port: 9093
+   tomcat:
+      max-threads: 50
+   ssl:
+      key-alias: so@so.onap.org
+      key--store-password: 7Em3&j4.19xYiMelhD5?xbQ.
+      key-store: classpath:so-vnfm-simulator.p12
+      key-store-type: PKCS12
+http:
+   client:
+      ssl:
+         trust-store: classpath:so-vnfm-adapter.p12
+         trust-store-password: ywsqCy:EEo#j}HJHM7z^Rk[L
+endpoint:
+   callbackUri: https://so-vnfm-simulator.onap:9093/vnfpkgm/v1/notification
+vnfm-adapter:
+   auth:
+      name: vnfm
+      password: password1$
 vnfds:
-  vnfdlist:
-  -  vnfdid: 1
-     vnfclist:
-     - vnfcid: VNFC1
-       resourceTemplateId: vnfd1_vnfc1
-       vduId: vnfd1_vduForVnfc1
-       type: COMPUTE
-     - vnfcid: VNFC2
-       resourceTemplateId: vnfd1_vnfc2
-       vduId: vnfd1_vduForVnfc2
-       type: COMPUTE
-  -  vnfdid: 2
-     vnfclist:
-     - vnfcid: VNFC3
-       resourceTemplateId: vnfd2_vnfc3
-       vduId: vnfd2_vduForVnfc3
-       type: COMPUTE
-     - vnfcid: VNFC4
-       resourceTemplateId: vnfd2_vnfc4
-       vduId: vnfd2_vduForVnfc4
-       type: COMPUTE
+   vnfdlist:
+   -  vnfdid: 1
+      vnfclist:
+      -  vnfcid: VNFC1
+         resourceTemplateId: vnfd1_vnfc1
+         vduId: vnfd1_vduForVnfc1
+         type: COMPUTE
+      -  vnfcid: VNFC2
+         resourceTemplateId: vnfd1_vnfc2
+         vduId: vnfd1_vduForVnfc2
+         type: COMPUTE
+   -  vnfdid: 2
+      vnfclist:
+      -  vnfcid: VNFC3
+         resourceTemplateId: vnfd2_vnfc3
+         vduId: vnfd2_vduForVnfc3
+         type: COMPUTE
+      -  vnfcid: VNFC4
+         resourceTemplateId: vnfd2_vnfc4
+         vduId: vnfd2_vduForVnfc4
+         type: COMPUTE