Merge remote-tracking branch 'origin/master'

components/entitiy_ident/entity_ident_service/entity_ident_server.py

@@ -1,3 +1,4 @@
+import os
 from bson import json_util
 from flask import Flask, request
 from flask_pymongo import PyMongo
@@ -6,6 +7,38 @@ app = Flask(__name__)
 app.config["MONGO_URI"] = "mongodb://mongo:27017/entities"
 mongo = PyMongo(app)
 
+CAR1_SV = int(os.environ.get('DSE2021_CAR1_SV', 130))
+CAR2_SV = int(os.environ.get('DSE2021_CAR2_SV', 130))
+CAR3_SV = int(os.environ.get('DSE2021_CAR3_SV', 130))
+
+CAR1_SD = int(os.environ.get('DSE2021_CAR1_SD', 300))
+CAR2_SD = int(os.environ.get('DSE2021_CAR2_SD', 500))
+CAR3_SD = int(os.environ.get('DSE2021_CAR3_SD', 400))
+
+CAR1_ST = int(os.environ.get('DSE2021_CAR1_ST', 10))
+CAR2_ST = int(os.environ.get('DSE2021_CAR2_ST', 15))
+CAR3_ST = int(os.environ.get('DSE2021_CAR3_ST', 25))
+
+TL1_R = int(os.environ.get('DSE2021_TL1_R', 2000))
+TL2_R = int(os.environ.get('DSE2021_TL2_R', 800))
+TL3_R = int(os.environ.get('DSE2021_TL3_R', 1000))
+
+mongo.db.trafficLights.update_one({"id": "1"}, {"$set": {"range": TL1_R}})
+mongo.db.trafficLights.update_one({"id": "2"}, {"$set": {"range": TL2_R}})
+mongo.db.trafficLights.update_one({"id": "3"}, {"$set": {"range": TL3_R}})
+
+mongo.db.cars.update_one({"vin": "SCBFR7ZA5CC072256"}, {"$set": {"startingVelocity": CAR1_SV}})
+mongo.db.cars.update_one({"vin": "5GZCZ43D13S812715"}, {"$set": {"startingVelocity": CAR2_SV}})
+mongo.db.cars.update_one({"vin": "5GZCZ43D13S812716"}, {"$set": {"startingVelocity": CAR3_SV}})
+
+mongo.db.cars.update_one({"vin": "SCBFR7ZA5CC072256"}, {"$set": {"startingDistance": CAR1_SD}})
+mongo.db.cars.update_one({"vin": "5GZCZ43D13S812715"}, {"$set": {"startingDistance": CAR2_SD}})
+mongo.db.cars.update_one({"vin": "5GZCZ43D13S812716"}, {"$set": {"startingDistance": CAR3_SD}})
+
+mongo.db.cars.update_one({"vin": "SCBFR7ZA5CC072256"}, {"$set": {"startingTime": CAR1_ST}})
+mongo.db.cars.update_one({"vin": "5GZCZ43D13S812715"}, {"$set": {"startingTime": CAR2_ST}})
+mongo.db.cars.update_one({"vin": "5GZCZ43D13S812716"}, {"$set": {"startingTime": CAR3_ST}})
+
 
 @app.route('/api/v1/resources/cars', methods=['GET'])
 def get_cars():

components/entitiy_ident/mongo/cars.json

@@ -3,24 +3,15 @@
     "oem": "BENTLEY",
     "modelType": "Continental",
     "vin": "SCBFR7ZA5CC072256",
-    "startingVelocity":  130,
-    "startingDistance": 300,
-    "startingTime": 10
   },
   {
     "oem": "SATURN",
     "modelType": "Vue",
     "vin": "5GZCZ43D13S812715",
-    "startingVelocity": 130,
-    "startingDistance": 500,
-    "startingTime": 15
   },
   {
     "oem": "SATURN",
     "modelType": "Vue2",
     "vin": "5GZCZ43D13S812716",
-    "startingVelocity": 130,
-    "startingDistance": 400,
-    "startingTime": 25
   }
 ]

components/entitiy_ident/mongo/traffic_lights.json

