updated base yamls to properly connect to DB

Fix startup of catalog, request, bpmn and openstack

Change-Id: I83dcd17d03c71301610ab2c8bbeb30142cc14303
Issue-ID: SO-1558
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>

16 files changed, 333 insertions, 326 deletions

diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index 931dee2d5c..390c775cb2 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -144,6 +144,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+		        <exclusion>
+		            <groupId>org.apache.tomcat</groupId>
+		            <artifactId>tomcat-jdbc</artifactId>
+		         </exclusion>
+     		</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
index 83101c1599..d46a8ee49d 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
@@ -16,7 +16,7 @@ mso:
     
 spring:
   datasource:
-    jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
+    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
diff --git a/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml b/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml
index ef9b113e70..771aa80081 100644
--- a/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml
+++ b/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml
@@ -64,7 +64,7 @@ mso:
 # H2
 spring:
   datasource:
-    jdbc-url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;
+    url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;
     username: sa
     password: sa
     driver-class-name: org.h2.Driver
diff --git a/adapters/mso-openstack-adapters/src/main/resources/application.yaml b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
index e682060c74..4e8d389998 100644
--- a/adapters/mso-openstack-adapters/src/main/resources/application.yaml
+++ b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
@@ -18,7 +18,6 @@ mso:
       retryMultiplier: 60000
 spring:
   datasource:
-    type: com.zaxxer.hikari.HikariDataSource
     url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index 4a4d09a0a9..a4761adf62 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -59,6 +59,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+		        <exclusion>
+		            <groupId>org.apache.tomcat</groupId>
+		            <artifactId>tomcat-jdbc</artifactId>
+		         </exclusion>
+     		</exclusions>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
index b2b16274aa..5d3a837180 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
@@ -1,51 +1,51 @@
-# will be used as entry in DB to say SITE OFF/ON for healthcheck
-
-server:
-    port: 8090
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-mso:
-  adapters:
-    requestDb:
-      auth: Basic YnBlbDptc28tZGItMTUwNyE=
-      endpoint: http://localhost:8081
-  logPath: logs
-  site-name: localSite
-  infra-requests:
-    archived:
-      period: 180
-spring:
-  datasource:
-    jdbc-url: jdbc:mariadb://localhost:3306/requestdb
-    username: catalog
-    password: catalog123
-    driver-class-name: org.mariadb.jdbc.Driver
-    initialize: true
-    initialization-mode: never
-  jpa:
-    generate-ddl: false
-    show-sql: false
-    hibernate:
-      ddl-auto: validate
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      enable-lazy-load-no-trans: true
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  security:
-    usercredentials:
-    -
-      username: bpel
-      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'
-      role: BPEL-Client
-    -  
-      username: mso_admin
-      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
-      role: ACTUATOR
-
-
-flyway:
-  baseline-on-migrate: false
-  url: jdbc:mariadb://localhost:3306/requestdb
-  user: catalog
-  password: catalog123
+# will be used as entry in DB to say SITE OFF/ON for healthcheck

+

+server:

+    port: 8090

+    tomcat:

+        max-threads: 50

+ssl-enable: false

+mso:

+  adapters:

+    requestDb:

+      auth: Basic YnBlbDptc28tZGItMTUwNyE=

+      endpoint: http://localhost:8081

+  logPath: logs

+  site-name: localSite

+  infra-requests:

+    archived:

+      period: 180

+spring:

+  datasource:

+    url: jdbc:mariadb://localhost:3306/requestdb

+    username: catalog

+    password: catalog123

+    driver-class-name: org.mariadb.jdbc.Driver

+    initialize: true

+    initialization-mode: never

+  jpa:

+    generate-ddl: false

+    show-sql: false

+    hibernate:

+      ddl-auto: validate

+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy

+      enable-lazy-load-no-trans: true

+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect

+  security:

+    usercredentials:

+    -

+      username: bpel

+      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'

+      role: BPEL-Client

+    -  

+      username: mso_admin

+      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'

+      role: ACTUATOR

+

+

+flyway:

+  baseline-on-migrate: false

+  url: jdbc:mariadb://localhost:3306/requestdb

+  user: catalog

+  password: catalog123

       
\ No newline at end of file
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
index 0da782bf00..9429592670 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
@@ -18,15 +18,10 @@ mso:
 # H2
 spring:
   datasource:
