From 62b086d93924950a306977375abcfc43b052db2f Mon Sep 17 00:00:00 2001
From: "WQY\\qiong" <qiongyu.wang@outlook.com>
Date: Tue, 2 May 2023 23:04:54 +0800
Subject: [PATCH] Fix get scada element

---
 test_tjnetwork.py | 20 ++++++++++----------
 tjnetwork.py      |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test_tjnetwork.py b/test_tjnetwork.py
index bacb0d2..bdbf5b4 100644
--- a/test_tjnetwork.py
+++ b/test_tjnetwork.py
@@ -4677,7 +4677,7 @@ class TestApi:
         p = 'test_scada_device'
         self.enter(p)
 
-        assert get_scada_devices(p) == []
+        assert get_all_scada_device_ids(p) == []
 
         d = get_scada_device(p, 'd0')
         assert d == {}
@@ -4703,7 +4703,7 @@ class TestApi:
         assert d['address'] == 'x'
         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 devices[0] == 'd0'
         assert devices[1] == 'd1'
@@ -4716,7 +4716,7 @@ class TestApi:
         d = get_scada_device(p, 'd1')
         assert d == {}
 
-        assert get_scada_devices(p) == []
+        assert get_all_scada_device_ids(p) == []
 
         add_scada_device(p, ChangeSet({'id': 'd0'}))
         d = get_scada_device(p, 'd0')
@@ -4726,7 +4726,7 @@ class TestApi:
         d = get_scada_device(p, 'd1')
         assert d['id'] == 'd1'
 
-        devices = get_scada_devices(p)
+        devices = get_all_scada_device_ids(p)
         assert len(devices) == 2
         assert devices[0] == 'd0'
         assert devices[1] == 'd1'
@@ -4737,7 +4737,7 @@ class TestApi:
         d = get_scada_device(p, 'd1')
         assert d == {}
 
-        assert get_scada_devices(p) == []
+        assert get_all_scada_device_ids(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': '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}))
         sm = get_scada_element(p, 'sm0')
@@ -5245,7 +5245,7 @@ class TestApi:
         assert sm['model_type'] == SCADA_MODEL_TYPE_PIPE
         assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE
 
-        elements = get_scada_elements(p)
+        elements = get_all_scada_element_ids(p)
         assert len(elements) == 2
         assert elements[0] == 'sm0'
         assert elements[1] == 'sm1'
@@ -5298,7 +5298,7 @@ class TestApi:
         sm = get_scada_element(p, 'sm1')
         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}))
         sm = get_scada_element(p, 'sm0')
@@ -5320,7 +5320,7 @@ class TestApi:
         assert sm['model_type'] == SCADA_MODEL_TYPE_PIPE
         assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE
 
-        elements = get_scada_elements(p)
+        elements = get_all_scada_element_ids(p)
         assert len(elements) == 2
         assert elements[0] == 'sm0'
         assert elements[1] == 'sm1'
@@ -5331,7 +5331,7 @@ class TestApi:
         sm = get_scada_element(p, 'sm1')
         assert sm == {}
 
-        assert get_scada_elements(p) == []
+        assert get_all_scada_element_ids(p) == []
 
         self.leave(p)
 
diff --git a/tjnetwork.py b/tjnetwork.py
index 44fafe3..2bdff0f 100644
--- a/tjnetwork.py
+++ b/tjnetwork.py
@@ -961,10 +961,10 @@ def clean_scada_element(name: str) -> ChangeSet:
     return api.clean_scada_element(name)
 
 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]]:
-    return api.get_all_scada_devices(name)
+    return api.get_all_scada_elements(name)
 
 
 ############################################################