Add new TLS tests to all driver system tests

src/nidcpower/system_tests/grpc_server_config_tls.json

@@ -0,0 +1,8 @@
+{
+    "address": "[::]",
+    "port": 31760,
+    "security": "ni-tls-config",
+    "feature_toggles": {
+       "ni-tls-config": true
+    } 
+ }

src/nidcpower/system_tests/test_system_nidcpower.py

@@ -5,6 +5,7 @@
 
 import grpc
 import hightime
+import nitlsconfig
 import pytest
 
 import nidcpower
@@ -37,7 +38,9 @@ def pytest_generate_tests(metafunc):
             metafunc.parametrize('session', [True], indirect=True)
 
 
-class SystemTests:
+# Defines a subset of system tests to validate basic NI-DCPower functionality. This is run as a part of the full SystemTests class, and
+# independently for test classes which do not require running the entire suite (TLS-enabled gRPC tests today).
+class BasicValidationTests:
     @pytest.fixture(scope='function')
     def session(self, request, session_creation_kwargs):
         """Creates an NI-DCPower Session.
@@ -78,6 +81,50 @@ def session(self, request, session_creation_kwargs):
     def test_self_test(self, session):
         session.self_test()
 
+    @pytest.mark.channels('0')
+    def test_measure(self, session):
+        session.source_mode = nidcpower.SourceMode.SINGLE_POINT
+        session.output_function = nidcpower.OutputFunction.DC_VOLTAGE
+        session.voltage_level_range = 6
+        session.voltage_level = 2
+        with session.initiate():
+            reading = session.measure(nidcpower.MeasurementTypes.VOLTAGE)
+            assert session.query_in_compliance() is False
+        assert reading == 2
+
+    @pytest.mark.channels('0')
+    def test_fetch_multiple(self, session):
+        session.source_mode = nidcpower.SourceMode.SINGLE_POINT
+        session.configure_aperture_time(0, nidcpower.ApertureTimeUnits.SECONDS)
+        session.voltage_level = 1
+        count = 10
+        session.measure_when = nidcpower.MeasureWhen.AUTOMATICALLY_AFTER_SOURCE_COMPLETE
+        with session.initiate():
+            measurements = session.fetch_multiple(count)
+            assert len(measurements) == count
+            assert isinstance(measurements[1].voltage, float)
+            assert isinstance(measurements[1].current, float)
+            assert measurements[1].in_compliance in [True, False]
+            assert measurements[1].voltage == 1.0
+            assert measurements[1].current == 0.00001
+
+    def test_measure_multiple(self, session):
+        with session.initiate():
+            # session is open to all 12 channels on the device
+            measurements = session.measure_multiple()
+            assert len(measurements) == 12
+            assert measurements[1].in_compliance is None
+            assert measurements[1].voltage == 0.0
+            assert measurements[1].current == 0.00001
+            # now a subset of the channels
+            measurements = session.channels[range(4)].measure_multiple()
+            assert len(measurements) == 4
+            assert measurements[1].in_compliance is None
+            assert measurements[1].voltage == 0.0
+            assert measurements[1].current == 0.00001
+
+
+class SystemTests(BasicValidationTests):
     # Workaround for driver runtime bug. See issue #1798 for details.
     @pytest.mark.legacy_session_only
     def test_self_cal(self, session):
@@ -161,17 +208,6 @@ def test_disable(self, session):
         session.disable()
         assert channel.output_enabled is False
 
-    @pytest.mark.channels('0')
-    def test_measure(self, session):
-        session.source_mode = nidcpower.SourceMode.SINGLE_POINT
-        session.output_function = nidcpower.OutputFunction.DC_VOLTAGE
-        session.voltage_level_range = 6
-        session.voltage_level = 2
-        with session.initiate():
-            reading = session.measure(nidcpower.MeasurementTypes.VOLTAGE)
-            assert session.query_in_compliance() is False
-        assert reading == 2
-
     @pytest.mark.channels('0')
     def test_query_output_state(self, session):
         with session.initiate():
@@ -192,37 +228,6 @@ def test_config_aperture_time(self, session):
         aperture_time_in_range = abs(aperture_time - expected_aperture_time) <= max(1e-09 * max(abs(aperture_time), abs(expected_aperture_time)), 0.0)  # https://stackoverflow.com/questions/5595425/what-is-the-best-way-to-compare-floats-for-almost-equality-in-python
         assert aperture_time_in_range is True
 
-    @pytest.mark.channels('0')
-    def test_fetch_multiple(self, session):
-        session.source_mode = nidcpower.SourceMode.SINGLE_POINT
-        session.configure_aperture_time(0, nidcpower.ApertureTimeUnits.SECONDS)
-        session.voltage_level = 1
-        count = 10
-        session.measure_when = nidcpower.MeasureWhen.AUTOMATICALLY_AFTER_SOURCE_COMPLETE
-        with session.initiate():
-            measurements = session.fetch_multiple(count)
-            assert len(measurements) == count
-            assert isinstance(measurements[1].voltage, float)
-            assert isinstance(measurements[1].current, float)
-            assert measurements[1].in_compliance in [True, False]
-            assert measurements[1].voltage == 1.0
-            assert measurements[1].current == 0.00001
-
-    def test_measure_multiple(self, session):
-        with session.initiate():
-            # session is open to all 12 channels on the device
-            measurements = session.measure_multiple()
-            assert len(measurements) == 12
-            assert measurements[1].in_compliance is None
-            assert measurements[1].voltage == 0.0
-            assert measurements[1].current == 0.00001
-            # now a subset of the channels
-            measurements = session.channels[range(4)].measure_multiple()
-            assert len(measurements) == 4
-            assert measurements[1].in_compliance is None
-            assert measurements[1].voltage == 0.0
-            assert measurements[1].current == 0.00001
-
     @pytest.mark.parametrize(
         'resource_name,channels,independent_channels,measurement_channels,expected_measured_channel',
         [
@@ -1074,7 +1079,8 @@ def test_multi_threading_ivi_synchronized_wrapper_releases_lock(self, session):
 
 class TestLibrary(SystemTests):
     @pytest.fixture(scope='class')
-    def session_creation_kwargs(self):
+    @classmethod
+    def session_creation_kwargs(cls):
         return {}
 
     @pytest.mark.resource_name("4190/0")
@@ -1096,17 +1102,19 @@ def test_lcr_compensation_data(self, session):
         session.configure_lcr_compensation(compensation_data_bytes_from_file)
 
 
-class TestGrpc(SystemTests):
+class TestGrpcNoTLS(SystemTests):
     @pytest.fixture(scope='class')
-    def grpc_channel(self):
+    @classmethod
+    def grpc_channel(cls):
         current_directory = os.path.dirname(os.path.abspath(__file__))
-        config_file_path = os.path.join(current_directory, 'grpc_server_config.json')
+        config_file_path = os.path.join(current_directory, 'grpc_server_config_no_tls.json')
         with system_test_utilities.GrpcServerProcess(config_file_path) as proc:
             channel = grpc.insecure_channel(f"localhost:{proc.server_port}")
             yield channel
 
     @pytest.fixture(scope='class')
-    def session_creation_kwargs(self, grpc_channel):
+    @classmethod
+    def session_creation_kwargs(cls, grpc_channel):
         grpc_options = nidcpower.GrpcSessionOptions(grpc_channel, "")
         return {'grpc_options': grpc_options}
 
@@ -1121,3 +1129,44 @@ def test_configure_lcr_compensation(self, session):
             session.configure_lcr_compensation([])
         assert exc_info.value.args[0] == 'configure_lcr_compensation is not supported over gRPC'
         assert str(exc_info.value) == 'configure_lcr_compensation is not supported over gRPC'
+
+
+@pytest.mark.skipif(sys.maxsize < 2**32, reason="TLS configuration and certificate exchange scripts are not supported in 32-bit processes")
+class TestGrpcSecuredTLS(BasicValidationTests):
+    @pytest.fixture(scope='class')
+    @classmethod
+    def grpc_channel(cls):
+        system_test_utilities.configure_tls_modes_secure(service="ni-grpc-device", server_host="localhost")
+        system_test_utilities.exchange_certificates("localhost")
+
+        current_directory = os.path.dirname(os.path.abspath(__file__))
+        config_file_path = os.path.join(current_directory, 'grpc_server_config_tls.json')
+        with system_test_utilities.GrpcServerProcess(config_file_path) as proc:
+            channel = nitlsconfig.create_grpc_device_channel('localhost', proc.server_port)
+            yield channel
+
+    @pytest.fixture(scope='class')
+    @classmethod
+    def session_creation_kwargs(cls, grpc_channel):
+        grpc_options = nidcpower.GrpcSessionOptions(grpc_channel, "")
+        return {'grpc_options': grpc_options}
+
+
+@pytest.mark.skipif(sys.maxsize < 2**32, reason="TLS configuration and certificate exchange scripts are not supported in 32-bit processes")
+class TestGrpcUnsecuredTLS(BasicValidationTests):
+    @pytest.fixture(scope='class')
+    @classmethod
+    def grpc_channel(cls):
+        system_test_utilities.configure_tls_modes_insecure(service="ni-grpc-device", server_host="localhost")
+
+        current_directory = os.path.dirname(os.path.abspath(__file__))
+        config_file_path = os.path.join(current_directory, 'grpc_server_config_tls.json')
+        with system_test_utilities.GrpcServerProcess(config_file_path) as proc:
+            channel = nitlsconfig.create_grpc_device_channel('localhost', proc.server_port)
+            yield channel
+
+    @pytest.fixture(scope='class')
+    @classmethod
+    def session_creation_kwargs(cls, grpc_channel):
+        grpc_options = nidcpower.GrpcSessionOptions(grpc_channel, "")
+        return {'grpc_options': grpc_options}

src/nidigital/system_tests/grpc_server_config_tls.json

@@ -0,0 +1,8 @@
+{
+    "address": "[::]",
+    "port": 31761,
+    "security": "ni-tls-config",
+    "feature_toggles": {
+       "ni-tls-config": true
+    } 
+ }