-    jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
+    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
-    dbcp2: 
-      initial-size: 5
-      max-total: 20
-      validation-query: select 1
-      test-on-borrow: true 
   jpa:
       show-sql: false
       hibernate:
diff --git a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
index 19bff50ea3..db9885285e 100644
--- a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
+++ b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
@@ -1,70 +1,70 @@
-# will be used as entry in DB to say SITE OFF/ON for healthcheck
-security:
-  basic:
-    enabled: false
-server:
-    port: 8080
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-mso:
-  adapters:
-    requestDb:
-      auth: Basic YnBlbDptc28tZGItMTUwNyE=
-      endpoint: http://localhost:8081
-  logPath: logs
-  site-name: localSite
-  infra-requests:
-    archived:
-      period: 0
-spring:
-  datasource:
-    jdbc-url: jdbc:mariadb://localhost:3307/requestdb
-    username: root
-    password: password
-    driver-class-name: org.mariadb.jdbc.Driver
-    initialize: true
-    initialization-mode: never
-  jpa:   
-    generate-ddl: false
-    show-sql: false
-    hibernate:      
-      ddl-auto: validate
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      enable-lazy-load-no-trans: true
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  security:
-    usercredentials:
-    -
-      username: bpel
-      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'
-      role: BPEL-Client
-    -  
-      username: mso_admin
-      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
-      role: ACTUATOR
-mariaDB4j:
-  dataDir: 
-  port: 3307
-  databaseName: requestdb
-
-management:
-  endpoints:
-    web:
-      base-path: /manage
-  server:
-    servlet:
-      context-path: /manage
-  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.  
-
-
-flyway:
-  baseline-on-migrate: false
-  jdbc-url: jdbc:mariadb://localhost:3307/requestdb
-  user: root
-  password: password
+# will be used as entry in DB to say SITE OFF/ON for healthcheck

+security:

+  basic:

+    enabled: false

+server:

+    port: 8080

+    tomcat:

+        max-threads: 50

+ssl-enable: false

+mso:

+  adapters:

+    requestDb:

+      auth: Basic YnBlbDptc28tZGItMTUwNyE=

+      endpoint: http://localhost:8081

+  logPath: logs

+  site-name: localSite

+  infra-requests:

+    archived:

+      period: 0

+spring:

+  datasource:

+    url: jdbc:mariadb://localhost:3307/requestdb

+    username: root

+    password: password

+    driver-class-name: org.mariadb.jdbc.Driver

+    initialize: true

+    initialization-mode: never

+  jpa:   

+    generate-ddl: false

+    show-sql: false

+    hibernate:      

+      ddl-auto: validate

+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy

+      enable-lazy-load-no-trans: true

+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect

+  security:

+    usercredentials:

+    -

+      username: bpel

+      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'

+      role: BPEL-Client

+    -  

+      username: mso_admin

+      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'

+      role: ACTUATOR

+mariaDB4j:

+  dataDir: 

+  port: 3307

+  databaseName: requestdb

+

+management:

+  endpoints:

+    web:

+      base-path: /manage

+  server:

+    servlet:

+      context-path: /manage

+  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.  

+

+

+flyway:

+  baseline-on-migrate: false

+  url: jdbc:mariadb://localhost:3307/requestdb

+  user: root

+  password: password

diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index 5d0d05df92..fceb1812ba 100644
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -175,6 +175,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+		        <exclusion>
+		            <groupId>org.apache.tomcat</groupId>
+		            <artifactId>tomcat-jdbc</artifactId>
+		         </exclusion>
+     		</exclusions>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
index 829fc12474..d3d2c60a37 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ mso:
 spring: 
   datasource:
      driver-class-name: org.mariadb.jdbc.Driver 
-     jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
+     url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
      username: ${DB_USERNAME}
      password: ${DB_PASSWORD}
   http:
diff --git a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
index 09ffc0eb5c..56a92cbd01 100644
--- a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
@@ -157,7 +157,7 @@ sniro:
     headers.latestVersion: 2
 spring:
   datasource:
