From b55947cfbe728d8a09bc670954b7d116fe6ab627 Mon Sep 17 00:00:00 2001 From: ngovinh2k2 Date: Fri, 27 Feb 2026 13:25:42 +0700 Subject: [PATCH] refactor: update device model --- device-service | 2 +- django-common-utils | 2 +- haproxy/haproxy.cfg | 4 ++ haproxy/routes/device.lua | 104 --------------------------------- haproxy/routes/routes.lua | 2 + haproxy/routes/transformer.lua | 17 ++++++ transformer-service | 2 +- 7 files changed, 26 insertions(+), 107 deletions(-) create mode 100644 haproxy/routes/transformer.lua diff --git a/device-service b/device-service index 0772833..6d7ad9a 160000 --- a/device-service +++ b/device-service @@ -1 +1 @@ -Subproject commit 0772833f99237ce5be004499cbd89b47028137db +Subproject commit 6d7ad9aba0a34f7ae9cbed55233a8ea4dbc4099c diff --git a/django-common-utils b/django-common-utils index 00a0fe0..29bf25d 160000 --- a/django-common-utils +++ b/django-common-utils @@ -1 +1 @@ -Subproject commit 00a0fe0525d86d0c1a6a41ecd9be456a8ce40dae +Subproject commit 29bf25de3ab5ed723be081cf6f50315403712047 diff --git a/haproxy/haproxy.cfg b/haproxy/haproxy.cfg index 16c074e..a304dac 100644 --- a/haproxy/haproxy.cfg +++ b/haproxy/haproxy.cfg @@ -133,6 +133,10 @@ backend device_backend mode http server local device:80 +backend transformer_backend + mode http + server local transformer:8080 + backend telemetry_backend mode http server local telemetry:8080 diff --git a/haproxy/routes/device.lua b/haproxy/routes/device.lua index b48184c..2ce2931 100644 --- a/haproxy/routes/device.lua +++ b/haproxy/routes/device.lua @@ -2,58 +2,6 @@ routes = { -- -------------- -- Device -- -------------- - ["^/api/device%-models/?$"] = { - POST = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - GET = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - }, - ["^/api/device%-models/[0-9a-f-]+/?$"] = { - PUT = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - GET = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - PATCH = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - DELETE = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - }, ["^/api/device%-spaces/?$"] = { POST = { service = "device", @@ -178,58 +126,6 @@ routes = { is_root_user_api = false, }, }, - ["^/api/manufacturers/?$"] = { - POST = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - GET = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - }, - ["^/api/manufacturers/[0-9a-f-]+/?$"] = { - PUT = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - GET = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - PATCH = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - DELETE = { - service = "device", - auth_required = true, - role_required = nil, - space_required = false, - organization_required = true, - is_root_user_api = true, - }, - }, ["^/api/network%-server/?$"] = { POST = { service = "device", diff --git a/haproxy/routes/routes.lua b/haproxy/routes/routes.lua index 47773ba..e0a301a 100644 --- a/haproxy/routes/routes.lua +++ b/haproxy/routes/routes.lua @@ -5,6 +5,7 @@ device_routes = require("routes.device") mpa_routes = require("routes.mpa") telemetry_routes = require("routes.telemetry") bootstrap_routes = require("routes.bootstrap") +transformer_routes = require("routes.transformer") routes = {} for k, v in pairs(docs_routes) do routes[k] = v end @@ -14,5 +15,6 @@ for k, v in pairs(device_routes) do routes[k] = v end for k, v in pairs(mpa_routes) do routes[k] = v end for k, v in pairs(telemetry_routes) do routes[k] = v end for k, v in pairs(bootstrap_routes) do routes[k] = v end +for k, v in pairs(transformer_routes) do routes[k] = v end return routes diff --git a/haproxy/routes/transformer.lua b/haproxy/routes/transformer.lua new file mode 100644 index 0000000..a3a53a7 --- /dev/null +++ b/haproxy/routes/transformer.lua @@ -0,0 +1,17 @@ +routes = { + -- -------------- + -- Transformer + -- -------------- + ["^/api/device%-models/?$"] = { + GET = { + service = "transformer", + auth_required = true, + role_required = nil, + space_required = false, + organization_required = true, + is_root_user_api = true, + }, + }, +} + +return routes diff --git a/transformer-service b/transformer-service index b54199d..859cc40 160000 --- a/transformer-service +++ b/transformer-service @@ -1 +1 @@ -Subproject commit b54199d4b2feff2bc3341a0427869121b0010bcd +Subproject commit 859cc4096b4704593542a0fdf997e29c9c8711e6