diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 613df59f3caceebf05ab6894b0da5016a914253e..bbdd9866f5a080c18f8ce0940cd55b7853b0dbf7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,12 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to `Semantic Versioning `_. +Development +*********** +* HM-692: Update TMC assign resources schema with SDP assign resources schema 1.0 + * Updated TMC LOW assign resources schema 4.1 to major version 5.0 + * Updated TMC MID assign resources schema 2.2 to major version 3.0 + 1.23.0 *********** * HM-692: Update TMC assign resources schema with SDP assign resources schema 1.0 diff --git a/docs/src/schemas/tmc/ska-low-tmc-assignres-4.1.rst b/docs/src/schemas/tmc/ska-low-tmc-assignres-5.0.rst similarity index 90% rename from docs/src/schemas/tmc/ska-low-tmc-assignres-4.1.rst rename to docs/src/schemas/tmc/ska-low-tmc-assignres-5.0.rst index 48abdd19c2e3466ca2071d31a44e375bb435f8f8..dc38eb08929e0c18aeddb01a5722b6b085cc880b 100644 --- a/docs/src/schemas/tmc/ska-low-tmc-assignres-4.1.rst +++ b/docs/src/schemas/tmc/ska-low-tmc-assignres-5.0.rst @@ -1,11 +1,11 @@ -.. ska-schema:: https://schema.skao.int/ska-low-tmc-assignresources/4.1 +.. ska-schema:: https://schema.skao.int/ska-low-tmc-assignresources/5.0 :auto_reference: :auto_target: :lift_description: :lift_definitions: :lift_title: - .. ska-schema-example:: https://schema.skao.int/ska-low-tmc-assignresources/4.1 + .. ska-schema-example:: https://schema.skao.int/ska-low-tmc-assignresources/5.0 Example JSON. \ No newline at end of file diff --git a/docs/src/schemas/tmc/ska-low-tmc-assignres.rst b/docs/src/schemas/tmc/ska-low-tmc-assignres.rst index 292d9ae938074ca0f856923d37a67d80ffba4d1c..71abd3299a0aac6f373c12dfdc6e73ee841558c4 100644 --- a/docs/src/schemas/tmc/ska-low-tmc-assignres.rst +++ b/docs/src/schemas/tmc/ska-low-tmc-assignres.rst @@ -5,7 +5,7 @@ ska-low-tmc-assignresources .. toctree:: :maxdepth: 1 - ska-low-tmc-assignres-4.1 + ska-low-tmc-assignres-5.0 ska-low-tmc-assignres-4.0 ska-low-tmc-assignres-3.2 ska-low-tmc-assignres-3.1 diff --git a/docs/src/schemas/tmc/ska-tmc-assignres-2.2.rst b/docs/src/schemas/tmc/ska-tmc-assignres-3.0.rst similarity index 92% rename from docs/src/schemas/tmc/ska-tmc-assignres-2.2.rst rename to docs/src/schemas/tmc/ska-tmc-assignres-3.0.rst index 39791ca7779ded0d98aca952ba7703fe36c3bc6c..4c8d0c1b161fad8678c84762eb04c6f9603fb188 100644 --- a/docs/src/schemas/tmc/ska-tmc-assignres-2.2.rst +++ b/docs/src/schemas/tmc/ska-tmc-assignres-3.0.rst @@ -1,10 +1,10 @@ -.. ska-schema:: https://schema.skao.int/ska-tmc-assignresources/2.2 +.. ska-schema:: https://schema.skao.int/ska-tmc-assignresources/3.0 :auto_reference: :auto_target: :lift_description: :lift_definitions: :lift_title: - .. ska-schema-example:: https://schema.skao.int/ska-tmc-assignresources/2.2 + .. ska-schema-example:: https://schema.skao.int/ska-tmc-assignresources/3.0 Example JSON. diff --git a/docs/src/schemas/tmc/ska-tmc-assignresources.rst b/docs/src/schemas/tmc/ska-tmc-assignresources.rst index a09c85529e91dccf8947a79ca45bfd91040aec82..80a47a7e22299ee9076f23fa518ea2ade3740f61 100644 --- a/docs/src/schemas/tmc/ska-tmc-assignresources.rst +++ b/docs/src/schemas/tmc/ska-tmc-assignresources.rst @@ -5,7 +5,7 @@ ska-tmc-assignresources .. toctree:: :maxdepth: 1 - ska-tmc-assignres-2.2 + ska-tmc-assignres-3.0 ska-tmc-assignres-2.1 diff --git a/src/ska_telmodel/tmc/examples/ska_low_tmc_assignresources/v4_1.py b/src/ska_telmodel/tmc/examples/ska_low_tmc_assignresources/v4_1.py deleted file mode 100644 index d05606308e67364f54644600396aa5a457d77eaf..0000000000000000000000000000000000000000 --- a/src/ska_telmodel/tmc/examples/ska_low_tmc_assignresources/v4_1.py +++ /dev/null @@ -1,23 +0,0 @@ -import copy - -from ska_telmodel.sdp.examples.v1_0 import FIELDS - -from .v4_0 import TMC_LOW_ASSIGNRESOURCES_4_0 - -TMC_LOW_ASSIGNRESOURCES_4_1 = copy.deepcopy(TMC_LOW_ASSIGNRESOURCES_4_0) -TMC_LOW_ASSIGNRESOURCES_4_1[ - "interface" -] = "https://schema.skao.int/ska-low-tmc-assignresources/4.1" - -TMC_LOW_ASSIGNRESOURCES_4_1["sdp"][ - "interface" -] = "https://schema.skao.int/ska-sdp-assignres/1.0" - -TMC_LOW_ASSIGNRESOURCES_4_1["sdp"]["execution_block"]["fields"] = FIELDS - - -def get_example(_: str): - """ - Generate examples for TMC-Low assign resources v4.1. - """ - return copy.deepcopy(TMC_LOW_ASSIGNRESOURCES_4_1) diff --git a/src/ska_telmodel/tmc/examples/ska_low_tmc_assignresources/v5_0.py b/src/ska_telmodel/tmc/examples/ska_low_tmc_assignresources/v5_0.py new file mode 100644 index 0000000000000000000000000000000000000000..2bf6a416497c89dee4fc18d76b87b9eadc757163 --- /dev/null +++ b/src/ska_telmodel/tmc/examples/ska_low_tmc_assignresources/v5_0.py @@ -0,0 +1,23 @@ +import copy + +from ska_telmodel.sdp.examples.v1_0 import FIELDS + +from .v4_0 import TMC_LOW_ASSIGNRESOURCES_4_0 + +TMC_LOW_ASSIGNRESOURCES_5_0 = copy.deepcopy(TMC_LOW_ASSIGNRESOURCES_4_0) +TMC_LOW_ASSIGNRESOURCES_5_0[ + "interface" +] = "https://schema.skao.int/ska-low-tmc-assignresources/5.0" + +TMC_LOW_ASSIGNRESOURCES_5_0["sdp"][ + "interface" +] = "https://schema.skao.int/ska-sdp-assignres/1.0" + +TMC_LOW_ASSIGNRESOURCES_5_0["sdp"]["execution_block"]["fields"] = FIELDS + + +def get_example(_: str): + """ + Generate examples for TMC-Low assign resources v5.0. + """ + return copy.deepcopy(TMC_LOW_ASSIGNRESOURCES_5_0) diff --git a/src/ska_telmodel/tmc/examples/ska_tmc_assignresources/v2_2.py b/src/ska_telmodel/tmc/examples/ska_tmc_assignresources/v2_2.py deleted file mode 100644 index aa584a1b3a06992e2f4277cf8dd8447bcc46f6bb..0000000000000000000000000000000000000000 --- a/src/ska_telmodel/tmc/examples/ska_tmc_assignresources/v2_2.py +++ /dev/null @@ -1,22 +0,0 @@ -import copy - -from ska_telmodel.sdp.examples.v1_0 import FIELDS - -from .v2_1 import TMC_ASSIGNRESOURCES_2_1 - -TMC_ASSIGNRESOURCES_2_2 = copy.deepcopy(TMC_ASSIGNRESOURCES_2_1) -TMC_ASSIGNRESOURCES_2_2[ - "interface" -] = "https://schema.skao.int/ska-tmc-assignresources/2.2" -TMC_ASSIGNRESOURCES_2_2["sdp"][ - "interface" -] = "https://schema.skao.int/ska-sdp-assignres/1.0" - -TMC_ASSIGNRESOURCES_2_2["sdp"]["execution_block"]["fields"] = FIELDS - - -def get_example(_: str): - """ - Generate examples for TMC-Mid assign resources v2.2. - """ - return copy.deepcopy(TMC_ASSIGNRESOURCES_2_2) diff --git a/src/ska_telmodel/tmc/examples/ska_tmc_assignresources/v3_0.py b/src/ska_telmodel/tmc/examples/ska_tmc_assignresources/v3_0.py new file mode 100644 index 0000000000000000000000000000000000000000..b8f421168617cd14e248dbf6e919e42cf9a4c797 --- /dev/null +++ b/src/ska_telmodel/tmc/examples/ska_tmc_assignresources/v3_0.py @@ -0,0 +1,22 @@ +import copy + +from ska_telmodel.sdp.examples.v1_0 import FIELDS + +from .v2_1 import TMC_ASSIGNRESOURCES_2_1 + +TMC_ASSIGNRESOURCES_3_0 = copy.deepcopy(TMC_ASSIGNRESOURCES_2_1) +TMC_ASSIGNRESOURCES_3_0[ + "interface" +] = "https://schema.skao.int/ska-tmc-assignresources/3.0" +TMC_ASSIGNRESOURCES_3_0["sdp"][ + "interface" +] = "https://schema.skao.int/ska-sdp-assignres/1.0" + +TMC_ASSIGNRESOURCES_3_0["sdp"]["execution_block"]["fields"] = FIELDS + + +def get_example(_: str): + """ + Generate examples for TMC-Mid assign resources v3.0. + """ + return copy.deepcopy(TMC_ASSIGNRESOURCES_3_0) diff --git a/src/ska_telmodel/tmc/schema.py b/src/ska_telmodel/tmc/schema.py index 56104d9d402c76a74fd3895769fad0f79a0e2d3d..50a52d07a016b2ce855708d98d8a306c127be59f 100644 --- a/src/ska_telmodel/tmc/schema.py +++ b/src/ska_telmodel/tmc/schema.py @@ -217,7 +217,7 @@ def _add_low_tmc_sdp_assignresources_schema( """ if interface_version >= (3, 0): sdp_assignres_ver = SDP_ASSIGNRES_PREFIX + "0.4" - if interface_version == (4, 1): + if interface_version >= (5, 0): sdp_assignres_ver = SDP_ASSIGNRES_PREFIX + "1.0" sdpschema = get_sdp_assignres_schema(sdp_assignres_ver, 1) items.add_field( @@ -631,7 +631,7 @@ def _add_mid_tmc_sdp_assignresources(version: str, items: TMSchema): """ interface_version = split_interface_version(version) sdp_assignres_ver: str = "0.4" - if interface_version >= (2, 2): + if interface_version >= (3, 0): sdp_assignres_ver = "1.0" sdp_assignres_interface: str = SDP_ASSIGNRES_PREFIX + sdp_assignres_ver sdpschema = get_sdp_assignres_schema(sdp_assignres_interface, 1) diff --git a/tests/tmc/test_tmc_schemas.py b/tests/tmc/test_tmc_schemas.py index 5ea56355addce3b32acbb23de83d2dcbf6c6a95f..f34922b42d34e708cc9cdb4eece733cba4b32404 100644 --- a/tests/tmc/test_tmc_schemas.py +++ b/tests/tmc/test_tmc_schemas.py @@ -39,7 +39,7 @@ SCHEMA_VERSIONS = { "https://schema.skao.int/ska-low-tmc-assignresources/3.1", "https://schema.skao.int/ska-low-tmc-assignresources/3.2", "https://schema.skao.int/ska-low-tmc-assignresources/4.0", - "https://schema.skao.int/ska-low-tmc-assignresources/4.1", + "https://schema.skao.int/ska-low-tmc-assignresources/5.0", ], "ska-low-tmc-configure": [ "https://schema.skatelescope.org/ska-low-tmc-configure/1.0", @@ -65,7 +65,7 @@ SCHEMA_VERSIONS = { ], "ska-tmc-assignresources": [ "https://schema.skao.int/ska-tmc-assignresources/2.1", - "https://schema.skao.int/ska-tmc-assignresources/2.2", + "https://schema.skao.int/ska-tmc-assignresources/3.0", ], "ska-tmc-configure": [ "https://schema.skao.int/ska-tmc-configure/2.1", @@ -149,10 +149,10 @@ def test_tmc_versions(caplog): ) assert ( check_tmc_interface_version( - LOW_TMC_ASSIGNRESOURCES_PREFIX + "4.1", + LOW_TMC_ASSIGNRESOURCES_PREFIX + "5.0", LOW_TMC_ASSIGNRESOURCES_PREFIX, ) - == "4.1" + == "5.0" ) assert ( check_tmc_interface_version( @@ -177,7 +177,7 @@ def test_tmc_versions(caplog): @pytest.mark.parametrize( "ver, minor", - [(1, 0), (2, 0), (3, 0), (3, 1), (3, 2), (4, 0), (4, 1)], + [(1, 0), (2, 0), (3, 0), (3, 1), (3, 2), (4, 0), (5, 0)], ) def test_low_tmc_assign_resources(ver, minor): """Test TMC low assign resource allocation schema correctly validates @@ -205,7 +205,7 @@ def test_low_tmc_assign_resources(ver, minor): @pytest.mark.parametrize( "ver, minor", - [(2, 1), (2, 2)], + [(2, 1), (3, 0)], ) def test_tmc_assign_resources(ver: int, minor: int): """Test Mid TMC resource allocation schema correctly validates