Compare commits
11 Commits
project/sh
...
46fb233dcb
| Author | SHA1 | Date | |
|---|---|---|---|
| 46fb233dcb | |||
| 058a21c271 | |||
| dc09d79696 | |||
| e17ecb7842 | |||
| a19c1af2a7 | |||
| b47b932ae3 | |||
| 46955a2175 | |||
| a91692eb62 | |||
| 95e1085d64 | |||
| c820b6f990 | |||
| 2164003482 |
@@ -7,10 +7,13 @@ jobs:
|
||||
name: Reset docker state
|
||||
steps:
|
||||
- name: Stop all containers
|
||||
if: ${{always()}}
|
||||
run: docker stop $(docker ps -a | cut -d " " -f 1 | tail -n +2)
|
||||
|
||||
- name: Remove all containers
|
||||
if: ${{always()}}
|
||||
run: docker rm $(docker ps -a | cut -d " " -f 1 | tail -n +2)
|
||||
|
||||
- name: Remove extra volumes
|
||||
if: ${{always()}}
|
||||
run: docker volume rm road_vision_postgres_data road_vision_pgadmin-data
|
||||
|
||||
@@ -28,18 +28,27 @@ jobs:
|
||||
- name: Clone repository
|
||||
run: git clone --revision ${{ gitea.sha }} --depth 1 ${{ gitea.server_url }}/${{ gitea.repository }}
|
||||
|
||||
- name: Start postgres_db container for testing
|
||||
working-directory: IoT-Systems
|
||||
run: docker-compose up -d postgres_db
|
||||
|
||||
- name: Build Store testing container
|
||||
working-directory: IoT-Systems
|
||||
run: docker build -t local/store/${{gitea.sha}} -f store/Dockerfile-test .
|
||||
|
||||
- name: Run Store tests
|
||||
working-directory: IoT-Systems
|
||||
run: docker run --rm -it local/store/${{gitea.sha}}
|
||||
run: docker run --network host --rm -it local/store/${{gitea.sha}}
|
||||
|
||||
- name: Clean up containers
|
||||
if: ${{always()}}
|
||||
run: docker image rm local/store/${{gitea.sha}}
|
||||
|
||||
- name: Clean up docker-compose
|
||||
if: ${{always()}}
|
||||
working-directory: IoT-Systems
|
||||
run: docker-compose down -v --remove-orphans
|
||||
|
||||
integration-smoke-test:
|
||||
name: Integration smoke testing
|
||||
runs-on: host-arch-x86_64
|
||||
|
||||
81
diagrams/architecture-diagram.puml
Normal file
81
diagrams/architecture-diagram.puml
Normal file
@@ -0,0 +1,81 @@
|
||||
@startuml
|
||||
interface MQTT as mqtt1
|
||||
interface MQTT as mqtt2
|
||||
interface HTTP as http1
|
||||
interface HTTP as http2
|
||||
interface WebSocket
|
||||
|
||||
node Agent {
|
||||
component Accelerometer
|
||||
component GPS
|
||||
component CarParkingSlots
|
||||
component "Data Aggregator" as agent_agg
|
||||
}
|
||||
|
||||
node Edge {
|
||||
component AgentMQTTAdapter
|
||||
component AgentDataProcessor
|
||||
component HubMQTTAdapter
|
||||
component HubHTTPAdapter
|
||||
}
|
||||
|
||||
node Hub {
|
||||
component EdgeHTTPAdapter
|
||||
component EdgeMQTTAdapter
|
||||
component Aggregator
|
||||
component StoreHTTPAdapter
|
||||
component Redis
|
||||
}
|
||||
|
||||
node Store {
|
||||
component "HTTP Rest API" as store_http
|
||||
component "SQL Adapter" as store_sql
|
||||
component "Websocket API" as store_ws
|
||||
}
|
||||
|
||||
node MapView {
|
||||
component "Store Processor" as mv_sp
|
||||
component "Input Handler" as mv_ih
|
||||
component "Map"
|
||||
}
|
||||
|
||||
component PostgreSQL
|
||||
|
||||
agent_agg --> Accelerometer
|
||||
agent_agg --> GPS
|
||||
agent_agg --> CarParkingSlots
|
||||
|
||||
agent_agg -> mqtt1
|
||||
|
||||
mqtt1 <- AgentMQTTAdapter
|
||||
AgentMQTTAdapter -> AgentDataProcessor
|
||||
AgentDataProcessor --> HubMQTTAdapter
|
||||
AgentDataProcessor --> HubHTTPAdapter
|
||||
HubMQTTAdapter --> mqtt2
|
||||
HubHTTPAdapter --> http1
|
||||
|
||||
mqtt2 <-- EdgeMQTTAdapter
|
||||
http1 <-- EdgeHTTPAdapter
|
||||
EdgeMQTTAdapter --> Aggregator
|
||||
EdgeHTTPAdapter --> Aggregator
|
||||
Aggregator <--> Redis
|
||||
StoreHTTPAdapter <-- Aggregator
|
||||
|
||||
http2 <-- StoreHTTPAdapter
|
||||
store_http --> http2
|
||||
store_http -> store_sql
|
||||
store_sql <- store_ws
|
||||
store_ws --> WebSocket
|
||||
|
||||
store_sql <--> PostgreSQL
|
||||
|
||||
WebSocket <-- mv_sp
|
||||
mv_sp <-- mv_ih
|
||||
mv_sp --> Map
|
||||
|
||||
actor Spectator as user
|
||||
|
||||
Map --> user
|
||||
mv_ih <-- user
|
||||
|
||||
@enduml
|
||||
22
diagrams/general-sequence.puml
Normal file
22
diagrams/general-sequence.puml
Normal file
@@ -0,0 +1,22 @@
|
||||
@startuml
|
||||
actor Worker as worker
|
||||
participant Agent as agent
|
||||
participant "Edge" as edge
|
||||
participant "Hub" as hub
|
||||
participant "Store" as store
|
||||
participant "MapView" as mapview
|
||||
actor Spectator as spectator
|
||||
|
||||
worker -> agent : Start agent
|
||||
agent -> edge : Send sensor data
|
||||
edge -> edge : Classify road state
|
||||
edge -> hub : Send processed data
|
||||
hub -> hub : Save processed data
|
||||
hub -> store : Send processed data batch
|
||||
store -> store : Save processed data batch
|
||||
store -> mapview : Send new rows
|
||||
mapview -> spectator : Show updated paths and markers
|
||||
spectator -> mapview : Click on markers
|
||||
mapview -> spectator : Hide clicked markers
|
||||
mapview -> store : Save display preference
|
||||
@enduml
|
||||
15
diagrams/main-activity-diagram.puml
Normal file
15
diagrams/main-activity-diagram.puml
Normal file
@@ -0,0 +1,15 @@
|
||||
@startuml
|
||||
|Користувач|
|
||||
start
|
||||
:Натискає на іконку ями;
|
||||
|Система|
|
||||
:Запитує підтвердження видалення ями;
|
||||
|Користувач|
|
||||
:Підтверджує видалення ями;
|
||||
|Система|
|
||||
:Модифікує запис про яму;
|
||||
note right #ff9999: Можлива виключна ситуація 1
|
||||
:Видаляє яму;
|
||||
|Користувач|
|
||||
stop
|
||||
@enduml
|
||||
@@ -6,6 +6,7 @@ WORKDIR /app
|
||||
COPY store/requirements.txt .
|
||||
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
RUN pip install --root-user-action ignore --no-cache-dir pytest httpx
|
||||
# Copy the entire application into the container
|
||||
COPY store/. .
|
||||
# Run the main.py script inside the container when it starts
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
PYTHONPATH=$PWD python3 test/main_test.py
|
||||
PYTHONPATH=$PWD python3 -m pytest test_db.py
|
||||
|
||||
Reference in New Issue
Block a user