tests: amend cases and descriptin passing to fix tests

Author: shihab-dls

src/fastcs/transport/epics/pva/ioc.py

@@ -24,7 +24,10 @@ async def parse_attributes(
     for controller_api in root_controller_api.walk_api():
         pv_prefix = controller_pv_prefix(root_pv_prefix, controller_api)
         provider = add_pvi_info(
-            provider=provider, pv_prefix=pv_prefix, controller_api=controller_api
+            provider=provider,
+            pv_prefix=pv_prefix,
+            controller_api=controller_api,
+            description=controller_api.description,
         )
 
         for attr_name, attribute in controller_api.attributes.items():

src/fastcs/transport/epics/pva/pvi.py

@@ -70,17 +70,18 @@ def _make_p4p_raw_value(pv_prefix: str, controller_api: ControllerAPI) -> dict:
     for pv_leaf, sub_controller_api in controller_api.sub_apis.items():
         # Add Controller entry
         # Sub-device of a ControllerVector
-        controller_pvi_name = f"{snake_to_pascal(pv_leaf)}"
-        pv = f"{pv_prefix}:{controller_pvi_name}:PVI"
+        pv = f"{pv_prefix}:{snake_to_pascal(pv_leaf)}:PVI"
         if sub_controller_api.path[-1].isdigit():
             p4p_raw_value[f"__{int(pv_leaf)}"]["d"] = pv
         else:
-            p4p_raw_value[controller_pvi_name]["d"] = pv
+            p4p_raw_value[pv_leaf]["d"] = pv
     for pv_leaf, attribute in controller_api.attributes.items():
         # Add attribute entry
-        attr_pvi_name = f"{snake_to_pascal(pv_leaf)}"
-        pv = f"{pv_prefix}:{attr_pvi_name}"
-        p4p_raw_value[attr_pvi_name][_attribute_to_access(attribute)] = pv
+        pv = f"{pv_prefix}:{snake_to_pascal(pv_leaf)}"
+        p4p_raw_value[pv_leaf][_attribute_to_access(attribute)] = pv
+    for pv_leaf, _ in controller_api.command_methods.items():
+        pv = f"{pv_prefix}:{snake_to_pascal(pv_leaf)}"
+        p4p_raw_value[pv_leaf]["x"] = pv
 
     return p4p_raw_value
 

tests/example_p4p_ioc.py

@@ -114,7 +114,7 @@ def __init__(self, children, description=None):
         description="some child vector",
     )
 
-    controller.add_sub_controller("Child", sub_controller)
+    controller.add_sub_controller("child", sub_controller)
 
     fastcs = FastCS(controller, [p4p_options])
     fastcs.run()

tests/transport/epics/pva/test_p4p.py

@@ -277,7 +277,7 @@ class SomeController(Controller):
 
     sub_controller_vector = ControllerVector({i: ChildController() for i in range(3)})
 
-    controller.add_sub_controller("Child", sub_controller_vector)
+    controller.add_sub_controller("child", sub_controller_vector)
 
     sub_controller = ChildController()
     controller.child0 = sub_controller
@@ -347,10 +347,10 @@ class SomeController(Controller):
             "value": {
                 "additional_child": {"d": f"{pv_prefix}:AdditionalChild:PVI"},
                 "another_child": {"d": f"{pv_prefix}:AnotherChild:PVI"},
-                "another_attr0": {"rw": f"{pv_prefix}:AnotherAttr0"},
-                "another_attr1000": {"rw": f"{pv_prefix}:AnotherAttr1000"},
+                "another_attr_0": {"rw": f"{pv_prefix}:AnotherAttr0"},
+                "another_attr_1000": {"rw": f"{pv_prefix}:AnotherAttr1000"},
                 "a_third_attr": {"w": f"{pv_prefix}:AThirdAttr"},
-                "attr1": {"rw": f"{pv_prefix}:Attr1"},
+                "attr_1": {"rw": f"{pv_prefix}:Attr1"},
                 "child": {"d": f"{pv_prefix}:Child:PVI"},
                 "child0": {"d": f"{pv_prefix}:Child0:PVI"},
                 "child1": {"d": f"{pv_prefix}:Child1:PVI"},