tests: amend tests to use controller vetor

Author: shihab-dls

tests/transport/epics/ca/test_softioc_system.py

@@ -16,16 +16,31 @@ def test_ioc(softioc_subprocess: tuple[str, Queue]):
     assert parent_pvi["value"] == {
         "a": {"r": f"{pv_prefix}:A"},
         "b": {"r": f"{pv_prefix}:B_RBV", "w": f"{pv_prefix}:B"},
-        "child": {"d": f"{pv_prefix}:Child:PVI"},
+        "childvector": {"d": f"{pv_prefix}:ChildVector:PVI"},
     }
 
-    child_pvi_pv = parent_pvi["value"]["child"]["d"]
+    child_vector_pvi_pv = parent_pvi["value"]["childvector"]["d"]
+    _child_vector_pvi = ctxt.get(child_vector_pvi_pv)
+    assert isinstance(_child_vector_pvi, Value)
+    _child_vector_pvi = _child_vector_pvi.todict()
+    assert all(
+        f in _child_vector_pvi for f in ("alarm", "display", "timeStamp", "value")
+    )
+    assert _child_vector_pvi["display"] == {
+        "description": "The records in this controller"
+    }
+    assert _child_vector_pvi["value"] == {
+        "childvector0": {"d": f"{pv_prefix}:ChildVector:0:PVI"},
+        "childvector1": {"d": f"{pv_prefix}:ChildVector:1:PVI"},
+    }
+
+    child_pvi_pv = _child_vector_pvi["value"]["childvector0"]["d"]
     _child_pvi = ctxt.get(child_pvi_pv)
     assert isinstance(_child_pvi, Value)
     child_pvi = _child_pvi.todict()
     assert all(f in child_pvi for f in ("alarm", "display", "timeStamp", "value"))
     assert child_pvi["display"] == {"description": "The records in this controller"}
     assert child_pvi["value"] == {
-        "c": {"w": f"{pv_prefix}:Child:C"},
-        "d": {"x": f"{pv_prefix}:Child:D"},
+        "c": {"w": f"{pv_prefix}:ChildVector:0:C"},
+        "d": {"x": f"{pv_prefix}:ChildVector:0:D"},
     }

tests/transport/epics/pva/test_p4p.py

@@ -35,32 +35,42 @@ async def test_ioc(p4p_subprocess: tuple[str, Queue]):
     assert parent_pvi["value"] == {
         "a": {"rw": f"{pv_prefix}:A"},
         "b": {"w": f"{pv_prefix}:B"},
-        "child": {
-            "d": {
-                "v1": f"{pv_prefix}:Child1:PVI",
-                "v2": f"{pv_prefix}:Child2:PVI",
-            }
-        },
+        "child": {"d": f"{pv_prefix}:Child:PVI"},
         "table": {
             "rw": f"{pv_prefix}:Table",
         },
     }
 
-    child_pvi_pv = parent_pvi["value"]["child"]["d"]["v1"]
+    child_vector_pvi_pv = parent_pvi["value"]["child"]["d"]
+    _child_vector_pvi = await ctxt.get(child_vector_pvi_pv)
+    assert isinstance(_child_vector_pvi, Value)
+    _child_vector_pvi = _child_vector_pvi.todict()
+    assert all(
+        f in _child_vector_pvi for f in ("alarm", "display", "timeStamp", "value")
+    )
+    assert _child_vector_pvi["display"] == {"description": "some child vector"}
+    assert _child_vector_pvi["value"] == {
+        "vector_attribute": {"r": f"{pv_prefix}:Child:VectorAttribute"},
+        "child": {
+            "d": {"v1": f"{pv_prefix}:Child:1:PVI", "v2": f"{pv_prefix}:Child:2:PVI"}
+        },
+    }
+
+    child_pvi_pv = _child_vector_pvi["value"]["child"]["d"]["v1"]
     _child_pvi = await ctxt.get(child_pvi_pv)
     assert isinstance(_child_pvi, Value)
     child_pvi = _child_pvi.todict()
     assert all(f in child_pvi for f in ("alarm", "display", "timeStamp", "value"))
     assert child_pvi["display"] == {"description": "some sub controller"}
     assert child_pvi["value"] == {
-        "c": {"w": f"{pv_prefix}:Child1:C"},
-        "d": {"x": f"{pv_prefix}:Child1:D"},
-        "e": {"r": f"{pv_prefix}:Child1:E"},
-        "f": {"rw": f"{pv_prefix}:Child1:F"},
-        "g": {"rw": f"{pv_prefix}:Child1:G"},
-        "h": {"rw": f"{pv_prefix}:Child1:H"},
-        "i": {"x": f"{pv_prefix}:Child1:I"},
-        "j": {"r": f"{pv_prefix}:Child1:J"},
+        "c": {"w": f"{pv_prefix}:Child:1:C"},
+        "d": {"x": f"{pv_prefix}:Child:1:D"},
+        "e": {"r": f"{pv_prefix}:Child:1:E"},
+        "f": {"rw": f"{pv_prefix}:Child:1:F"},
+        "g": {"rw": f"{pv_prefix}:Child:1:G"},
+        "h": {"rw": f"{pv_prefix}:Child:1:H"},
+        "i": {"x": f"{pv_prefix}:Child:1:I"},
+        "j": {"r": f"{pv_prefix}:Child:1:J"},
     }
 
 