-    jdbc-url: jdbc:mariadb://localhost:3307/camundabpmn
+    url: jdbc:mariadb://localhost:3307/camundabpmn
     username: root
     password: password
     driver-class-name: org.mariadb.jdbc.Driver
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index f3163840ec..16dfa68244 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -80,6 +80,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+		        <exclusion>
+		            <groupId>org.apache.tomcat</groupId>
+		            <artifactId>tomcat-jdbc</artifactId>
+		         </exclusion>
+     		</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml
index cabee8e8f7..a39d28038c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml
@@ -1,179 +1,179 @@
-# will be used as entry in DB to say SITE OFF/ON for healthcheck
-
-server:
-    port: 8080
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-
-apih-healthcheck-urn: /ecomp/mso/healthcheck,/ecomp/mso/homing/healthcheck,/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck,/ecomp/mso/catalog/v2/healthcheck
-jra-healthcheck-urn: /networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck,/appc/rest/healthcheck,/workflows/messages/healthcheck
-camunda-healthcheck-urn: /mso/healthcheck
-
-apih-nodehealthcheck-urn: /ecomp/mso/infra/nodehealthcheck
-jra-nodehealthcheck-urn: /adapters/rest/nodehealthcheck
-camunda-nodehealthcheck-urn: /mso/nodehealthcheck
-
-
-
-mso:
-  health:
-    endpoints:
-      catalogdb: http://localhost:8800
-      sdnc: http://localhost:8400
-      openstack: http://localhost:8300
-      requestdb: http://localhost:8700
-      bpmn: http://localhost:8200
-      asdc: http://localhost:8400
-      requestdbattsvc: http://localhost:8600
-      
-  adapters:
-    requestDb:
-      auth: Basic YnBlbDptc28tZGItMTUwNyE=
-      endpoint: http://localhost:8081
-  logPath: logs
-  site-name: mtanj
-  catalog:
-    db:
-      spring:
-        endpoint: "http://localhost:8080"
-  db:
-    auth: Basic YnBlbDptc28tZGItMTUwNyE=
-  config: 
-    path: /src/main/resources/
-  infra:
-    default:
-      alacarte:
-        orchestrationUri: /mso/async/services/ALaCarteOrchestrator
-        recipeTimeout: 180
-        testApi: VNF_API
-      service:
-        macro:
-          default:
-            testApi: GR_API
-  apih:
-    homing:
-      sdna:
-        url: http://localhost:8089/
-        password: 4E0BDC08EE8EDC0572ABBE9FD2D59B62DB725A00B8469E39393D6C86D64284C5D34A57D56F7B58C375316F
-  camundaURL: http://localhost:8089/
-  camundaAuth: E8E19DD16CC90D2E458E8FF9A884CC0452F8F3EB8E321F96038DE38D5C1B0B02DFAE00B88E2CF6E2A4101AB2C011FC161212EE
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-  sdc:
-    client:
-      auth: 97FF88AB352DA16E00DDD81E3876431DEF8744465DACA489EB3B3BE1F10F63EDA1715E626D0A4827A3E19CD88421BF
-    activate:
-      instanceid: test
-      userid: cs0008
-    endpoint: http://localhost:28090
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  tenant:
-    isolation:
-      retry:
-        count: 3
-  aai:
-    endpoint: http://localhost:28090
-    auth: 5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C
-  grm:
-    endpoint: http://localhost:28090
-    username: gmruser
-    password: test
-  so:
-    operational-environment:
-      dmaap:
-        username: testuser
-        password: VjR5NDcxSzA=
-        host: http://localhost:28090
-      publisher:
-        topic: com.att.ecomp.mso.operationalEnvironmentEvent
-
-# controls what actions the infra API (APIH) allows sent in on REST request
-vnf:
-  v1:
-    ApiAllowableActions: 
-  v2:
-    ApiAllowableActions: 
-  v3:
-    ApiAllowableActions: 
-  
-network:
-  v1:
-    ApiAllowableActions: 
-  v2:
-    ApiAllowableActions: 
-  v3:
-    ApiAllowableActions: 
-  
-volume:
-  v1:
-    ApiAllowableActions: 
-  v2:
-    ApiAllowableActions: 
-  v3:
-    ApiAllowableActions: 
-
-# H2
-spring:
-  datasource:
-    jdbc-url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    username: sa
-    password: sa
-    driver-class-name: org.h2.Driver
-    intialize: true
-  h2:
-    console:
-      enabled: true
-      path: /h2
-
-  jpa:
-      show-sql: true
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
-        ddl-auto: validate
-        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-        enable_lazy_load_no_trans: true
-  jersey:
-    type: filter
-  security:
-    usercredentials:
-    -  
-      username: sitecontrol
-      password: '$2a$12$VBUF.qBmeK1FNyO2MqTpD.P2M1tvlesZlhCkAjjHvF9hmYNVdMDmu'
-      role: SiteControl-Client 
-    -  
-      username: gui
-      password: '$2a$12$9Y4daXavh.oX5fz6t/e7TuCdj7EKW5B5ibqq425fN3/xpp0/Fhyti'
-      role: GUI-Client  
-    -  
-      username: infraportal
-      password: '$2a$12$IpUEhQijWTNbq0fGYVkA9upZrDvdIK6QfblIaKAiwi0vBQRE.C6Ri'
-      role: InfraPortal-Client        
-    -  
-      username: bpel
-      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'
-      role: BPEL-Client   
-    -  
-      username: mso_admin
-      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
-      role: ACTUATOR      
-request:
-  datasource:
-    jdbc-url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    username: sa
-    password: sa
-    driver-class-name: org.h2.Driver
-    intialize: true 
-
-#Actuator
-management: 
-  context-path: /manage
-
-org:
-  onap:
-    so:
-      adapters:
-        network:
-          encryptionKey: aa3871669d893c7fb8abbcda31b88b4f
+# will be used as entry in DB to say SITE OFF/ON for healthcheck