@@ -2,21 +2,18 @@
   {
     "id": "1",
     "location": [16.20719, 47.89584],
-    "range": 2000,
     "switchingTime": 26,
     "color": "RED"
   },
   {
     "id": "2",
     "location":  [16.20814, 47.90937],
-    "range": 800,
     "switchingTime": 16,
     "color": "GREEN"
   },
   {
     "id": "3",
     "location":  [16.20917, 47.92703],
-    "range": 1000,
     "switchingTime": 20,
     "color": "RED"
   }

kubernetes/configmaps/scaling-configmap.yaml

@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: scaling-configmap
-data:
-  DSE2021_SCALING: "2"

kubernetes/configmaps/simulation-parameters-configmap.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: simulation-parameters-configmap
+data:
+  DSE2021_SCALING: "2"
+  DSE2021_CAR1_SV: "130"
+  DSE2021_CAR2_SV: "130"
+  DSE2021_CAR3_SV: "130"
+  DSE2021_CAR1_SD: "300"
+  DSE2021_CAR2_SD: "500"
+  DSE2021_CAR3_SD: "400"
+  DSE2021_CAR1_ST: "10"
+  DSE2021_CAR2_ST: "15"
+  DSE2021_CAR3_ST: "25"
+  DSE2021_TL1_R: "2000"
+  DSE2021_TL2_R: "800"
+  DSE2021_TL3_R: "1000"

kubernetes/deployments/controlcenter-deployment.yaml

@@ -26,7 +26,7 @@ spec:
             - name: DSE2021_SCALING
               valueFrom:
                 configMapKeyRef:
-                  name: scaling-configmap
+                  name: simulation-parameters-configmap
                   key: DSE2021_SCALING
       restartPolicy: Always
       serviceAccountName: ""

kubernetes/deployments/entityident-deployment.yaml

@@ -26,8 +26,68 @@ spec:
           - name: DSE2021_SCALING
             valueFrom:
               configMapKeyRef:
-                name: scaling-configmap
+                name: simulation-parameters-configmap
                 key: DSE2021_SCALING
+          - name: DSE2021_CAR1_SV
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR1_SV
+          - name: DSE2021_CAR2_SV
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR2_SV
+          - name: DSE2021_CAR3_SV
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR3_SV
+          - name: DSE2021_CAR1_SD
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR1_SD
+          - name: DSE2021_CAR2_SD
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR2_SD
+          - name: DSE2021_CAR3_SD
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR3_SD
+          - name: DSE2021_CAR1_ST
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR1_ST
+          - name: DSE2021_CAR2_ST
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR2_ST
+          - name: DSE2021_CAR3_ST
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_CAR3_ST
+          - name: DSE2021_TL1_R
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_TL1_R
+          - name: DSE2021_TL2_R
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_TL2_R
+          - name: DSE2021_TL3_R
+            valueFrom:
+              configMapKeyRef:
+                name: simulation-parameters-configmap
+                key: DSE2021_TL3_R
       restartPolicy: Always
       serviceAccountName: ""
       volumes: null

kubernetes/deployments/eventstore-deployment.yaml

@@ -26,7 +26,7 @@ spec:
           - name: DSE2021_SCALING
             valueFrom:
               configMapKeyRef:
-                name: scaling-configmap
+                name: simulation-parameters-configmap
                 key: DSE2021_SCALING
       restartPolicy: Always
       serviceAccountName: ""

kubernetes/deployments/ifeed-deployment.yaml

@@ -24,7 +24,7 @@ spec:
           - name: DSE2021_SCALING
             valueFrom:
               configMapKeyRef:
-                name: scaling-configmap
+                name: simulation-parameters-configmap
                 key: DSE2021_SCALING
       restartPolicy: Always
       serviceAccountName: ""

kubernetes/deployments/orchestration-deployment.yaml

@@ -24,7 +24,7 @@ spec:
           - name: DSE2021_SCALING
             valueFrom:
               configMapKeyRef:
-                name: scaling-configmap
+                name: simulation-parameters-configmap
                 key: DSE2021_SCALING
       restartPolicy: Always
       serviceAccountName: ""

kubernetes/deployments/xway-deployment.yaml

@@ -26,7 +26,7 @@ spec:
           - name: DSE2021_SCALING
             valueFrom:
               configMapKeyRef:
-                name: scaling-configmap
+                name: simulation-parameters-configmap
                 key: DSE2021_SCALING
       restartPolicy: Always
       serviceAccountName: ""