From df23c5cdfc6f5fddabc9be4fe28b42a83bf2aad4 Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Tue, 24 Sep 2024 15:16:43 +0530 Subject: [PATCH 01/10] fix: update resolve service api and its dependencies --- .../client/__init__.py | 1 + .../templates/measurement_plugin_client.py.mako | 4 +++- .../non_streaming_data_measurement_client.py | 2 ++ .../void_measurement_client.py | 2 ++ .../discovery/_client.py | 17 ++++++++++++++--- .../service/tests/unit/test_discovery_client.py | 9 +++++++-- 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/packages/generator/ni_measurement_plugin_sdk_generator/client/__init__.py b/packages/generator/ni_measurement_plugin_sdk_generator/client/__init__.py index ccf73dc1c..5f071d241 100644 --- a/packages/generator/ni_measurement_plugin_sdk_generator/client/__init__.py +++ b/packages/generator/ni_measurement_plugin_sdk_generator/client/__init__.py @@ -88,6 +88,7 @@ def _create_client( directory_out=directory_out, class_name=class_name, display_name=metadata.measurement_details.display_name, + version=metadata.measurement_details.version, configuration_metadata=configuration_metadata, output_metadata=output_metadata, service_class=measurement_service_class, diff --git a/packages/generator/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako b/packages/generator/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako index 3e0f3ada5..9503d290e 100644 --- a/packages/generator/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako +++ b/packages/generator/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako @@ -2,7 +2,7 @@ import re %>\ \ -<%page args="class_name, display_name, configuration_metadata, output_metadata, service_class, configuration_parameters_with_type_and_default_values, measure_api_parameters, output_parameters_with_type, built_in_import_modules, custom_import_modules, enum_by_class_name, configuration_parameters_type_url"/>\ +<%page args="class_name, display_name, version, configuration_metadata, output_metadata, service_class, configuration_parameters_with_type_and_default_values, measure_api_parameters, output_parameters_with_type, built_in_import_modules, custom_import_modules, enum_by_class_name, configuration_parameters_type_url"/>\ \ <% def _replace_enum_class_type(input_string: str) -> str: @@ -106,6 +106,7 @@ class ${class_name}: """ self._initialization_lock = threading.RLock() self._service_class = ${service_class | repr} + self._version = ${version | repr} self._grpc_channel_pool = grpc_channel_pool self._discovery_client = discovery_client self._pin_map_client = pin_map_client @@ -153,6 +154,7 @@ class ${class_name}: service_location = self._get_discovery_client().resolve_service( provided_interface=_V2_MEASUREMENT_SERVICE_INTERFACE, service_class=self._service_class, + version=self._version, ) channel = self._get_grpc_channel_pool().get_channel(service_location.insecure_address) self._stub = v2_measurement_service_pb2_grpc.MeasurementServiceStub(channel) diff --git a/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py b/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py index 1c2ae0b19..49afd57e0 100644 --- a/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py +++ b/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py @@ -92,6 +92,7 @@ def __init__( """ self._initialization_lock = threading.RLock() self._service_class = "ni.tests.NonStreamingDataMeasurement_Python" + self._version = "0.1.0.0" self._grpc_channel_pool = grpc_channel_pool self._discovery_client = discovery_client self._pin_map_client = pin_map_client @@ -455,6 +456,7 @@ def _get_stub(self) -> v2_measurement_service_pb2_grpc.MeasurementServiceStub: service_location = self._get_discovery_client().resolve_service( provided_interface=_V2_MEASUREMENT_SERVICE_INTERFACE, service_class=self._service_class, + version=self._version, ) channel = self._get_grpc_channel_pool().get_channel( service_location.insecure_address diff --git a/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/void_measurement_client.py b/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/void_measurement_client.py index e7bbbefa3..c52a3f0f7 100644 --- a/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/void_measurement_client.py +++ b/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/void_measurement_client.py @@ -50,6 +50,7 @@ def __init__( """ self._initialization_lock = threading.RLock() self._service_class = "ni.tests.VoidMeasurement_Python" + self._version = "0.1.0.0" self._grpc_channel_pool = grpc_channel_pool self._discovery_client = discovery_client self._pin_map_client = pin_map_client @@ -108,6 +109,7 @@ def _get_stub(self) -> v2_measurement_service_pb2_grpc.MeasurementServiceStub: service_location = self._get_discovery_client().resolve_service( provided_interface=_V2_MEASUREMENT_SERVICE_INTERFACE, service_class=self._service_class, + version=self._version, ) channel = self._get_grpc_channel_pool().get_channel( service_location.insecure_address diff --git a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py index 4fff624b3..545dd4e70 100644 --- a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py +++ b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py @@ -206,7 +206,13 @@ def unregister_service(self, registration_id: str = "") -> bool: _logger.exception("Error in unregistering with discovery service.") raise - def resolve_service(self, provided_interface: str, service_class: str = "") -> ServiceLocation: + def resolve_service( + self, + provided_interface: str, + service_class: str = "", + deployment_target: str = "", + version: str = "", + ) -> ServiceLocation: """Resolve the location of a service. Given a description of a service, returns information that can be used to establish @@ -218,12 +224,17 @@ def resolve_service(self, provided_interface: str, service_class: str = "") -> S service_class: The service "class" that should be matched. If the value is not specified and there is more than one matching service registered, an error is returned. - + deployment_target: The deployment target from which the service should be resolved. + version: The version of the service to resolve, If not specified, the latest version + will be resolved. Returns: The service location. """ request = discovery_service_pb2.ResolveServiceRequest( - provided_interface=provided_interface, service_class=service_class + provided_interface=provided_interface, + service_class=service_class, + deployment_target=deployment_target, + version=version, ) response = self._get_stub().ResolveService(request) diff --git a/packages/service/tests/unit/test_discovery_client.py b/packages/service/tests/unit/test_discovery_client.py index 6e2b4d651..514d21fd3 100644 --- a/packages/service/tests/unit/test_discovery_client.py +++ b/packages/service/tests/unit/test_discovery_client.py @@ -128,13 +128,16 @@ def test___service_registered___resolve_service___sends_request( ) service_location = discovery_client.resolve_service( - _TEST_SERVICE_INFO.provided_interfaces[0], _TEST_SERVICE_INFO.service_class + provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], + service_class=_TEST_SERVICE_INFO.service_class, + version=_TEST_SERVICE_INFO.versions[0], ) discovery_service_stub.ResolveService.assert_called_once() request: ResolveServiceRequest = discovery_service_stub.ResolveService.call_args.args[0] assert _TEST_SERVICE_INFO.provided_interfaces[0] == request.provided_interface assert _TEST_SERVICE_INFO.service_class == request.service_class + assert _TEST_SERVICE_INFO.versions[0] == request.version _assert_service_location_equal(_TEST_SERVICE_LOCATION, service_location) @@ -147,7 +150,9 @@ def test___service_not_registered___resolve_service___raises_not_found_error( with pytest.raises(grpc.RpcError) as exc_info: _ = discovery_client.resolve_service( - _TEST_SERVICE_INFO.provided_interfaces[0], _TEST_SERVICE_INFO.service_class + provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], + service_class=_TEST_SERVICE_INFO.service_class, + version=_TEST_SERVICE_INFO.versions[0], ) discovery_service_stub.ResolveService.assert_called_once() From ef9dd736678c054f4147144b84191df56f2485fd Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Tue, 24 Sep 2024 15:52:05 +0530 Subject: [PATCH 02/10] fix: formatting --- .../ni_measurement_plugin_sdk_service/discovery/_client.py | 3 ++- packages/service/tests/unit/test_discovery_client.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py index 545dd4e70..e747798e3 100644 --- a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py +++ b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py @@ -225,8 +225,9 @@ def resolve_service( specified and there is more than one matching service registered, an error is returned. deployment_target: The deployment target from which the service should be resolved. - version: The version of the service to resolve, If not specified, the latest version + version: The version of the service to resolve. If not specified, the latest version will be resolved. + Returns: The service location. """ diff --git a/packages/service/tests/unit/test_discovery_client.py b/packages/service/tests/unit/test_discovery_client.py index 514d21fd3..c9ada83ff 100644 --- a/packages/service/tests/unit/test_discovery_client.py +++ b/packages/service/tests/unit/test_discovery_client.py @@ -128,7 +128,7 @@ def test___service_registered___resolve_service___sends_request( ) service_location = discovery_client.resolve_service( - provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], + provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], service_class=_TEST_SERVICE_INFO.service_class, version=_TEST_SERVICE_INFO.versions[0], ) From 4c78deaf715ae61dfdd0dd2e0aa165118be1c493 Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Tue, 24 Sep 2024 16:16:04 +0530 Subject: [PATCH 03/10] fix: update resolve service --- .../discovery/_client.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py index e747798e3..a5206a56a 100644 --- a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py +++ b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py @@ -207,11 +207,7 @@ def unregister_service(self, registration_id: str = "") -> bool: raise def resolve_service( - self, - provided_interface: str, - service_class: str = "", - deployment_target: str = "", - version: str = "", + self, provided_interface: str, service_class: str = "", version: str = "" ) -> ServiceLocation: """Resolve the location of a service. @@ -224,7 +220,6 @@ def resolve_service( service_class: The service "class" that should be matched. If the value is not specified and there is more than one matching service registered, an error is returned. - deployment_target: The deployment target from which the service should be resolved. version: The version of the service to resolve. If not specified, the latest version will be resolved. @@ -234,7 +229,6 @@ def resolve_service( request = discovery_service_pb2.ResolveServiceRequest( provided_interface=provided_interface, service_class=service_class, - deployment_target=deployment_target, version=version, ) From 6d1cb32b395d24311d866ca57b79dfec88a5bbc9 Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Tue, 24 Sep 2024 23:07:21 +0530 Subject: [PATCH 04/10] fix: add deployment_target --- .../discovery/_client.py | 8 ++++++- .../tests/unit/test_discovery_client.py | 23 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py index a5206a56a..e747798e3 100644 --- a/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py +++ b/packages/service/ni_measurement_plugin_sdk_service/discovery/_client.py @@ -207,7 +207,11 @@ def unregister_service(self, registration_id: str = "") -> bool: raise def resolve_service( - self, provided_interface: str, service_class: str = "", version: str = "" + self, + provided_interface: str, + service_class: str = "", + deployment_target: str = "", + version: str = "", ) -> ServiceLocation: """Resolve the location of a service. @@ -220,6 +224,7 @@ def resolve_service( service_class: The service "class" that should be matched. If the value is not specified and there is more than one matching service registered, an error is returned. + deployment_target: The deployment target from which the service should be resolved. version: The version of the service to resolve. If not specified, the latest version will be resolved. @@ -229,6 +234,7 @@ def resolve_service( request = discovery_service_pb2.ResolveServiceRequest( provided_interface=provided_interface, service_class=service_class, + deployment_target=deployment_target, version=version, ) diff --git a/packages/service/tests/unit/test_discovery_client.py b/packages/service/tests/unit/test_discovery_client.py index c9ada83ff..66e481609 100644 --- a/packages/service/tests/unit/test_discovery_client.py +++ b/packages/service/tests/unit/test_discovery_client.py @@ -118,7 +118,28 @@ def test___service_registered___unregister_service___sends_request( assert unregistration_success_flag -def test___service_registered___resolve_service___sends_request( +def test___service_registered___resolve_service_without_version___sends_request( + discovery_client: DiscoveryClient, discovery_service_stub: Mock +): + discovery_service_stub.ResolveService.return_value = GrpcServiceLocation( + location=_TEST_SERVICE_LOCATION.location, + insecure_port=_TEST_SERVICE_LOCATION.insecure_port, + ssl_authenticated_port=_TEST_SERVICE_LOCATION.ssl_authenticated_port, + ) + + service_location = discovery_client.resolve_service( + provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], + service_class=_TEST_SERVICE_INFO.service_class, + ) + + discovery_service_stub.ResolveService.assert_called_once() + request: ResolveServiceRequest = discovery_service_stub.ResolveService.call_args.args[0] + assert _TEST_SERVICE_INFO.provided_interfaces[0] == request.provided_interface + assert _TEST_SERVICE_INFO.service_class == request.service_class + _assert_service_location_equal(_TEST_SERVICE_LOCATION, service_location) + + +def test___service_registered___resolve_service_with_version___sends_request( discovery_client: DiscoveryClient, discovery_service_stub: Mock ): discovery_service_stub.ResolveService.return_value = GrpcServiceLocation( From 37e57a9b9884e8da669dd9951a8e54a89ae89dbe Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Wed, 25 Sep 2024 10:53:01 +0530 Subject: [PATCH 05/10] fix: update version of service --- packages/service/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/service/pyproject.toml b/packages/service/pyproject.toml index 44462d9a0..41734ef7c 100644 --- a/packages/service/pyproject.toml +++ b/packages/service/pyproject.toml @@ -7,7 +7,7 @@ extend_exclude = '.tox/,*_pb2_grpc.py,*_pb2_grpc.pyi,*_pb2.py,*_pb2.pyi,ni_measu [tool.poetry] name = "ni_measurement_plugin_sdk_service" -version = "2.1.0-dev0" +version = "2.1.0-dev1" description = "Measurement Plugin Support for Python" authors = ["NI "] readme = "README.md" # apply the repo readme to the package as well From 6a0c1f9202ce33ada8849213f367cd3a70d8f591 Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Wed, 25 Sep 2024 11:33:10 +0530 Subject: [PATCH 06/10] fix: update version and revert the unwanted changes --- packages/generator/pyproject.toml | 2 +- packages/sdk/pyproject.toml | 2 +- packages/service/pyproject.toml | 2 +- packages/service/tests/unit/test_discovery_client.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/generator/pyproject.toml b/packages/generator/pyproject.toml index 57e74baaf..625db288a 100644 --- a/packages/generator/pyproject.toml +++ b/packages/generator/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ni_measurement_plugin_sdk_generator" -version = "2.1.0-dev0" +version = "2.1.0-dev2" description = "Measurement Plugin Code Generator for Python" authors = ["NI "] readme = "README.md" diff --git a/packages/sdk/pyproject.toml b/packages/sdk/pyproject.toml index 8c0d63a9a..3e988d8fc 100644 --- a/packages/sdk/pyproject.toml +++ b/packages/sdk/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ni_measurement_plugin_sdk" -version = "2.1.0-dev0" +version = "2.1.0-dev2" description = "Measurement Plugin SDK for Python" authors = ["NI "] readme = "README.md" diff --git a/packages/service/pyproject.toml b/packages/service/pyproject.toml index 41734ef7c..929d3312b 100644 --- a/packages/service/pyproject.toml +++ b/packages/service/pyproject.toml @@ -7,7 +7,7 @@ extend_exclude = '.tox/,*_pb2_grpc.py,*_pb2_grpc.pyi,*_pb2.py,*_pb2.pyi,ni_measu [tool.poetry] name = "ni_measurement_plugin_sdk_service" -version = "2.1.0-dev1" +version = "2.1.0-dev2" description = "Measurement Plugin Support for Python" authors = ["NI "] readme = "README.md" # apply the repo readme to the package as well diff --git a/packages/service/tests/unit/test_discovery_client.py b/packages/service/tests/unit/test_discovery_client.py index 66e481609..b04ce1358 100644 --- a/packages/service/tests/unit/test_discovery_client.py +++ b/packages/service/tests/unit/test_discovery_client.py @@ -173,7 +173,6 @@ def test___service_not_registered___resolve_service___raises_not_found_error( _ = discovery_client.resolve_service( provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], service_class=_TEST_SERVICE_INFO.service_class, - version=_TEST_SERVICE_INFO.versions[0], ) discovery_service_stub.ResolveService.assert_called_once() From f622e0c9645429652e3bbc2ae13280d76548cb9c Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Wed, 25 Sep 2024 11:34:44 +0530 Subject: [PATCH 07/10] fix: revert unwanted change --- packages/service/tests/unit/test_discovery_client.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/service/tests/unit/test_discovery_client.py b/packages/service/tests/unit/test_discovery_client.py index b04ce1358..024ea33fb 100644 --- a/packages/service/tests/unit/test_discovery_client.py +++ b/packages/service/tests/unit/test_discovery_client.py @@ -171,8 +171,7 @@ def test___service_not_registered___resolve_service___raises_not_found_error( with pytest.raises(grpc.RpcError) as exc_info: _ = discovery_client.resolve_service( - provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], - service_class=_TEST_SERVICE_INFO.service_class, + _TEST_SERVICE_INFO.provided_interfaces[0], _TEST_SERVICE_INFO.service_class ) discovery_service_stub.ResolveService.assert_called_once() From 0be46d4a91d195a1c144f09379cde5a324241c26 Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Wed, 25 Sep 2024 11:41:44 +0530 Subject: [PATCH 08/10] fix: update poetry --- packages/generator/poetry.lock | 2 +- packages/service/tests/unit/test_discovery_client.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/generator/poetry.lock b/packages/generator/poetry.lock index dcb101505..015fb218b 100644 --- a/packages/generator/poetry.lock +++ b/packages/generator/poetry.lock @@ -793,7 +793,7 @@ types-protobuf = ">=4.24" [[package]] name = "ni-measurement-plugin-sdk-service" -version = "2.1.0-dev0" +version = "2.1.0-dev2" description = "Measurement Plugin Support for Python" optional = false python-versions = "^3.8" diff --git a/packages/service/tests/unit/test_discovery_client.py b/packages/service/tests/unit/test_discovery_client.py index 024ea33fb..1c5ac0a48 100644 --- a/packages/service/tests/unit/test_discovery_client.py +++ b/packages/service/tests/unit/test_discovery_client.py @@ -128,8 +128,7 @@ def test___service_registered___resolve_service_without_version___sends_request( ) service_location = discovery_client.resolve_service( - provided_interface=_TEST_SERVICE_INFO.provided_interfaces[0], - service_class=_TEST_SERVICE_INFO.service_class, + _TEST_SERVICE_INFO.provided_interfaces[0], _TEST_SERVICE_INFO.service_class ) discovery_service_stub.ResolveService.assert_called_once() From 187422eac2cef9e9274bdf4342ded269f9741a97 Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Wed, 25 Sep 2024 11:47:34 +0530 Subject: [PATCH 09/10] fix: formatting --- packages/service/tests/unit/test_discovery_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/service/tests/unit/test_discovery_client.py b/packages/service/tests/unit/test_discovery_client.py index 1c5ac0a48..4e52494cb 100644 --- a/packages/service/tests/unit/test_discovery_client.py +++ b/packages/service/tests/unit/test_discovery_client.py @@ -128,7 +128,7 @@ def test___service_registered___resolve_service_without_version___sends_request( ) service_location = discovery_client.resolve_service( - _TEST_SERVICE_INFO.provided_interfaces[0], _TEST_SERVICE_INFO.service_class + _TEST_SERVICE_INFO.provided_interfaces[0], _TEST_SERVICE_INFO.service_class ) discovery_service_stub.ResolveService.assert_called_once() From 1386842ebfa5bd2b436d01f23a74a5480ae4c76d Mon Sep 17 00:00:00 2001 From: Jotheeswaran Nandagopal Date: Wed, 25 Sep 2024 13:02:25 +0530 Subject: [PATCH 10/10] fix: update version of test measurements in service config --- .../NonStreamingDataMeasurement.serviceconfig | 1 + .../measurements/non_streaming_data_measurement/__init__.py | 1 - .../pin_aware_measurement/PinAwareMeasurement.serviceconfig | 1 + .../utilities/measurements/pin_aware_measurement/__init__.py | 1 - .../StreamingDataMeasurement.serviceconfig | 1 + .../measurements/streaming_data_measurement/__init__.py | 1 - .../measurements/void_measurement/VoidMeasurement.serviceconfig | 1 + .../tests/utilities/measurements/void_measurement/__init__.py | 1 - 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/NonStreamingDataMeasurement.serviceconfig b/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/NonStreamingDataMeasurement.serviceconfig index a9c4276aa..3495e2ae4 100644 --- a/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/NonStreamingDataMeasurement.serviceconfig +++ b/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/NonStreamingDataMeasurement.serviceconfig @@ -2,6 +2,7 @@ "services": [ { "displayName": "Non-Streaming Data Measurement (Py)", + "version": "0.1.0.0", "serviceClass": "ni.tests.NonStreamingDataMeasurement_Python", "descriptionUrl": "", "providedInterfaces": [ diff --git a/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/__init__.py b/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/__init__.py index 943007092..bc742112c 100644 --- a/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/__init__.py +++ b/packages/generator/tests/utilities/measurements/non_streaming_data_measurement/__init__.py @@ -13,7 +13,6 @@ service_directory = Path(__file__).resolve().parent measurement_service = nims.MeasurementService( service_config_path=service_directory / "NonStreamingDataMeasurement.serviceconfig", - version="0.1.0.0", ui_file_paths=[ service_directory, ], diff --git a/packages/generator/tests/utilities/measurements/pin_aware_measurement/PinAwareMeasurement.serviceconfig b/packages/generator/tests/utilities/measurements/pin_aware_measurement/PinAwareMeasurement.serviceconfig index 596293253..9c9049ffe 100644 --- a/packages/generator/tests/utilities/measurements/pin_aware_measurement/PinAwareMeasurement.serviceconfig +++ b/packages/generator/tests/utilities/measurements/pin_aware_measurement/PinAwareMeasurement.serviceconfig @@ -2,6 +2,7 @@ "services": [ { "displayName": "Pin Aware Measurement (Py)", + "version": "0.1.0.0", "serviceClass": "ni.tests.PinAwareMeasurement_Python", "descriptionUrl": "", "providedInterfaces": [ diff --git a/packages/generator/tests/utilities/measurements/pin_aware_measurement/__init__.py b/packages/generator/tests/utilities/measurements/pin_aware_measurement/__init__.py index aa8086b6d..152e2f60f 100644 --- a/packages/generator/tests/utilities/measurements/pin_aware_measurement/__init__.py +++ b/packages/generator/tests/utilities/measurements/pin_aware_measurement/__init__.py @@ -8,7 +8,6 @@ service_directory = pathlib.Path(__file__).resolve().parent measurement_service = nims.MeasurementService( service_config_path=service_directory / "PinAwareMeasurement.serviceconfig", - version="0.1.0.0", ui_file_paths=[ service_directory, ], diff --git a/packages/generator/tests/utilities/measurements/streaming_data_measurement/StreamingDataMeasurement.serviceconfig b/packages/generator/tests/utilities/measurements/streaming_data_measurement/StreamingDataMeasurement.serviceconfig index 73f621fbc..326eeabd0 100644 --- a/packages/generator/tests/utilities/measurements/streaming_data_measurement/StreamingDataMeasurement.serviceconfig +++ b/packages/generator/tests/utilities/measurements/streaming_data_measurement/StreamingDataMeasurement.serviceconfig @@ -2,6 +2,7 @@ "services": [ { "displayName": "Streaming Data Measurement (Py)", + "version": "0.1.0.0", "serviceClass": "ni.tests.StreamingDataMeasurement_Python", "descriptionUrl": "", "providedInterfaces": [ diff --git a/packages/generator/tests/utilities/measurements/streaming_data_measurement/__init__.py b/packages/generator/tests/utilities/measurements/streaming_data_measurement/__init__.py index 1180cb29b..ad35f7060 100644 --- a/packages/generator/tests/utilities/measurements/streaming_data_measurement/__init__.py +++ b/packages/generator/tests/utilities/measurements/streaming_data_measurement/__init__.py @@ -11,7 +11,6 @@ service_directory = pathlib.Path(__file__).resolve().parent measurement_service = nims.MeasurementService( service_config_path=service_directory / "StreamingDataMeasurement.serviceconfig", - version="0.1.0.0", ui_file_paths=[ service_directory, ], diff --git a/packages/generator/tests/utilities/measurements/void_measurement/VoidMeasurement.serviceconfig b/packages/generator/tests/utilities/measurements/void_measurement/VoidMeasurement.serviceconfig index aa9f6d38c..c23c1b602 100644 --- a/packages/generator/tests/utilities/measurements/void_measurement/VoidMeasurement.serviceconfig +++ b/packages/generator/tests/utilities/measurements/void_measurement/VoidMeasurement.serviceconfig @@ -2,6 +2,7 @@ "services": [ { "displayName": "Void Measurement (Py)", + "version": "0.1.0.0", "serviceClass": "ni.tests.VoidMeasurement_Python", "descriptionUrl": "", "providedInterfaces": [ diff --git a/packages/generator/tests/utilities/measurements/void_measurement/__init__.py b/packages/generator/tests/utilities/measurements/void_measurement/__init__.py index 8366f6b88..968460992 100644 --- a/packages/generator/tests/utilities/measurements/void_measurement/__init__.py +++ b/packages/generator/tests/utilities/measurements/void_measurement/__init__.py @@ -11,7 +11,6 @@ service_directory = Path(__file__).resolve().parent measurement_service = nims.MeasurementService( service_config_path=service_directory / "VoidMeasurement.serviceconfig", - version="0.1.0.0", ui_file_paths=[ service_directory, ],