Merge 'origin/casablanca' into master

[so.git] / bpmn / MSOCommonBPMN / src / test / resources / application-test.yaml

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml b/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
index 236d435..945972c 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
+++ b/bpmn/MSOCommonBPMN/src/test/resources/application-test.yaml
@@ -1,5 +1,5 @@
 aai:
-  auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
+  auth: 5A1272FE739BECA4D4374A86B25C021DFE6745E3BB7BE6836BF64A6059B8220E586C21FD7567AF41DB42571EB7
   endpoint: http://localhost:${wiremock.server.port}
 appc:
   client:
@@ -37,7 +37,7 @@ mso:
     completemsoprocess:
       endpoint: http://localhost:${wiremock.server.port}/CompleteMsoProcess
     db:
-      auth: 757A94191D685FD2092AC1490730A4FC
+      auth: 5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C
       endpoint: http://localhost:${wiremock.server.port}/dbadapters/RequestsDbAdapter
       att-endpoint: http://localhost:${wiremock.server.port}/dbadapters/AttRequestsDbAdapter
       spring:
@@ -50,7 +50,7 @@ mso:
       db:
         endpoint: http://localhost:${wiremock.server.port}/dbadapters/RequestsDbAdapter
     po:
-      auth: 757A94191D685FD2092AC1490730A4FC
+      auth: 5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C
       password: 3141634BF7E070AA289CF2892C986C0B
     sdnc:
       endpoint: http://localhost:${wiremock.server.port}/SDNCAdapter
@@ -71,6 +71,7 @@ mso:
     workflow:
       message:
         endpoint: http://localhost:${wiremock.server.port}/workflows/messages/message
+  camundaAuth: E8E19DD16CC90D2E458E8FF9A884CC0452F8F3EB8E321F96038DE38D5C1B0B02DFAE00B88E2CF6E2A4101AB2C011FC161212EE
 
   async:
       core-pool-size: 50
@@ -83,7 +84,7 @@ mso:
   callbackRetryAttempts: '5'
   catalog:
     db:
-      endpoint: http://localhost:${wiremock.server.port}/
+      endpoint: http://localhost:${wiremock.server.port}/ecomp/mso/catalog
       spring:
         endpoint: http://localhost:${wiremock.server.port} 
   correlation:
@@ -107,6 +108,9 @@ mso:
     db:
       endpoint: http://localhost:${wiremock.server.port}/
   rollback: 'true'
+  rainyDay:
+    retryDurationMultiplier: '2'
+    defaultCode: Abort
   site-name: localDevEnv
   workflow:    
     default:
@@ -115,30 +119,6 @@ mso:
           version: '9'
         generic-vnf:
           version: '9'
-        v8:
-          customer:
-            uri: /aai/v8/business/customers/customer
-          generic-query:
-            uri: /aai/v8/search/generic-query
-          l3-network:
-            uri: /aai/v8/network/l3-networks/l3-network
-          network-policy:
-            uri: /aai/v8/network/network-policies/network-policy
-          nodes-query:
-            uri: /aai/v8/search/nodes-query
-          route-table-reference:
-            uri: /aai/v8/network/route-table-references/route-table-reference
-          tenant:
-            uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
-          vce:
-            uri: /aai/v8/network/vces/vce
-          vpn-binding:
-            uri: /aai/v8/network/vpn-bindings/vpn-binding
-        v9:
-          cloud-region:
-            uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
-          generic-vnf:
-            uri: /aai/v9/network/generic-vnfs/generic-vnf
     global:
       default:
         aai:
@@ -201,7 +181,7 @@ sniro:
 
 spring:
   datasource:
-    url: jdbc:mariadb://localhost:3307/camundabpmn
+    jdbc-url: jdbc:mariadb://localhost:3307/camundabpmn
     username: root
     password: password
     driver-class-name: org.mariadb.jdbc.Driver
@@ -219,8 +199,16 @@ mariaDB4j:
   dataDir:
   port: 3307
   databaseName: camundabpmn
+
 camunda:
   bpm:
     metrics:
       enabled: false
       db-reporter-activate: false
+
+org:
+  onap:
+    so:
+      adapters:
+        network:
+          encryptionKey: aa3871669d893c7fb8abbcda31b88b4f