From 7cfd9e5cf83c790a39308ea8f7368533eeb89d5a Mon Sep 17 00:00:00 2001 From: Dozgulbas Date: Tue, 9 Apr 2024 13:07:44 -0500 Subject: [PATCH] Fixing paths --- src/fom_rest_node.py | 1 + tests/test_base.py | 8 ++++---- tests/test_module.py | 2 +- tests/workcell_defs/test_workcell.yaml | 6 +++--- tests/workflow_defs/test_workflow.yaml | 22 +++++++++++----------- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/fom_rest_node.py b/src/fom_rest_node.py index e69de29..b613309 100644 --- a/src/fom_rest_node.py +++ b/src/fom_rest_node.py @@ -0,0 +1 @@ +"""Interface for FOM Rest Node""" diff --git a/tests/test_base.py b/tests/test_base.py index 4a8d35f..e19cca1 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -14,11 +14,11 @@ class TestImports(TestModule_Base): def test_driver_import(self): """Test the driver and rest node imports""" - import kla_driver - import kla_rest_node + import fom_driver + import fom_rest_node - assert kla_driver - assert kla_rest_node + assert fom_driver + assert fom_rest_node if __name__ == "__main__": diff --git a/tests/test_module.py b/tests/test_module.py index 2754921..033de78 100644 --- a/tests/test_module.py +++ b/tests/test_module.py @@ -22,7 +22,7 @@ def __init__(self, *args, **kwargs): self.server_host = self.workcell.config.server_host self.server_port = self.workcell.config.server_port self.url = f"http://{self.server_host}:{self.server_port}" - self.module_url = "http://kla_module:3015" + self.module_url = "http://fom_module:3019" self.redis_host = self.workcell.config.redis_host # Check to see that server is up diff --git a/tests/workcell_defs/test_workcell.yaml b/tests/workcell_defs/test_workcell.yaml index d9796dc..85fc793 100644 --- a/tests/workcell_defs/test_workcell.yaml +++ b/tests/workcell_defs/test_workcell.yaml @@ -10,10 +10,10 @@ config: #List of all components accessible in this workcell modules: - - name: kla_module - model: KLA + - name: fom_module + model: fom interface: wei_rest_node config: - rest_node_address: "http://kla_module:3015" + rest_node_address: "http://fom_module:3019" workcell_coordinates: [0, 0, 0, 0, 0, 0] locations: {} diff --git a/tests/workflow_defs/test_workflow.yaml b/tests/workflow_defs/test_workflow.yaml index 40d54f8..2c47594 100644 --- a/tests/workflow_defs/test_workflow.yaml +++ b/tests/workflow_defs/test_workflow.yaml @@ -1,33 +1,33 @@ -name: Test KLA Module +name: Test fom Module metadata: author: Doga Ozgulbas info: Tests the functionality of the KLA Module version: 0.1 modules: - - name: kla_module + - name: fom_module flowdef: - - name: Load KLA protocol - module: kla_module + - name: Load fom protocol + module: fom_module action: load_protocol args: protocol_file_path: ../README.md checks: null - comment: Load KLA protocol + comment: Load fom protocol - - name: Run KLA protocol - module: kla_module + - name: Run fom protocol + module: fom_module action: run_protocol args: {} checks: null - comment: Run KLA protocol + comment: Run fom protocol - - name: Get Output KLA - module: kla_module + - name: Get Output fom + module: fom_module action: get_output_file args: {} checks: null - comment: Get KLA output file + comment: Get fom output file