Merge branch 'develop'

MyEMS · Jun 1, 2023 · 31c71c2 · 31c71c2
2 parents 59ba7df + 27f3f9b
commit 31c71c2
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - changed theme of BarChart and MultiTrendChart in myems-web
 - swapped cloumns color in dashboard of myems-web
 - compacted distribuition system in myems-web
+- updated supported protocols of datasoure in myems-api
 
 ### Fixed
 - fixed HTTPError Deprecated Warning in myems-api

diff --git a/myems-api/core/datasource.py b/myems-api/core/datasource.py
@@ -99,25 +99,31 @@ def on_post(req, resp):
 
         if 'protocol' not in new_values['data'].keys() \
                 or new_values['data']['protocol'] not in \
-                ('modbus-tcp',
+                ('bacnet-ip',
+                 'cassandra',
+                 'clickhouse',
+                 'coap'
+                 'controllogix',
+                 'dlt645',
+                 'iec104',
+                 'influxdb',
+                 'lora',
                  'modbus-rtu',
-                 'bacnet-ip',
-                 's7',
+                 'modbus-tcp',
+                 'mongodb',
+                 'mqtt-seg'
+                 'mqtt',
+                 'mysql',
+                 'opc-ua',
+                 'oracle',
+                 'postgresql',
                  'profibus',
                  'profinet',
-                 'opc-ua',
-                 'lora',
+                 's7',
                  'simulation',
-                 'controllogix',
-                 'weather',
-                 'mysql',
                  'sqlserver',
-                 'postgresql',
-                 'oracle',
-                 'mongodb',
-                 'influxdb',
-                 'mqtt',
-                 'mqtt-seg'):
+                 'tdengine',
+                 'weather',):
             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.BAD_REQUEST',
                                    description='API.INVALID_DATA_SOURCE_PROTOCOL')
         protocol = new_values['data']['protocol']
@@ -307,25 +313,31 @@ def on_put(req, resp, id_):
 
         if 'protocol' not in new_values['data'].keys() \
                 or new_values['data']['protocol'] not in \
-                ('modbus-tcp',
+                ('bacnet-ip',
+                 'cassandra',
+                 'clickhouse',
+                 'coap'
+                 'controllogix',
+                 'dlt645',
+                 'iec104',
+                 'influxdb',
+                 'lora',
                  'modbus-rtu',
-                 'bacnet-ip',
-                 's7',
+                 'modbus-tcp',
+                 'mongodb',
+                 'mqtt-seg'
+                 'mqtt',
+                 'mysql',
+                 'opc-ua',
+                 'oracle',
+                 'postgresql',
                  'profibus',
                  'profinet',
-                 'opc-ua',
-                 'lora',
+                 's7',
                  'simulation',
-                 'controllogix',
-                 'weather',
-                 'mysql',
                  'sqlserver',
-                 'postgresql',
-                 'oracle',
-                 'mongodb',
-                 'influxdb',
-                 'mqtt',
-                 'mqtt-seg'):
+                 'tdengine',
+                 'weather',):
             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.BAD_REQUEST',
                                    description='API.INVALID_DATA_SOURCE_PROTOCOL')
         protocol = new_values['data']['protocol']