updated base yamls to properly connect to DB 81/78981/1
authorKalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
Thu, 21 Feb 2019 23:34:56 +0000 (18:34 -0500)
committerKalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
Thu, 21 Feb 2019 23:38:42 +0000 (18:38 -0500)
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:
adapters/mso-catalog-db-adapter/pom.xml
adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
adapters/mso-openstack-adapters/src/main/resources/application-local.yaml
adapters/mso-openstack-adapters/src/main/resources/application.yaml
adapters/mso-requests-db-adapter/pom.xml
adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
adapters/mso-requests-db-adapter/src/main/resources/application.yaml
adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
bpmn/mso-infrastructure-bpmn/pom.xml
bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
mso-api-handlers/mso-api-handler-infra/pom.xml
mso-api-handlers/mso-api-handler-infra/src/main/resources/application-local.yaml
mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
mso-api-handlers/mso-api-handler-infra/src/test/resources/application-test.yaml
pom.xml

index 931dee2..390c775 100644 (file)
                <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>
index 83101c1..d46a8ee 100644 (file)
@@ -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
index ef9b113..771aa80 100644 (file)
@@ -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
index e682060..4e8d389 100644 (file)
@@ -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}
index 4a4d09a..a4761ad 100644 (file)
                <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>
index b2b1627..5d3a837 100644 (file)
@@ -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\r
+\r
+server:\r
+    port: 8090\r
+    tomcat:\r
+        max-threads: 50\r
+ssl-enable: false\r
+mso:\r
+  adapters:\r
+    requestDb:\r
+      auth: Basic YnBlbDptc28tZGItMTUwNyE=\r
+      endpoint: http://localhost:8081\r
+  logPath: logs\r
+  site-name: localSite\r
+  infra-requests:\r
+    archived:\r
+      period: 180\r
+spring:\r
+  datasource:\r
+    url: jdbc:mariadb://localhost:3306/requestdb\r
+    username: catalog\r
+    password: catalog123\r
+    driver-class-name: org.mariadb.jdbc.Driver\r
+    initialize: true\r
+    initialization-mode: never\r
+  jpa:\r
+    generate-ddl: false\r
+    show-sql: false\r
+    hibernate:\r
+      ddl-auto: validate\r
+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy\r
+      enable-lazy-load-no-trans: true\r
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect\r
+  security:\r
+    usercredentials:\r
+    -\r
+      username: bpel\r
+      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'\r
+      role: BPEL-Client\r
+    -  \r
+      username: mso_admin\r
+      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'\r
+      role: ACTUATOR\r
+\r
+\r
+flyway:\r
+  baseline-on-migrate: false\r
+  url: jdbc:mariadb://localhost:3306/requestdb\r
+  user: catalog\r
+  password: catalog123\r
       
\ No newline at end of file
index 0da782b..9429592 100644 (file)
@@ -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:
index 19bff50..db98852 100644 (file)
@@ -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\r
+security:\r
+  basic:\r
+    enabled: false\r
+server:\r
+    port: 8080\r
+    tomcat:\r
+        max-threads: 50\r
+ssl-enable: false\r
+mso:\r
+  adapters:\r
+    requestDb:\r
+      auth: Basic YnBlbDptc28tZGItMTUwNyE=\r
+      endpoint: http://localhost:8081\r
+  logPath: logs\r
+  site-name: localSite\r
+  infra-requests:\r
+    archived:\r
+      period: 0\r
+spring:\r
+  datasource:\r
+    url: jdbc:mariadb://localhost:3307/requestdb\r
+    username: root\r
+    password: password\r
+    driver-class-name: org.mariadb.jdbc.Driver\r
+    initialize: true\r
+    initialization-mode: never\r
+  jpa:   \r
+    generate-ddl: false\r
+    show-sql: false\r
+    hibernate:      \r
+      ddl-auto: validate\r
+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy\r
+      enable-lazy-load-no-trans: true\r
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect\r
+  security:\r
+    usercredentials:\r
+    -\r
+      username: bpel\r
+      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'\r
+      role: BPEL-Client\r
+    -  \r
+      username: mso_admin\r
+      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'\r
+      role: ACTUATOR\r
+mariaDB4j:\r
+  dataDir: \r
+  port: 3307\r
+  databaseName: requestdb\r
+\r
+management:\r
+  endpoints:\r
+    web:\r
+      base-path: /manage\r
+  server:\r
+    servlet:\r
+      context-path: /manage\r
+  metrics:\r
+    se-global-registry: false\r
+    export:\r
+      prometheus:\r
+        enabled: true # Whether exporting of metrics to Prometheus is enabled.\r
+        step: 1m # Step size (i.e. reporting frequency) to use.  \r
+\r
+\r
+flyway:\r
+  baseline-on-migrate: false\r
+  url: jdbc:mariadb://localhost:3307/requestdb\r
+  user: root\r
+  password: password\r
index 5d0d05d..fceb181 100644 (file)
                <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>
