From 37217744da00408edb33e8229726a165eed8fb7c Mon Sep 17 00:00:00 2001 From: hunter-ni <68388297+hunter-ni@users.noreply.github.com> Date: Mon, 1 Dec 2025 13:03:36 -0600 Subject: [PATCH 1/4] Support "CLUSTERID" without the prefix. --- .../ni/measurementlink/discovery/v1/client/_support.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py index 88363561..2f6c4dee 100644 --- a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py +++ b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py @@ -29,9 +29,16 @@ _START_SERVICE_TIMEOUT = 30.0 _START_SERVICE_POLLING_INTERVAL = 100e-3 +_DISCOVERY_SERVICE_ENV_VAR_PREFIX = "NIDISCOVERY_" +_DISCOVERY_SERVICE_CLUSTER_ID_ENV_VAR = "CLUSTERID" + def _get_discovery_service_address() -> str: - cluster_id = os.environ.get("NIDISCOVERY_CLUSTERID") + cluster_id = os.environ.get( + _DISCOVERY_SERVICE_ENV_VAR_PREFIX + _DISCOVERY_SERVICE_CLUSTER_ID_ENV_VAR + ) + if not cluster_id: + cluster_id = os.environ.get(_DISCOVERY_SERVICE_CLUSTER_ID_ENV_VAR) key_file_path = _get_key_file_path(cluster_id) _ensure_discovery_service_started(key_file_path) _logger.debug("Discovery service key file path: %s", key_file_path) From a46926334570fdc50353768e8369718ef9675ccb Mon Sep 17 00:00:00 2001 From: hunter-ni <68388297+hunter-ni@users.noreply.github.com> Date: Mon, 1 Dec 2025 14:06:17 -0600 Subject: [PATCH 2/4] Add comment about OS --- .../src/ni/measurementlink/discovery/v1/client/_support.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py index 2f6c4dee..628b27f5 100644 --- a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py +++ b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py @@ -34,6 +34,8 @@ def _get_discovery_service_address() -> str: + # To support operating systems other than Windows, we would likely need to make this check + # case-insensitive. cluster_id = os.environ.get( _DISCOVERY_SERVICE_ENV_VAR_PREFIX + _DISCOVERY_SERVICE_CLUSTER_ID_ENV_VAR ) From c42d7a0b04f75f812ec325dd99cae0191c844ebb Mon Sep 17 00:00:00 2001 From: hunter-ni <68388297+hunter-ni@users.noreply.github.com> Date: Mon, 1 Dec 2025 14:08:27 -0600 Subject: [PATCH 3/4] Update comment --- .../src/ni/measurementlink/discovery/v1/client/_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py index 628b27f5..1b408cf1 100644 --- a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py +++ b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py @@ -34,8 +34,8 @@ def _get_discovery_service_address() -> str: - # To support operating systems other than Windows, we would likely need to make this check - # case-insensitive. + # To support operating systems other than Windows (and match Discovery Service behavior), + # we would likely want to make this check case-insensitive. cluster_id = os.environ.get( _DISCOVERY_SERVICE_ENV_VAR_PREFIX + _DISCOVERY_SERVICE_CLUSTER_ID_ENV_VAR ) From 41e5abda061cec2871edb85e0f327fefb0bc62ed Mon Sep 17 00:00:00 2001 From: hunter-ni <68388297+hunter-ni@users.noreply.github.com> Date: Wed, 17 Dec 2025 16:26:26 -0600 Subject: [PATCH 4/4] Make environment variable specification use Pascal Case for consistency with server. --- .../src/ni/measurementlink/discovery/v1/client/_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py index 1b408cf1..522f205b 100644 --- a/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py +++ b/packages/ni.measurementlink.discovery.v1.client/src/ni/measurementlink/discovery/v1/client/_support.py @@ -29,8 +29,8 @@ _START_SERVICE_TIMEOUT = 30.0 _START_SERVICE_POLLING_INTERVAL = 100e-3 -_DISCOVERY_SERVICE_ENV_VAR_PREFIX = "NIDISCOVERY_" -_DISCOVERY_SERVICE_CLUSTER_ID_ENV_VAR = "CLUSTERID" +_DISCOVERY_SERVICE_ENV_VAR_PREFIX = "NIDiscovery_" +_DISCOVERY_SERVICE_CLUSTER_ID_ENV_VAR = "ClusterId" def _get_discovery_service_address() -> str: