Remove duplicates zuul routes and add missing settlement service route

crss-ui/crss-ui-dev.yml

@@ -0,0 +1,20 @@
+spring:
+admin-service:
+  ribbon:
+    listOfServers: http://localhost:8082
+registration-service:
+  ribbon:
+    listOfServers: http://localhost:8081
+metering-service:
+  ribbon:
+    listOfServers: http://localhost:8084
+scheduler-service:
+  ribbon:
+    listOfServers: http://localhost:8085
+data-extraction-service:
+  ribbon:
+    listOfServers: http://localhost:8086
+settlement-service:
+  ribbon:
+    listOfServers: http://localhost:9093
+

crss-ui/crss-ui-pemc-staging.yml

@@ -1,3 +0,0 @@
-ribbon:
-  # increase timeout since pemc's AD takes too long to respond
-  ReadTimeout: 120000

crss-ui/crss-ui-pemc-uat.yml

@@ -1,15 +0,0 @@
-admin-service:
-  ribbon:
-    listOfServers: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080
-registration-service:
-  ribbon:
-    listOfServers: http://crssregistration-service.marathon.l4lb.thisdcos.directory:8080
-metering-service:
-  ribbon:
-    listOfServers: http://crssmetering-service.marathon.l4lb.thisdcos.directory:8080
-scheduler-service:
-  ribbon:
-    listOfServers: http://crssscheduler-service.marathon.l4lb.thisdcos.directory:8080
-data-extraction-service:
-  ribbon:
-    listOfServers: http://crssdata-extraction-service.marathon.l4lb.thisdcos.directory:8080

crss-ui/crss-ui-ss-combined.yml

@@ -1,15 +0,0 @@
-admin-service:
-  ribbon:
-    listOfServers: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080
-registration-service:
-  ribbon:
-    listOfServers: http://crssregistration-service.marathon.l4lb.thisdcos.directory:8080
-metering-service:
-  ribbon:
-    listOfServers: http://crssmetering-service.marathon.l4lb.thisdcos.directory:8080
-scheduler-service:
-  ribbon:
-    listOfServers: http://crssscheduler-service.marathon.l4lb.thisdcos.directory:8080
-data-extraction-service:
-  ribbon:
-    listOfServers: http://crssdata-extraction-service.marathon.l4lb.thisdcos.directory:8080

crss-ui/crss-ui-staging.yml

@@ -0,0 +1,18 @@
+admin-service:
+  ribbon:
+    listOfServers: http://admin:8080
+registration-service:
+  ribbon:
+    listOfServers: http://registration:8080
+metering-service:
+  ribbon:
+    listOfServers: http://metering:8080
+scheduler-service:
+  ribbon:
+    listOfServers: http://scheduler:8080
+data-extraction-service:
+  ribbon:
+    listOfServers: http://data-extraction:8080
+settlement-service:
+  ribbon:
+    listOfServers: http://app.reg.settlement.pemc.com

crss-ui/crss-ui.yml

@@ -23,24 +23,26 @@ zuul:
     settlement:
       path: /settlement/**
       serviceId: settlement-service
+
 admin-service:
   ribbon:
-    listOfServers: http://admin:8080
+    listOfServers: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080
 registration-service:
   ribbon:
-    listOfServers: http://registration:8080
+    listOfServers: http://crssregistration-service.marathon.l4lb.thisdcos.directory:8080
 metering-service:
   ribbon:
-    listOfServers: http://metering:8080
+    listOfServers: http://crssmetering-service.marathon.l4lb.thisdcos.directory:8080
 scheduler-service:
   ribbon:
-    listOfServers: http://scheduler:8080
+    listOfServers: http://crssscheduler-service.marathon.l4lb.thisdcos.directory:8080
 data-extraction-service:
   ribbon:
-    listOfServers: http://data-extraction:8080
+    listOfServers: http://crssdata-extraction-service.marathon.l4lb.thisdcos.directory:8080
 settlement-service:
   ribbon:
-    listOfServers: http://app.reg.settlement.pemc.com
+    listOfServers: crss-settlement-app.marathon.l4lb.thisdcos.directory:8082
+
 hystrix:
   command:
     default:
@@ -74,27 +76,4 @@ server:
     direct-buffers: true # Instruct JVM to use native I/O operations on the buffers
     buffer-size: 16384 # Socket buffer size. Default is 16kb
     io-threads: 16 # The number of I/O threads created for non-blocking tasks. (#CPU * 2)
-    worker-threads: 128 # CPU * 16
-
----
-spring:
-  profiles: dev
-admin-service:
-  ribbon:
-    listOfServers: http://localhost:8082
-registration-service:
-  ribbon:
-    listOfServers: http://localhost:8081
-metering-service:
-  ribbon:
-    listOfServers: http://localhost:8084
-scheduler-service:
-  ribbon:
-    listOfServers: http://localhost:8085
-data-extraction-service:
-  ribbon:
-    listOfServers: http://localhost:8086
-settlement-service:
-  ribbon:
-    listOfServers: http://localhost:9093
-
+    worker-threads: 128 # CPU * 16