@@ -74,7 +84,7 @@ async def test_scan_method(p4p_subprocess: tuple[str, Queue]):
     # time for the p4p transport to update, broadcast, get.
     latency = 1e8
 
-    e_monitor = ctxt.monitor(f"{pv_prefix}:Child1:E", e_values.put)
+    e_monitor = ctxt.monitor(f"{pv_prefix}:Child:1:E", e_values.put)
     try:
         # Throw away the value on the ioc setup so we can compare timestamps
         _ = await e_values.get()
@@ -111,14 +121,14 @@ async def test_command_method(p4p_subprocess: tuple[str, Queue]):
     j_values = asyncio.Queue()
     ctxt = Context("pva")
 
-    d_monitor = ctxt.monitor(f"{pv_prefix}:Child1:D", d_values.put)
-    i_monitor = ctxt.monitor(f"{pv_prefix}:Child1:I", i_values.put)
-    j_monitor = ctxt.monitor(f"{pv_prefix}:Child1:J", j_values.put)
+    d_monitor = ctxt.monitor(f"{pv_prefix}:Child:1:D", d_values.put)
+    i_monitor = ctxt.monitor(f"{pv_prefix}:Child:1:I", i_values.put)
+    j_monitor = ctxt.monitor(f"{pv_prefix}:Child:1:J", j_values.put)
 
     try:
         j_initial_value = await j_values.get()
         assert (await d_values.get()).raw.value is False
-        await ctxt.put(f"{pv_prefix}:Child1:D", True)
+        await ctxt.put(f"{pv_prefix}:Child:1:D", True)
         assert (await d_values.get()).raw.value is True
         # D process hangs for 0.1s, so we wait slightly longer
         await asyncio.sleep(0.2)
@@ -132,7 +142,7 @@ async def test_command_method(p4p_subprocess: tuple[str, Queue]):
         assert before_command_value["value"] is False
         assert before_command_value["alarm"]["severity"] == 0
         assert before_command_value["alarm"]["message"] == ""
-        await ctxt.put(f"{pv_prefix}:Child1:I", True)
+        await ctxt.put(f"{pv_prefix}:Child:1:I", True)
         assert (await i_values.get()).raw.value is True
         await asyncio.sleep(0.2)
 
@@ -146,7 +156,7 @@ async def test_command_method(p4p_subprocess: tuple[str, Queue]):
         assert j_values.empty()
 
         # Second run succeeds
-        await ctxt.put(f"{pv_prefix}:Child1:I", True)
+        await ctxt.put(f"{pv_prefix}:Child:1:I", True)
         assert (await i_values.get()).raw.value is True
         await asyncio.sleep(0.2)
         after_command_value = (await i_values.get()).raw
@@ -270,9 +280,6 @@ class SomeController(Controller):
         {i: ChildController() for i in range(3)}
     )
 
-    for _, child in sub_controller_vector.children():
-        child.add_sub_controller("ChildChild", ChildChildController())
-
     controller.add_sub_controller("Child", sub_controller_vector)
 
     sub_controller = ChildController()
@@ -348,17 +355,9 @@ class SomeController(Controller):
                 "a_third_attr": {"w": f"{pv_prefix}:AThirdAttr"},
                 "attr1": {"rw": f"{pv_prefix}:Attr1"},
                 "child": {"d": f"{pv_prefix}:Child:PVI"},
-                "child_attribute_same_name": {
-                    "d": f"{pv_prefix}:ChildAttributeSameName:PVI",
-                    "r": f"{pv_prefix}:ChildAttributeSameName",
-                    "child": {
-                        "d": {
-                            "v0": f"{pv_prefix}:Child0:PVI",
-                            "v1": f"{pv_prefix}:Child1:PVI",
-                            "v2": f"{pv_prefix}:Child2:PVI",
-                        }
-                    },
-                },
+                "child0": {"d": f"{pv_prefix}:Child0:PVI"},
+                "child1": {"d": f"{pv_prefix}:Child1:PVI"},
+                "child2": {"d": f"{pv_prefix}:Child2:PVI"},
             },
         }
         assert len(child_vector_controller_pvi) == 1
@@ -394,7 +393,6 @@ class SomeController(Controller):
                 "attr_d": {
                     "w": f"{pv_prefix}:Child:0:AttrD",
                 },
-                "child_child": {"d": f"{pv_prefix}:Child:0:ChildChild:PVI"},
             },
         }