Merge branch '2.0.x' into 2.1.x

  + resolve conflicts

Conflicts:
	crss-dataflow-app/crss-dataflow-app-dev2.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation.yml
	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev.yml
	crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

crss-data/crss-data-pemc-top-sit.yml

@@ -13,9 +13,9 @@ crss:
   datawarehouse:
     datasource:
       platform: postgresql
-      url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataextraction
-      username: crss_sit_dataextraction
-      password: 7nca5DyN
+      url: jdbc:edb://10.176.11.23:5432/crss_sit_external?currentSchema=datawarehouse
+      username: crss_sit_datawarehouse
+      password: 8BE7ShE3
   registration:
      datasource:
        url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration

crss-dataflow-app/crss-dataflow-app-dev2.yml

@@ -1,12 +1,15 @@
 spring:
   crss-dataflow:
     datasource:
-      driverClassName: ${spring.datasource.driverClassName}
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
   jpa:
-    show-sql: true
+    show-sql: false
     generate-ddl: true
     properties:
       hibernate:
@@ -20,9 +23,8 @@ spring:
   batch:
     job:
       enabled: false
-    # set to false if spring batch tables are already created
     initializer:
-      enabled: true
+      enabled: false
 
 server:
   port: 8082

crss-dataflow-app/crss-dataflow-app-devlocal.yml

@@ -5,7 +5,6 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
       connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1

crss-dataflow-app/crss-dataflow-app.yml

@@ -4,7 +4,7 @@ spring:
     datasource:
       driverClassName: com.edb.Driver
       connectionTimeout: 150000
-      maximumPoolSize: 3
+      maximumPoolSize: 10
       test-on-borrow: true
       validation-query: SELECT 1
       jdbcUrl: jdbc:edb://10.176.11.131:5432/crss?currentSchema=dataflow

crss-mq-computation/crss-mq-computation-pemc-uat-sit.yml

@@ -26,7 +26,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 2048
+          memory: 8192
 
   redis:
     database: 4
@@ -34,6 +34,6 @@ spring:
 batch:
   maxWorkers: 20
   partitionSize:
-    mq: 10000
+    mq: 100000
     ssla: 5000
     report: 1

crss-mq-computation/crss-mq-computation-top-sit.yml

@@ -33,9 +33,6 @@ spring:
         dcos:
           authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
 
-  jpa:
-    show-sql: false
-
 batch:
   maxWorkers: 15
   partitionSize:

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

@@ -35,6 +35,7 @@ spring:
 
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-top-sit.yml

@@ -25,3 +25,12 @@ spring:
       username: crss_sit_dataflow
       password: uYgE8bqG
 
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        dcos:
+          authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
+

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp.yml

@@ -52,7 +52,7 @@ spring:
 
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
     properties:
       hibernate:
         generate_statistics: false
@@ -65,6 +65,12 @@ spring:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
 
   batch:
     initializer:

crss-settlement-task-calculation/crss-settlement-task-calculation-dev.yml

@@ -29,3 +29,8 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+
+  redis:
+    host: localhost
+    port: 6379
+

crss-settlement-task-calculation/crss-settlement-task-calculation-devlocal.yml

@@ -58,6 +58,7 @@ spring:
 
   redis:
     host: localhost
+    port: 6379
 
   batch:
     job:

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

@@ -5,42 +5,34 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 1
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 1
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:

crss-settlement-task-calculation/crss-settlement-task-calculation-top-sit.yml

@@ -25,4 +25,12 @@ spring:
       username: crss_sit_dataflow
       password: uYgE8bqG
 
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        dcos:
+          authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
 

crss-settlement-task-calculation/crss-settlement-task-calculation.yml

@@ -5,8 +5,8 @@ spring:
       username: crss_settlement
       password: i17SMOPm
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 900000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -15,8 +15,8 @@ spring:
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 900000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -25,8 +25,8 @@ spring:
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 900000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
@@ -35,8 +35,8 @@ spring:
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 900000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-dataflow:
@@ -45,14 +45,14 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: com.edb.Driver
-      connectionTimeout: 150000
-      maximumPoolSize: 3
+      connectionTimeout: 900000
+      maximumPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
 
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
     properties:
       hibernate:
         generate_statistics: false
@@ -65,6 +65,13 @@ spring:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+
   batch:
     initializer:
       enabled: false
@@ -88,11 +95,11 @@ batch:
     disAggBcq: 4000
     disAggBcqBuyer: 1000
     disAggBcqSeller: 1000
-    rta: 300
+    rta: 900
     rprta: 2000
-    rcra: 400
-    sFactor: 50
-    runway: 150
+    rcra: 900
+    sFactor: 100
+    runway: 400
     spotSeller: 1500
     spotBuyer: 1500
     gmr: 1500

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

@@ -20,3 +20,7 @@ spring:
 
   redis:
     database: 4
+
+  profiles:
+    include: mesos
+

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-top-sit.yml

@@ -15,3 +15,13 @@ spring:
       username: crss_sit_meterprocess
       password: PmfXsUQp
       connectionTimeout: 10000
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        dcos:
+          authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
+

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp.yml

@@ -32,7 +32,7 @@ spring:
 
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
     properties:
       hibernate:
         generate_statistics: false
@@ -45,6 +45,12 @@ spring:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
 
   batch:
     initializer:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev.yml

@@ -5,18 +5,25 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      maximumPoolSize: 10
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      maximumPoolSize: 10
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      maximumPoolSize: 10
+
+  jpa:
+    show-sql: false
+    generate-ddl: false
 
   batch:
     job:
@@ -31,7 +38,9 @@ batch:
   chunkSize: 100
   maxWorkers: 2
   partitionSize:
-    amsSp: 15
+    amsSp: 5
+    amsInv: 10
+    amsMf: 10
     energyStl: 10
     lr: 10
 

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-top-sit.yml

@@ -13,4 +13,14 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=stlInvoiceGen
       username: crss_sit_meterprocess
-      password: PmfXsUQp
+      password: PmfXsUQp
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        dcos:
+          authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
+

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

@@ -32,7 +32,7 @@ spring:
 
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
     properties:
       hibernate:
         generate_statistics: false
@@ -45,6 +45,12 @@ spring:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
 
   batch:
     initializer:
@@ -57,8 +63,10 @@ batch:
   maxWorkers: 10
   partitionSize:
     amsSp: 1500
-    energyStl: 1500
-    lr: 1500
+    amsInv: 1500
+    amsMf: 1500
+    energyStl: 1
+    lr: 1
 
 logging:
   level:
@@ -69,7 +77,8 @@ logging:
 
 report:
   directory:
-    base: report/
+    base: /tmp/stl/
+    sftp: report/
 
 sftp:
   credentials:

crss-settlement-task-validation/crss-settlement-task-validation-top-sit.yml

@@ -28,4 +28,14 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=stlValidation
       username: crss_sit_dataflow
-      password: uYgE8bqG
+      password: uYgE8bqG
+
+  profiles:
+    include: mesos
+
+  cloud:
+    deployer:
+      mesos:
+        dcos:
+          authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
+

crss-settlement-task-validation/crss-settlement-task-validation.yml

@@ -74,6 +74,12 @@ spring:
     task:
       initialize:
         enable: false
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
 
   batch:
     initializer:
@@ -85,7 +91,7 @@ batch:
   chunkSize: 100
   maxWorkers: 10
   partitionSize:
-    tpBillingId: 100
+    tpBillingId: 25
     eps: 100
     rps: 100
     seinBillingId: 100