implement Edge-Hub integration with user_id validation (SCRUM-93, SCRUM-94)
- Agent: Updated config and main - Edge: Implemented adapter factory in main.py to switch between MQTT and HTTP. - Edge: Updated AgentData entity and processing logic to support user_id. - Infrastructure: Configured docker-compose for dynamic protocol switching and environment management.
This commit is contained in:
@@ -22,6 +22,7 @@ services:
|
||||
depends_on:
|
||||
- mqtt
|
||||
environment:
|
||||
PYTHONUNBUFFERED: 1
|
||||
MQTT_BROKER_HOST: "mqtt"
|
||||
MQTT_BROKER_PORT: 1883
|
||||
MQTT_TOPIC: "agent_data_topic"
|
||||
@@ -37,11 +38,13 @@ services:
|
||||
depends_on:
|
||||
- mqtt
|
||||
environment:
|
||||
PYTHONUNBUFFERED: 1
|
||||
MQTT_BROKER_HOST: "mqtt"
|
||||
MQTT_BROKER_PORT: 1883
|
||||
MQTT_TOPIC: " "
|
||||
HUB_HOST: "store"
|
||||
MQTT_TOPIC: "agent_data_topic"
|
||||
HUB_HOST: "hub"
|
||||
HUB_PORT: 8000
|
||||
HUB_CONNECTION_TYPE: "http"
|
||||
HUB_MQTT_BROKER_HOST: "mqtt"
|
||||
HUB_MQTT_BROKER_PORT: 1883
|
||||
HUB_MQTT_TOPIC: "processed_data_topic"
|
||||
@@ -54,6 +57,7 @@ services:
|
||||
container_name: postgres_db
|
||||
restart: always
|
||||
environment:
|
||||
PYTHONUNBUFFERED: 1
|
||||
POSTGRES_USER: user
|
||||
POSTGRES_PASSWORD: pass
|
||||
POSTGRES_DB: test_db
|
||||
@@ -70,6 +74,7 @@ services:
|
||||
image: dpage/pgadmin4
|
||||
restart: always
|
||||
environment:
|
||||
PYTHONUNBUFFERED: 1
|
||||
PGADMIN_DEFAULT_EMAIL: admin@admin.com
|
||||
PGADMIN_DEFAULT_PASSWORD: root
|
||||
volumes:
|
||||
@@ -89,6 +94,7 @@ services:
|
||||
- postgres_db
|
||||
restart: always
|
||||
environment:
|
||||
PYTHONUNBUFFERED: 1
|
||||
POSTGRES_USER: user
|
||||
POSTGRES_PASSWORD: pass
|
||||
POSTGRES_DB: test_db
|
||||
@@ -120,6 +126,7 @@ services:
|
||||
- redis
|
||||
- store
|
||||
environment:
|
||||
PYTHONUNBUFFERED: 1
|
||||
STORE_API_HOST: "store"
|
||||
STORE_API_PORT: 8000
|
||||
REDIS_HOST: "redis"
|
||||
|
||||
Reference in New Issue
Block a user