index 829fc12..d3d2c60 100644 (file)
@@ -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:
index 09ffc0e..56a92cb 100644 (file)
@@ -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
index f316384..16dfa68 100644 (file)
                <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>
index cabee8e..a39d280 100644 (file)
-# 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\r
+\r
+server:\r
+    port: 8080\r
+    tomcat:\r
+        max-threads: 50\r
+ssl-enable: false\r
+\r
+apih-healthcheck-urn: /ecomp/mso/healthcheck,/ecomp/mso/homing/healthcheck,/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck,/ecomp/mso/catalog/v2/healthcheck\r
+jra-healthcheck-urn: /networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck,/appc/rest/healthcheck,/workflows/messages/healthcheck\r
+camunda-healthcheck-urn: /mso/healthcheck\r
+\r
+apih-nodehealthcheck-urn: /ecomp/mso/infra/nodehealthcheck\r
+jra-nodehealthcheck-urn: /adapters/rest/nodehealthcheck\r
+camunda-nodehealthcheck-urn: /mso/nodehealthcheck\r
+\r
+\r
+\r
+mso:\r
+  health:\r
+    endpoints:\r
+      catalogdb: http://localhost:8800\r
+      sdnc: http://localhost:8400\r
+      openstack: http://localhost:8300\r
+      requestdb: http://localhost:8700\r
+      bpmn: http://localhost:8200\r
+      asdc: http://localhost:8400\r
+      requestdbattsvc: http://localhost:8600\r
+      \r
+  adapters:\r
+    requestDb:\r
+      auth: Basic YnBlbDptc28tZGItMTUwNyE=\r
+      endpoint: http://localhost:8081\r
+  logPath: logs\r
+  site-name: mtanj\r
+  catalog:\r
+    db:\r
+      spring:\r
+        endpoint: "http://localhost:8080"\r
+  db:\r
+    auth: Basic YnBlbDptc28tZGItMTUwNyE=\r
+  config: \r
+    path: /src/main/resources/\r
+  infra:\r
+    default:\r
+      alacarte:\r
+        orchestrationUri: /mso/async/services/ALaCarteOrchestrator\r
+        recipeTimeout: 180\r
+        testApi: VNF_API\r
+      service:\r
+        macro:\r
+          default:\r
+            testApi: GR_API\r
+  apih:\r
+    homing:\r
+      sdna:\r
+        url: http://localhost:8089/\r
+        password: 4E0BDC08EE8EDC0572ABBE9FD2D59B62DB725A00B8469E39393D6C86D64284C5D34A57D56F7B58C375316F\r
+  camundaURL: http://localhost:8089/\r
+  camundaAuth: E8E19DD16CC90D2E458E8FF9A884CC0452F8F3EB8E321F96038DE38D5C1B0B02DFAE00B88E2CF6E2A4101AB2C011FC161212EE\r
+  async:\r
+    core-pool-size: 50\r
+    max-pool-size: 50\r
+    queue-capacity: 500\r
+  sdc:\r
+    client:\r
+      auth: 97FF88AB352DA16E00DDD81E3876431DEF8744465DACA489EB3B3BE1F10F63EDA1715E626D0A4827A3E19CD88421BF\r
+    activate:\r
+      instanceid: test\r
+      userid: cs0008\r
+    endpoint: http://localhost:28090\r
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7\r
+  tenant:\r
+    isolation:\r
+      retry:\r
+        count: 3\r
+  aai:\r
+    endpoint: http://localhost:28090\r
+    auth: 5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C\r
+  grm:\r
+    endpoint: http://localhost:28090\r
+    username: gmruser\r
+    password: test\r
+  so:\r
+    operational-environment:\r
+      dmaap:\r
+        username: testuser\r
+        password: VjR5NDcxSzA=\r
+        host: http://localhost:28090\r
+      publisher:\r
+        topic: com.att.ecomp.mso.operationalEnvironmentEvent\r
+\r
+# controls what actions the infra API (APIH) allows sent in on REST request\r
+vnf:\r
+  v1:\r
+    ApiAllowableActions: \r
+  v2:\r
+    ApiAllowableActions: \r
+  v3:\r
+    ApiAllowableActions: \r
+  \r
+network:\r
+  v1:\r
+    ApiAllowableActions: \r
+  v2:\r
+    ApiAllowableActions: \r
+  v3:\r
+    ApiAllowableActions: \r
+  \r
+volume:\r
+  v1:\r
+    ApiAllowableActions: \r
+  v2:\r
+    ApiAllowableActions: \r
+  v3:\r
+    ApiAllowableActions: \r
+\r
+# H2\r
+spring:\r
+  datasource:\r
+    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE\r
+    username: sa\r
+    password: sa\r
+    driver-class-name: org.h2.Driver\r
+    intialize: true\r
+  h2:\r
+    console:\r
+      enabled: true\r
+      path: /h2\r
+\r
+  jpa:\r
+      show-sql: true\r
+      hibernate:\r
+        dialect: org.hibernate.dialect.H2Dialect\r
+        ddl-auto: validate\r
+        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy\r
+        enable_lazy_load_no_trans: true\r
+  jersey:\r
+    type: filter\r
+  security:\r
+    usercredentials:\r
+    -  \r
+      username: sitecontrol\r
+      password: '$2a$12$VBUF.qBmeK1FNyO2MqTpD.P2M1tvlesZlhCkAjjHvF9hmYNVdMDmu'\r
+      role: SiteControl-Client \r
+    -  \r
+      username: gui\r
+      password: '$2a$12$9Y4daXavh.oX5fz6t/e7TuCdj7EKW5B5ibqq425fN3/xpp0/Fhyti'\r
+      role: GUI-Client  \r
+    -  \r
+      username: infraportal\r
+      password: '$2a$12$IpUEhQijWTNbq0fGYVkA9upZrDvdIK6QfblIaKAiwi0vBQRE.C6Ri'\r
+      role: InfraPortal-Client        \r
+    -  \r
+      username: bpel\r
+      password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'\r
+      role: BPEL-Client   \r
+    -  \r
+      username: mso_admin\r
+      password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'\r
+      role: ACTUATOR      \r
+request:\r
+  datasource:\r
+    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE\r
+    username: sa\r
+    password: sa\r
+    driver-class-name: org.h2.Driver\r
+    intialize: true \r
+\r
+#Actuator\r
+management: \r
+  context-path: /manage\r
+\r
+org:\r
+  onap:\r
+    so:\r
+      adapters:\r
+        network:\r
+          encryptionKey: aa3871669d893c7fb8abbcda31b88b4f\r
index 41e024f..76e2caa 100644 (file)
@@ -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:
index 4826c87..88cfd77 100644 (file)
@@ -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 1d5d53d..bd18e7d 100644 (file)
--- 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>