Cleanup After Init behavior should better match MeasurementLink workf…

…low (#417) * change behavior of cleanup after ini * more changes * Undo interface changes * fix visa cleanup * fix broken VI * final changes for RFC * Fix one of the two tests * fix other test. hopefully didn't break anything else * modify existing tests to test new behavior * fix library issue
ni · Dec 4, 2023 · 3e11ea2 · 3e11ea2
1 parent c991f5f
commit 3e11ea2
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 42 deletions.
diff --git a/Source/Runtime/Measurement Server.lvproj b/Source/Runtime/Measurement Server.lvproj
@@ -83,9 +83,9 @@
 				<Item Name="VISA gRPC Open Close Behavior.ctl" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA gRPC Open Close Behavior.ctl"/>
 				<Item Name="VISA Open Access Mode.ctl" Type="VI" URL="/&lt;vilib&gt;/Instr/_visa.llb/VISA Open Access Mode.ctl"/>
 				<Item Name="VISA Open for gRPC Session.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Open for gRPC Session.vi"/>
+				<Item Name="VISA gRPC Options.ctl" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA gRPC Options.ctl"/>
 				<Item Name="VISA Format gRPC Resource Name.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC Resource Name.vi"/>
 				<Item Name="VISA Format gRPC URI.vi" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA Format gRPC URI.vi"/>
-				<Item Name="VISA gRPC Options.ctl" Type="VI" URL="/&lt;vilib&gt;/NI-VISA/VISA gRPC Options.ctl"/>
 			</Item>
 			<Item Name="instr.lib" Type="Folder">
 				<Item Name="niDCPower Initialize With Independent Channels for gRPC session.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Initialize With Independent Channels for gRPC session.vi"/>
@@ -113,19 +113,6 @@
 				<Item Name="niDMM Self-Test.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM Self-Test.vi"/>
 				<Item Name="niDigital Self Test.vi" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital Self Test.vi"/>
 				<Item Name="niDCPower Self Test.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Self Test.vi"/>
-				<Item Name="niDCPower gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower gRPC Device Server.ctl"/>
-				<Item Name="niDigital Get Session Reference.vi" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital Get Session Reference.vi"/>
-				<Item Name="niDigital gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital gRPC Device Server.ctl"/>
-				<Item Name="niDMM gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM gRPC Device Server.ctl"/>
-				<Item Name="niFgen Get Session Reference.vi" Type="VI" URL="/&lt;instrlib&gt;/niFgen/niFgen.llb/niFgen Get Session Reference.vi"/>
-				<Item Name="niFgen gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niFgen/niFgen.llb/niFgen gRPC Device Server.ctl"/>
-				<Item Name="niScope Get Session Reference.vi" Type="VI" URL="/&lt;instrlib&gt;/niScope/Utility/niScope Get Session Reference.vi"/>
-				<Item Name="niScope gRPC Device Server.ctl" Type="VI" URL="/&lt;instrlib&gt;/niScope/niScope gRPC Device Server.ctl"/>
-				<Item Name="niDCPower IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower IVI Error Converter.vi"/>
-				<Item Name="niDigital IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDigital/niDigital.llb/niDigital IVI Error Converter.vi"/>
-				<Item Name="niDMM IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM IVI Error Converter.vi"/>
-				<Item Name="niFgen IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niFgen/niFgen.llb/niFgen IVI Error Converter.vi"/>
-				<Item Name="niScope LabVIEW Error.vi" Type="VI" URL="/&lt;instrlib&gt;/niScope/Utility/niScope LabVIEW Error.vi"/>
 			</Item>
 			<Item Name="kernel32.dll" Type="Document" URL="kernel32.dll">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
@@ -135,21 +122,6 @@
 			<Item Name="MeasurementLink Measurement Service Base V2.lvlib" Type="Library" URL="../MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib"/>
 			<Item Name="MeasurementLink Pin Map Client.lvlib" Type="Library" URL="../MeasurementLink Pin Map Client/MeasurementLink Pin Map Client.lvlib"/>
 			<Item Name="MeasurementLink Session Management Client.lvlib" Type="Library" URL="../MeasurementLink Session Management Client/MeasurementLink Session Management Client.lvlib"/>
-			<Item Name="nidcpower_64.dll" Type="Document" URL="nidcpower_64.dll">
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
-			<Item Name="niDigital_64.dll" Type="Document" URL="niDigital_64.dll">
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
-			<Item Name="nidmm_64.dll" Type="Document" URL="nidmm_64.dll">
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
-			<Item Name="niFgen_64.dll" Type="Document" URL="niFgen_64.dll">
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
-			<Item Name="niScope_64.dll" Type="Document" URL="niScope_64.dll">
-				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
-			</Item>
 			<Item Name="ni.protobuf.types.lvlib" Type="Library" URL="../../gRPC/Generated APIs/ni/protobuf/types/ni.protobuf.types.lvlib"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build"/>

diff --git a/...k Instrument/ISession Factory/Helpers/To Cleanup Initialize and Close Session Behavior.vi b/...k Instrument/ISession Factory/Helpers/To Cleanup Initialize and Close Session Behavior.vi
diff --git a/...easurementLink Session Management/Session Reservation/Clear Error For Attach and Close.vi b/...easurementLink Session Management/Session Reservation/Clear Error For Attach and Close.vi
diff --git a/...untime/MeasurementLink Session Management/Session Reservation/Initialize Sessions Impl.vi b/...untime/MeasurementLink Session Management/Session Reservation/Initialize Sessions Impl.vi
diff --git a/...untime/MeasurementLink Session Management/Session Reservation/Session Reservation.lvclass b/...untime/MeasurementLink Session Management/Session Reservation/Session Reservation.lvclass
diff --git a/Source/Runtime/MeasurementLink VISA/Session Factory/Clean Up After Init Error.vi b/Source/Runtime/MeasurementLink VISA/Session Factory/Clean Up After Init Error.vi
diff --git a/Source/Runtime/MeasurementLink VISA/Session Factory/Initialize MeasurementLink Session.vi b/Source/Runtime/MeasurementLink VISA/Session Factory/Initialize MeasurementLink Session.vi
diff --git a/Source/Runtime/MeasurementLink VISA/Session Factory/Session Factory.lvclass b/Source/Runtime/MeasurementLink VISA/Session Factory/Session Factory.lvclass
diff --git a/...3 Sessions Registered Last Session Bad.vi → ...4 Sessions Registered Last Session Bad.vi b/...3 Sessions Registered Last Session Bad.vi → ...4 Sessions Registered Last Session Bad.vi
diff --git a/...SessionInitializeErrors_InitializeSessions_CloseCalledForPreviouslyInitializedSessions.vi b/...SessionInitializeErrors_InitializeSessions_CloseCalledForPreviouslyInitializedSessions.vi
diff --git a/...ssions/test_SessionInitializationErrors_InitializeSessions_NothingAddedToConnectionMap.vi b/...ssions/test_SessionInitializationErrors_InitializeSessions_NothingAddedToConnectionMap.vi
diff --git a/...rrors_InitializeSessionsWithAttachAndClose_CloseCalledForPreviouslyInitializedSessions.vi b/...rrors_InitializeSessionsWithAttachAndClose_CloseCalledForPreviouslyInitializedSessions.vi
diff --git a/...rors_InitializeSessionsWithAttachAndDetach_CloseCalledForPreviouslyInitializedSessions.vi b/...rors_InitializeSessionsWithAttachAndDetach_CloseCalledForPreviouslyInitializedSessions.vi
diff --git a/...nitializeErrors_InitializeSessionsWithAuto_CloseCalledForPreviouslyInitializedSessions.vi b/...nitializeErrors_InitializeSessionsWithAuto_CloseCalledForPreviouslyInitializedSessions.vi
diff --git a/...s_InitializeSessionsWithInitializeAndClose_CloseCalledForPreviouslyInitializedSessions.vi b/...s_InitializeSessionsWithInitializeAndClose_CloseCalledForPreviouslyInitializedSessions.vi
diff --git a/..._InitializeSessionsWithInitializeAndDetach_CloseCalledForPreviouslyInitializedSessions.vi b/..._InitializeSessionsWithInitializeAndDetach_CloseCalledForPreviouslyInitializedSessions.vi
diff --git a/Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib b/Source/Tests/Tests.Runtime/Measurement Server/MeasurementServerTests.lvlib
@@ -64,7 +64,7 @@
 			<Property Name="NI.SortType" Type="Int">0</Property>
 			<Item Name="Fake - 1 Session Initialized.vi" Type="VI" URL="../Initialize Sessions/Test Inputs/Fake - 1 Session Initialized.vi"/>
 			<Item Name="Fake - 1 Session Registered.vi" Type="VI" URL="../Initialize Sessions/Test Inputs/Fake - 1 Session Registered.vi"/>
-			<Item Name="Fake - 1 Session Unregistered 3 Sessions Registered Last Session Bad.vi" Type="VI" URL="../Initialize Sessions/Test Inputs/Fake - 1 Session Unregistered 3 Sessions Registered Last Session Bad.vi"/>
+			<Item Name="Fake - 1 Session Unregistered 4 Sessions Registered Last Session Bad.vi" Type="VI" URL="../Initialize Sessions/Test Inputs/Fake - 1 Session Unregistered 4 Sessions Registered Last Session Bad.vi"/>
 			<Item Name="Fake - 1 Session Unregistered.vi" Type="VI" URL="../Initialize Sessions/Test Inputs/Fake - 1 Session Unregistered.vi"/>
 			<Item Name="Fake - 2 Sessions Unregistered 1 Session Registered.vi" Type="VI" URL="../Initialize Sessions/Test Inputs/Fake - 2 Sessions Unregistered 1 Session Registered.vi"/>
 			<Item Name="Fake - 2 Sessions with Connection Map.vi" Type="VI" URL="../Initialize Sessions/Test Inputs/Fake - 2 Sessions with Connection Map.vi"/>