include _globals in ibek support generate-links

epics-containers · Nov 10, 2023 · b47628a · b47628a
1 parent bc218c9
commit b47628a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/ibek/globals.py b/src/ibek/globals.py
@@ -36,6 +36,7 @@
 IBEK_SUPPORT = Path("ibek-support")
 IBEK_GLOBALS = Path("_global")
 SUPPORT_YAML_PATTERN = "*ibek.support.yaml"
+PVI_YAML_PATTERN = "*pvi.device.yaml"
 
 # Assets generated at runtime
 RUNTIME_OUTPUT_PATH = EPICS_ROOT / "runtime"

diff --git a/src/ibek/support_cmds/commands.py b/src/ibek/support_cmds/commands.py
@@ -18,12 +18,16 @@
 
 from ibek.globals import (
     IBEK_DEFS,
+    IBEK_GLOBALS,
+    IBEK_SUPPORT,
     IOC_DBDS,
     IOC_LIBS,
     PVI_DEFS,
+    PVI_YAML_PATTERN,
     RELEASE,
     RUNTIME_DEBS,
     SUPPORT,
+    SUPPORT_YAML_PATTERN,
     NaturalOrderGroup,
 )
 from ibek.support import Support
@@ -254,10 +258,12 @@ def generate_links(
         ibek_support: Root of ibek support to find support module directory in
 
     """
-    support_defs = (ibek_support or get_ioc_source() / "ibek-support") / support_module
+    support_defs = (ibek_support or get_ioc_source() / IBEK_SUPPORT) / support_module
+    support_globals = (ibek_support or get_ioc_source() / IBEK_SUPPORT) / IBEK_GLOBALS
 
-    symlink_files(support_defs, "*ibek.support.yaml", IBEK_DEFS)
-    symlink_files(support_defs, "*pvi.device.yaml", PVI_DEFS)
+    symlink_files(support_defs, SUPPORT_YAML_PATTERN, IBEK_DEFS)
+    symlink_files(support_globals, SUPPORT_YAML_PATTERN, IBEK_DEFS)
+    symlink_files(support_defs, PVI_YAML_PATTERN, PVI_DEFS)
 
 
 @support_cli.command()

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -10,7 +10,7 @@
 from pytest_mock import MockerFixture
 
 from ibek import __version__
-from ibek.globals import IBEK_DEFS, PVI_DEFS
+from ibek.globals import IBEK_DEFS, PVI_DEFS, PVI_YAML_PATTERN, SUPPORT_YAML_PATTERN
 from ibek.ioc import clear_entity_model_ids
 from ibek.support_cmds.commands import generate_links
 from tests.conftest import run_cli
@@ -180,5 +180,5 @@ def test_generate_links_ibek(samples: Path, mocker: MockerFixture):
 
     generate_links(Path("yaml"), samples)
 
-    symlink_mock.assert_any_call(samples / "yaml", "*pvi.device.yaml", PVI_DEFS)
-    symlink_mock.assert_any_call(samples / "yaml", "*ibek.support.yaml", IBEK_DEFS)
+    symlink_mock.assert_any_call(samples / "yaml", PVI_YAML_PATTERN, PVI_DEFS)
+    symlink_mock.assert_any_call(samples / "yaml", SUPPORT_YAML_PATTERN, IBEK_DEFS)