added uat-default config for settlement uat

crss-admin/crss-admin-pemc-uat-default.yml

@@ -2,7 +2,7 @@ spring:
   redis:
     database: 5
   datasource:
-    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=admin
+    url: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=admin
     username: crss_admin
     password: crss_admin
   mail:

crss-audit/application-pemc-uat-default.yml

@@ -0,0 +1,46 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=audit
+      username: crss_audit
+      password: crss_audit
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    open-in-view: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+    database: 4
+
+server:
+  port: 9094
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+    compression:
+      enabled: true
+      min-response-size: 1
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+logging:
+  level:
+    com.pemc: debug

crss-dataflow-app/crss-dataflow-app-pemc-uat-default.yml

@@ -1,11 +1,11 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_default?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
+      maxPoolSize: 5
       connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1
@@ -25,7 +25,7 @@ spring:
       enabled: false
 
   redis:
-    database: 5
+    database: 4
 
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml
@@ -41,6 +41,14 @@ server:
     enabled: true
     min-response-size: 1
 
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
+
 logging:
   level:
     com.pemc: DEBUG
@@ -48,7 +56,7 @@ logging:
     org.springframework.cloud: DEBUG
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:

crss-meterprocess-app/crss-meterprocess-app-pemc-uat-default.yml

@@ -1,7 +1,9 @@
 spring:
+  redis:
+    database: 4
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
@@ -10,7 +12,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
@@ -19,7 +21,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
@@ -57,6 +59,13 @@ server:
     enabled: true
     min-response-size: 1
 
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
 
 logging:
   level:
@@ -66,7 +75,7 @@ logging:
     org.hibernate.stat: debug
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 job:
   maxRun: 1

crss-settlement-app/crss-settlement-app-pemc-uat-default.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
@@ -17,6 +17,8 @@ spring:
         ddl-auto: validate
         hbm2ddl:
           import_files:
+  redis:
+    database: 4
 
   # prevent batch job from running on app start
   batch:
@@ -58,7 +60,7 @@ logging:
     org.apache.http: DEBUG
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 job:
   maxRun: 1

crss-settlement-task-calculation-addtlcomp/application-pemc-uat-default.yml

@@ -0,0 +1,76 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation-addtlcomp/application-pemc-uat.yml

@@ -54,7 +54,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-default.yml

@@ -1,53 +1,53 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=metering
       username: crss_metering
       password: crss_metering
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
 
   jpa:
     show-sql: false
@@ -65,7 +65,7 @@ spring:
       enabled: true
 
   redis:
-    database: 5
+    database: 4
 
 logging:
   level:

crss-settlement-task-file-gen-addtlcomp/application-pemc-uat-default.yml

@@ -0,0 +1,73 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug
+
+report:
+  directory:
+    base: report/
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: sftp.marathon.l4lb.thisdcos.directory
+    port: 22
+    workingDirectory: /upload/stl
+    privateKey:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-default.yml

@@ -1,37 +1,37 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      driverClassName: org.postgresql.Driver
+      driverClassName: org.postgresql.Driverhd
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 20
+      maxPoolSize: 2
 
   jpa:
     show-sql: false
@@ -49,7 +49,7 @@ spring:
       enabled: true
 
   redis:
-    database: 5
+    database: 4
 
 logging:
   level:

crss-settlement-task-validation/application-pemc-uat-default.yml

@@ -0,0 +1,85 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

ui-bsmd/ui-bsmd-pemc-uat-default.yml

@@ -37,7 +37,13 @@ crss-dataflow-app:
     listOfServers: crss-uat-default-crss2crss-dataflow-app.marathon.l4lb.thisdcos.directory:8082
 crss-admin:
   ribbon:
-    listOfServers: crss-uat-default-crss1admin-service.marathon.l4lb.thisdcos.directory:8080
+    listOfServers: crss-uat-defaultcrss1admin-service.marathon.l4lb.thisdcos.directory:8080
+crss-reg:
+  ribbon:
+    listOfServers: crss-uat-defaultcrss1registration-service.marathon.l4lb.thisdcos.directory:8080
+crss-audit:
+  ribbon:
+    listOfServers: crss-uat-defaultcrss2audit.marathon.l4lb.thisdcos.directory:9094
 
 ribbon:
   ReadTimeout: 1440000