+

+server:

+    port: 8080

+    tomcat:

+        max-threads: 50

+ssl-enable: false

+

+apih-healthcheck-urn: /ecomp/mso/healthcheck,/ecomp/mso/homing/healthcheck,/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck,/ecomp/mso/catalog/v2/healthcheck

+jra-healthcheck-urn: /networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck,/appc/rest/healthcheck,/workflows/messages/healthcheck

+camunda-healthcheck-urn: /mso/healthcheck

+

+apih-nodehealthcheck-urn: /ecomp/mso/infra/nodehealthcheck

+jra-nodehealthcheck-urn: /adapters/rest/nodehealthcheck

+camunda-nodehealthcheck-urn: /mso/nodehealthcheck

+

+

+

+mso:

+  health:

+    endpoints:

+      catalogdb: http://localhost:8800

+      sdnc: http://localhost:8400

+      openstack: http://localhost:8300

+      requestdb: http://localhost:8700

+      bpmn: http://localhost:8200

+      asdc: http://localhost:8400

+      requestdbattsvc: http://localhost:8600

+      

+  adapters:

+    requestDb:

+      auth: Basic YnBlbDptc28tZGItMTUwNyE=

+      endpoint: http://localhost:8081

+  logPath: logs

+  site-name: mtanj

+  catalog:

+    db:

+      spring:

+        endpoint: "http://localhost:8080"

+  db:

+    auth: Basic YnBlbDptc28tZGItMTUwNyE=

+  config: 

+    path: /src/main/resources/

+  infra:

+    default:

+      alacarte:

+        orchestrationUri: /mso/async/services/ALaCarteOrchestrator

+        recipeTimeout: 180

+        testApi: VNF_API

+      service:

+        macro:

+          default:

+            testApi: GR_API

+  apih:

+    homing:

+      sdna:

+        url: http://localhost:8089/

+        password: 4E0BDC08EE8EDC0572ABBE9FD2D59B62DB725A00B8469E39393D6C86D64284C5D34A57D56F7B58C375316F

+  camundaURL: http://localhost:8089/

+  camundaAuth: E8E19DD16CC90D2E458E8FF9A884CC0452F8F3EB8E321F96038DE38D5C1B0B02DFAE00B88E2CF6E2A4101AB2C011FC161212EE

+  async:

+    core-pool-size: 50

+    max-pool-size: 50

+    queue-capacity: 500

+  sdc:

+    client:

+      auth: 97FF88AB352DA16E00DDD81E3876431DEF8744465DACA489EB3B3BE1F10F63EDA1715E626D0A4827A3E19CD88421BF

+    activate:

+      instanceid: test

+      userid: cs0008

+    endpoint: http://localhost:28090

+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7

+  tenant:

+    isolation:

+      retry:

+        count: 3

+  aai:

+    endpoint: http://localhost:28090

+    auth: 5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C

+  grm:

+    endpoint: http://localhost:28090

+    username: gmruser

