OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #222: (api -> master)

Browse Source 
Merge Request: Fix get scada element

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/222?initial=true
This commit is contained in:
王琼钰
2023-05-02 23:05:36 +08:00
parent 4ca41aed33 62b086d939
commit 3a8bb84617
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test_tjnetwork.py
View File

@@ -4677,7 +4677,7 @@ class TestApi:
p = 'test_scada_device' p = 'test_scada_device'
self.enter(p) self.enter(p)
assert get_scada_devices(p) == [] assert get_all_scada_device_ids(p) == []
d = get_scada_device(p, 'd0') d = get_scada_device(p, 'd0')
assert d == {} assert d == {}
@@ -4703,7 +4703,7 @@ class TestApi:
assert d['address'] == 'x' assert d['address'] == 'x'
assert d['sd_type'] == SCADA_DEVICE_TYPE_PRESSURE assert d['sd_type'] == SCADA_DEVICE_TYPE_PRESSURE
devices = get_scada_devices(p) devices = get_all_scada_device_ids(p)
assert len(devices) == 2 assert len(devices) == 2
assert devices[0] == 'd0' assert devices[0] == 'd0'
assert devices[1] == 'd1' assert devices[1] == 'd1'
@@ -4716,7 +4716,7 @@ class TestApi:
d = get_scada_device(p, 'd1') d = get_scada_device(p, 'd1')
assert d == {} assert d == {}
assert get_scada_devices(p) == [] assert get_all_scada_device_ids(p) == []
add_scada_device(p, ChangeSet({'id': 'd0'})) add_scada_device(p, ChangeSet({'id': 'd0'}))
d = get_scada_device(p, 'd0') d = get_scada_device(p, 'd0')
@@ -4726,7 +4726,7 @@ class TestApi:
d = get_scada_device(p, 'd1') d = get_scada_device(p, 'd1')
assert d['id'] == 'd1' assert d['id'] == 'd1'
devices = get_scada_devices(p) devices = get_all_scada_device_ids(p)
assert len(devices) == 2 assert len(devices) == 2
assert devices[0] == 'd0' assert devices[0] == 'd0'
assert devices[1] == 'd1' assert devices[1] == 'd1'
@@ -4737,7 +4737,7 @@ class TestApi:
d = get_scada_device(p, 'd1') d = get_scada_device(p, 'd1')
assert d == {} assert d == {}
assert get_scada_devices(p) == [] assert get_all_scada_device_ids(p) == []
self.leave(p) self.leave(p)
@@ -5197,7 +5197,7 @@ class TestApi:
add_scada_device(p, ChangeSet({'id': 'sd0', 'name': 'device0', 'address': 'x0', 'sd_type': SCADA_DEVICE_TYPE_PRESSURE})) add_scada_device(p, ChangeSet({'id': 'sd0', 'name': 'device0', 'address': 'x0', 'sd_type': SCADA_DEVICE_TYPE_PRESSURE}))
add_scada_device(p, ChangeSet({'id': 'sd1', 'name': 'device1', 'address': 'x1', 'sd_type': SCADA_DEVICE_TYPE_FLOW})) add_scada_device(p, ChangeSet({'id': 'sd1', 'name': 'device1', 'address': 'x1', 'sd_type': SCADA_DEVICE_TYPE_FLOW}))
assert get_scada_elements(p) == [] assert get_all_scada_element_ids(p) == []
add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j0', 'model_type': SCADA_MODEL_TYPE_JUNCTION, 'status': SCADA_ELEMENT_STATUS_OFFLINE})) add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j0', 'model_type': SCADA_MODEL_TYPE_JUNCTION, 'status': SCADA_ELEMENT_STATUS_OFFLINE}))
sm = get_scada_element(p, 'sm0') sm = get_scada_element(p, 'sm0')
@@ -5245,7 +5245,7 @@ class TestApi:
assert sm['model_type'] == SCADA_MODEL_TYPE_PIPE assert sm['model_type'] == SCADA_MODEL_TYPE_PIPE
assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE
elements = get_scada_elements(p) elements = get_all_scada_element_ids(p)
assert len(elements) == 2 assert len(elements) == 2
assert elements[0] == 'sm0' assert elements[0] == 'sm0'
assert elements[1] == 'sm1' assert elements[1] == 'sm1'
@@ -5298,7 +5298,7 @@ class TestApi:
sm = get_scada_element(p, 'sm1') sm = get_scada_element(p, 'sm1')
assert sm == {} assert sm == {}
assert get_scada_elements(p) == [] assert get_all_scada_element_ids(p) == []
add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'model_type': SCADA_MODEL_TYPE_JUNCTION, 'status': SCADA_ELEMENT_STATUS_OFFLINE})) add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'model_type': SCADA_MODEL_TYPE_JUNCTION, 'status': SCADA_ELEMENT_STATUS_OFFLINE}))
sm = get_scada_element(p, 'sm0') sm = get_scada_element(p, 'sm0')
@@ -5320,7 +5320,7 @@ class TestApi:
assert sm['model_type'] == SCADA_MODEL_TYPE_PIPE assert sm['model_type'] == SCADA_MODEL_TYPE_PIPE
assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE
elements = get_scada_elements(p) elements = get_all_scada_element_ids(p)
assert len(elements) == 2 assert len(elements) == 2
assert elements[0] == 'sm0' assert elements[0] == 'sm0'
assert elements[1] == 'sm1' assert elements[1] == 'sm1'
@@ -5331,7 +5331,7 @@ class TestApi:
sm = get_scada_element(p, 'sm1') sm = get_scada_element(p, 'sm1')
assert sm == {} assert sm == {}
assert get_scada_elements(p) == [] assert get_all_scada_element_ids(p) == []
self.leave(p) self.leave(p)

4
tjnetwork.py
View File

@@ -961,10 +961,10 @@ def clean_scada_element(name: str) -> ChangeSet:
return api.clean_scada_element(name) return api.clean_scada_element(name)
def get_all_scada_element_ids(name: str) -> list[str]: def get_all_scada_element_ids(name: str) -> list[str]:
return api.get_all_scada_device_ids(name) return api.get_all_scada_element_ids(name)
def get_all_scada_elements(name: str) -> list[dict[str, Any]]: def get_all_scada_elements(name: str) -> list[dict[str, Any]]:
return api.get_all_scada_devices(name) return api.get_all_scada_elements(name)
############################################################ ############################################################