take changes

config/commetoo-cloud/mcx-poc-domains.yml

@@ -7,13 +7,17 @@ services:
       -Ddemo.changeRandomality=6#\
       -DconfigFile.location=/opt/mcx/config/config.properties#\
       -DconfigLocation=/opt/mcx/config/#\
-      -Dtransportation.updateTrafficLaneTimeout=300000#\
+      -Dtransportation.updateTrafficLaneTimeout=30000#\
       -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-      -Dtransportation.dsServer.address=ds:50050#\
       -Dds.ip=ds:50050#\
-      -Dtransportation.mdeServer.address=mde:50040"
+      -Dtransportation.dsServer.address=ds:50050#\
+      -Dtransportation.server.address=transportation:50035#\
+      -Dtransportation.mdeServer.address=mde:50040#\
+      -Dtransportation.mde2Server.address=mde2:50041"
       USE_DEBUG: "yes"
-    image: 172.16.1.212:5050/mcx/transportation:29-9207d8
+    image: municipalitybank.com:5050/mcx/transportation:6-ce3e15c
+#   image: municipalitybank.com:5050/mcx/transportation:4-e7b2bf7
+#   image: 172.16.1.212:5050/mcx/transportation:29-9207d8
     networks:
       - backend
 #  image: 172.16.1.212:5050/mcx/transportation:27-2bb5a9
@@ -42,7 +46,7 @@ services:
 ## PUBLIC SFAETY
   public-safety:
     environment:
-      IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\
+      IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim,pedestrian@san-diego#\
       -DpublicSafety.updateCrosswalkTimeout=300000#\
       -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
       -DconfigFile.location=/opt/mcx/config/config.properties#\

config/commetoo-cloud/mcx-poc-front-control-client.yml

@@ -74,8 +74,8 @@ services:
       UI_SERVER_HOSTPORT: "ui-api:8080"
       PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
       SRG_SERVER_HOSTPORT: "srg:7681"
-   # image: 172.16.1.212:5050/mcx/ui-web:control-center-108-a747b6c55de4fb67ce0220a29a08500b23b60ae5
-    image: municipalitybank.com:5050/mcx/ui-web:control-center-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef
+    image: municipalitybank.com:5050/mcx/ui-web:control-center-7-0538537b4a84ee2c77aba24926bc36b1a35ebcc9
+    #image: municipalitybank.com:5050/mcx/ui-web:control-center-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef
     volumes:
       - "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
     networks:
@@ -84,7 +84,8 @@ services:
       - ui-api
   ### UI-WEB-CLIENT (NGINX + WEB)
   ui-web-client:
-    image: municipalitybank.com:5050/mcx/ui-web:client-8-dea10d499084c4340ed08dd3bedc54a62e127965
+    image: municipalitybank.com:5050/mcx/ui-web/client:21-dfcfa2d
+    #image: municipalitybank.com:5050/mcx/ui-web:client-8-dea10d499084c4340ed08dd3bedc54a62e127965
     # image: 172.16.1.212:5050/mcx/ui-web:client-25-fc74e8fe1b9cf7fbca90ad3b4da9fc3187bf4d1e
     environment:
       OTP_SERVER: "otp:8081"
@@ -239,7 +240,11 @@ services:
   mde:
     environment:
       IPG_ENV_PARAMS: "-Dds.IpAddress=ds:50050#\
-      -Dredis.host=redis"
+      -Dredis.host=redis#\
+      -Dmde.cisco.username=operator14@cdp.com#\
+      -Dmde.cisco.password=R0AxOENicTQ=#\
+      -Dmde.cisco.clientId=a27b18484c3c4e08a7c193e42c639347#\
+      -Dmde.cisco.clientSecret=b863de8f453c4a05A88126F45B958CF1"
       USE_DEBUG: "yes"
     image: 172.16.1.212:5050/mcx/mde:19-3ebc7c
   #  image: 172.16.1.212:5050/mcx/mde:15-f25d9f
@@ -252,6 +257,44 @@ services:
 #      - "public-safety:178.62.63.127"
     networks:
       - backend
+  ###### mde2 ###################
+  mde2:
+    environment:
+      ENV_PARAMS_COMMON: "-Dredis.host=redis#\
+      -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000"
+
+      ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\
+      -DconfigLocation=/opt/mcx/config/apiHandler"
+
+      DEBUG_apiHandler: "yes"
+
+      ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
+      -DconfigLocation=/opt/mcx/config/httpAdapter#\
+      -Ddomain_comsrv=comm-service:50060"
+
+      DEBUG_httpAdapter: "yes"
+
+      ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\
+      -DconfigLocation=/opt/mcx/config/apiService/#\
+      -Dredis.host=redis#\
+      -Dmde.cisco.username=devoperator11@cdp.com#\
+      -Dmde.cisco.password=ejlFK0g9OSRK#\
+      -Dmde.cisco.clientId=a27b18484c3c4e08a7c193e42c639347#\
+      -Dmde.cisco.clientSecret=b863de8f453c4a05A88126F45B958CF1"
+
+      DEBUG_apiService: "yes"
+
+    image: municipalitybank.com:5050/mcx/mde2:2-e9c7d03
+    ports:
+      - "8040:8140"        # apiHandler debug port
+      - "8041:8141"        # apiService debug port
+      - "8042:8142"        # httpAdapter debug port
+      - "8043:8043"        # admin debug port
+      - "50041:50041"      # mde2(apiService) listening port
+      - "50042:50042"      # mde2(httpAdapter) listening port
+      - "50043:50043"      # mde2(admin) listening port
+    networks:
+      - backend
   ## Public Safety IC
   public-safety-ic:
     environment:
@@ -267,6 +310,18 @@ services:
       - "50004:50004"
     networks:
       - backend
+  ## COM SERVICE
+  comm-service:  
+    image: municipalitybank.com:5050/mcx/comm-service:1-4-sync-cb
+#    image: municipalitybank.com:5050/mcx/comm-service:latest
+    environment:
+      PARGS: "-m server -p 50000 -s id#rest#http"
+      log4cpp.console: "yes"
+      flushEveryLog: "yes"
+    ports:
+      - "50060:50060"
+    networks:
+      - backend
 networks:
   backend:
     driver: bridge