+    password: test

+  so:

+    operational-environment:

+      dmaap:

+        username: testuser

+        password: VjR5NDcxSzA=

+        host: http://localhost:28090

+      publisher:

+        topic: com.att.ecomp.mso.operationalEnvironmentEvent

+

+# controls what actions the infra API (APIH) allows sent in on REST request

+vnf:

+  v1:

+    ApiAllowableActions: 

+  v2:

+    ApiAllowableActions: 

+  v3:

+    ApiAllowableActions: 

+  

+network:

+  v1:

+    ApiAllowableActions: 

+  v2:

+    ApiAllowableActions: 

+  v3:

+    ApiAllowableActions: 

+  

+volume:

+  v1:

+    ApiAllowableActions: 

+  v2:

+    ApiAllowableActions: 

+  v3:

+    ApiAllowableActions: 

+

+# H2

+spring:

+  datasource:

+    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE

+    username: sa

+    password: sa

+    driver-class-name: org.h2.Driver

+    intialize: true

+  h2:

+    console:

+      enabled: true

+      path: /h2

+

+  jpa:

+      show-sql: true

+      hibernate:

+        dialect: org.hibernate.dialect.H2Dialect

+        ddl-auto: validate

+        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy

+        enable_lazy_load_no_trans: true

+  jersey:

+    type: filter

+  security:

+    usercredentials:

+    -  

+      username: sitecontrol

+      password: '$2a$12$VBUF.qBmeK1FNyO2MqTpD.P2M1tvlesZlhCkAjjHvF9hmYNVdMDmu'

+      role: SiteControl-Client 

+    -  

+      username: gui

+      password: '$2a$12$9Y4daXavh.oX5fz6t/e7TuCdj7EKW5B5ibqq425fN3/xpp0/Fhyti'

+      role: GUI-Client  

+    -  

+      username: infraportal

+      password: '$2a$12$IpUEhQijWTNbq0fGYVkA9upZrDvdIK6QfblIaKAiwi0vBQRE.C6Ri'

+      role: InfraPortal-Client        

+    -  

+      username: bpel

+      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'

+      role: BPEL-Client   

+    -  

+      username: mso_admin

+      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'

+      role: ACTUATOR      

+request:

+  datasource:

+    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE

+    username: sa

+    password: sa

+    driver-class-name: org.h2.Driver

+    intialize: true 

+

+#Actuator

+management: 

+  context-path: /manage

+

+org:

+  onap:

+    so:

+      adapters:

+        network:

+          encryptionKey: aa3871669d893c7fb8abbcda31b88b4f

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
index 41e024f625..76e2caaca3 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
@@ -29,15 +29,10 @@ mso:
                 
 spring:
   datasource:
-    jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
+    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
-    dbcp2: 
-      initial-size: 5
-      max-total: 20 
-      validation-query: select 1
-      test-on-borrow: true 
 
   jpa:
       show-sql: true
@@ -51,15 +46,10 @@ spring:
                        
 request:
   datasource:
-    jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
+    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
-    driver-class-name: org.mariadb.jdbc.Driver  
-    dbcp2: 
-      initial-size: 5
-      max-total: 20 
-      validation-query: select 1
-      test-on-borrow: true
+    driver-class-name: org.mariadb.jdbc.Driver
 
 #Actuator
 management:
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml
index 4826c8756f..88cfd77e8c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml
@@ -84,7 +84,7 @@ mso:
 
 spring:
   datasource:
-    jdbc-url: jdbc:mariadb://localhost:3307/catalogdb
+    url: jdbc:mariadb://localhost:3307/catalogdb
     username: root
     password: password
     driver-class-name: org.mariadb.jdbc.Driver    
@@ -107,7 +107,7 @@ spring:
       role: InfraPortal-Client
 request:
   datasource:
-    jdbc-url: jdbc:mariadb://localhost:3307/requestdb
+    url: jdbc:mariadb://localhost:3307/requestdb
     username: root
     password: password
     driver-class-name: org.mariadb.jdbc.Driver
diff --git a/pom.xml b/pom.xml
index 1d5d53d9a7..bd18e7d4b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
 		<module>bpmn</module>
 		<module>cloudify-client</module>
 		<module>cxf-logging</module>
-                <module>so-monitoring</module>
 		<module>packages</module>
 	</modules>
 	<properties>