Solution Gajna DockerPractice

vms/client/simulator/Dockerfile

@@ -1,6 +1,6 @@
-FROM python:alpine3.19
+FROM python:alpine3.19 
 WORKDIR /app
 COPY requirements.txt .
 RUN pip install -r requirements.txt
 COPY . .
-CMD ["python", "main.py"]
+CMD ["python", "main.py"]

vms/client/simulator/docker-compose.yml

@@ -2,23 +2,44 @@ version: "3"
 
 services:
   temp_sensor:
-    image: antonaleks/data-simulator
+    image: annagajna/data-simulator
     environment:
-      - SIM_HOST=192.168.1.1
-      - SIM_NAME=TIRCAHL24
-      - SIM_PERIOD=5
+      - SIM_HOST=192.168.0.101
+      - SIM_NAME=TEMP1
+      - SIM_PERIOD=2
       - SIM_TYPE=temperature
   pressure_sensor:
-    image: antonaleks/data-simulator
+    image: annagajna/data-simulator
     environment:
-      - SIM_HOST=192.168.1.1
-      - SIM_NAME=PIRCAHL11
-      - SIM_PERIOD=10
+      - SIM_HOST=192.168.0.101
+      - SIM_NAME=PRESS1
+      - SIM_PERIOD=2
       - SIM_TYPE=pressure
   current_sensor:
-    image: antonaleks/data-simulator
+    image: annagajna/data-simulator
     environment:
-      - SIM_HOST=192.168.1.1
-      - SIM_NAME=A0_CURRENT
-      - SIM_PERIOD=1
+      - SIM_HOST=192.168.0.101
+      - SIM_NAME=CURRENT1
+      - SIM_PERIOD=2
       - SIM_TYPE=current
+  co_sensor:
+    image: annagajna/data-simulator
+    environment:
+      - SIM_HOST=192.168.0.101
+      - SIM_NAME=CO1
+      - SIM_PERIOD=2
+      - SIM_TYPE=carbon_oxid
+  temp_sensor_2:
+    image: annagajna/data-simulator
+    environment:
+      - SIM_HOST=192.168.0.101
+      - SIM_NAME=TEMP2
+      - SIM_PERIOD=4
+      - SIM_TYPE=temperature
+  co_sensor_2:
+    image: annagajna/data-simulator
+    environment:
+      - SIM_HOST=192.168.0.101
+      - SIM_NAME=CO2
+      - SIM_PERIOD=6
+      - SIM_TYPE=carbon_oxid

vms/client/simulator/entity/sensor.py

@@ -1,54 +1,11 @@
-import random
-
-
-class Sensor:
-    value: float
-    name: str
-    type: str
-
-    def __init__(self, name):
-        self.name = name
-
-    def generate_new_value(self):
-        pass
-
-    def get_data(self):
-        return self.value
-
-    def __str__(self):
-        return {"type": self.type, "name": self.name, "value": self.value}
-
-
-class Temperature(Sensor):
-    step = 25
-
-    def __init__(self, name):
-        super().__init__(name)
-        self.type = "temp"
-
-    def generate_new_value(self):
-        self.value = random.random() + self.step
-
-
-class Pressure(Sensor):
-    step = 55
-
-    def __init__(self, name):
-        super().__init__(name)
-        self.type = "pressure"
-
-    def generate_new_value(self):
-        self.value = random.random() + self.step - 56.48 + 25 * 7
-
-
-class Current(Sensor):
+class CO(Sensor):
     step = 0
-
-    def __init__(self, name):
+    
+    def __init__(self,name):
         super().__init__(name)
-        self.type = "current"
-
+        self.type = "carbon oxid"
+        
     def generate_new_value(self):
-        import math
-        self.value = math.sin(self.step)
-        self.step = self.step + 1
+        self.value = self.step * 1e6
+        self.step = self.step + 0.001
+

vms/client/simulator/main.py

@@ -5,11 +5,12 @@
 from entity.sensor import *
 
 broker = "localhost" if "SIM_HOST" not in environ.keys() else environ["SIM_HOST"]
-port = 1883 if "SIM_PORT" not in environ.keys() else int(environ["SIM_PORT"])
+port = 1883 if "SIM_PORT" not in environ.keys() else environ["SIM_PORT"]
 name = "sensor" if "SIM_NAME" not in environ.keys() else environ["SIM_NAME"]
 period = 1 if "SIM_PERIOD" not in environ.keys() else int(environ["SIM_PERIOD"])
 type_sim = "temperature" if "SIM_TYPE" not in environ.keys() else environ["SIM_TYPE"]
-sensors = {"temperature": Temperature, "pressure": Pressure, "current": Current}
+
+sensors = {"temperature": Temperature, "pressure": Pressure, "current": Current, "carbon_oxid": CO}
 
 
 def on_publish(client, userdata, result):  # create function for callback
@@ -24,4 +25,4 @@ def on_publish(client, userdata, result):  # create function for callback
 while True:
     sensor.generate_new_value()
     ret = client1.publish("sensors/" + sensor.type + "/" + sensor.name, sensor.get_data())  # publish
-    time.sleep(period)
+    time.sleep(period)

vms/gateway/docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3"
+services:
+  broker:
+    image: eclipse-mosquitto
+    container_name: broker
+    volumes:
+      - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
+    ports:
+      - "1883:1883"

vms/gateway/mosquitto/mosquitto.conf

@@ -1,2 +1,2 @@
 listener 1883
-allow_anonymous true
+allow_anonymous true

vms/server/infra/docker-compose.yml

@@ -33,7 +33,6 @@ services:
     networks:
       - server-net
 
-
 volumes:
   influx_data: {}
   grafana_data: {}