Skip to content

Commit dcc02f1

Browse files
opcfoundation-orgmrsuciuromanettrandy-armstrong
authored
Update to 1.05.04 nodeset (#3091)
* Update version.json (#3050) * Fix XML Encoding and decoding of Matrix Element in Variant to conform to spec (#3053) (#3054) * Fix XML Encoding and decoding to conform to spec * fix test on linux * fix typo * Add missing DataValue & DiagnosticInfo Array Types Co-authored-by: romanett <[email protected]> * Return NodeSet to 1.05.04. * Remove OptionalPlaceholders on instances. * Fix duplicate pragas. * Fix glitches in generated files. --------- Co-authored-by: Suciu Mircea Adrian <[email protected]> Co-authored-by: romanett <[email protected]> Co-authored-by: Randy Armstrong <[email protected]>
1 parent 474f055 commit dcc02f1

16 files changed

+296
-835
lines changed

‎Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.Classes.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
using System.Collections.Generic;
3232
using System.Text;
3333
using System.Xml;
34+
using System.Linq;
3435
using System.Runtime.Serialization;
3536
using Opc.Ua;
3637

‎Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.PredefinedNodes.uanodes‎

7 Bytes
Binary file not shown.

‎Libraries/Opc.Ua.Gds.Server.Common/Model/Opc.Ua.Gds.PredefinedNodes.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4158,6 +4158,16 @@
41584158
<uax:Identifier>i=78</uax:Identifier>
41594159
</uax:ModellingRuleId>
41604160
<uax:NumericId>511</uax:NumericId>
4161+
<uax:References>
4162+
<uax:Reference>
4163+
<uax:ReferenceTypeId>
4164+
<uax:Identifier>i=35</uax:Identifier>
4165+
</uax:ReferenceTypeId>
4166+
<uax:TargetId>
4167+
<uax:Identifier>i=13916</uax:Identifier>
4168+
</uax:TargetId>
4169+
</uax:Reference>
4170+
</uax:References>
41614171
<DefaultApplicationGroup xmlns="http://opcfoundation.org/UA/">
41624172
<uax:NodeClass>Object_1</uax:NodeClass>
41634173
<uax:NodeId>

‎Stack/Opc.Ua.Core/Schema/BuildSchema.bat‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,45 @@
11
@echo off
22
setlocal
33

4+
set XSD=xsd
5+
6+
where %XSD% >nul 2>&1
7+
if not %ERRORLEVEL%==0 (
8+
echo %XSD% is NOT in the PATH.
9+
exit 1
10+
)
11+
12+
set SVCUTIL=svcutil
13+
14+
where %SVCUTIL% >nul 2>&1
15+
if not %ERRORLEVEL%==0 (
16+
echo %SVCUTIL% is NOT in the PATH.
17+
exit 1
18+
)
19+
420
echo Processing NodeSet Schema
5-
xsd /classes /n:Opc.Ua.Export UANodeSet.xsd
21+
%XSD% /classes /n:Opc.Ua.Export UANodeSet.xsd
22+
23+
powershell -NoProfile -Command ^
24+
"$content = Get-Content -Raw -Encoding UTF8 'UANodeSet.cs';" ^
25+
"$utf8NoBom = New-Object System.Text.UTF8Encoding $false;" ^
26+
"[System.IO.File]::WriteAllText('temp1.txt', $content, $utf8NoBom)"
627

7-
echo #pragma warning disable 1591 > temp.txt
8-
type UANodeSet.cs >> temp.txt
9-
type temp.txt > UANodeSet.cs
28+
echo #pragma warning disable 1591 > temp2.txt
29+
type temp1.txt >> temp2.txt
30+
type temp2.txt > UANodeSet.cs
1031

1132
echo Processing SecuredApplication Schema
12-
svcutil /dconly /namespace:*,Opc.Ua.Security /out:SecuredApplication.cs SecuredApplication.xsd
33+
%SVCUTIL% /dconly /namespace:*,Opc.Ua.Security /out:SecuredApplication.cs SecuredApplication.xsd
34+
35+
powershell -NoProfile -Command ^
36+
"$content = Get-Content -Raw -Encoding UTF8 'SecuredApplication.cs';" ^
37+
"$utf8NoBom = New-Object System.Text.UTF8Encoding $false;" ^
38+
"[System.IO.File]::WriteAllText('temp1.txt', $content, $utf8NoBom)"
1339

14-
echo #pragma warning disable 1591 > temp.txt
15-
type SecuredApplication.cs >> temp.txt
16-
type temp.txt > SecuredApplication.cs
40+
echo #pragma warning disable 1591 > temp2.txt
41+
type temp1.txt >> temp2.txt
42+
type temp2.txt > SecuredApplication.cs
1743

18-
del /Q temp.txt
44+
del /Q temp1.txt
45+
del /Q temp2.txt

‎Stack/Opc.Ua.Core/Schema/Opc.Ua.Gds.NodeSet2.xml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,7 +1733,7 @@
17331733
<UADataType NodeId="ns=1;i=1" BrowseName="1:ApplicationRecordDataType">
17341734
<DisplayName>ApplicationRecordDataType</DisplayName>
17351735
<Category>GDS Application Directory</Category>
1736-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.5</Documentation>
1736+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.5</Documentation>
17371737
<References>
17381738
<Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
17391739
</References>
@@ -1749,8 +1749,7 @@
17491749
</UADataType>
17501750
<UAObjectType NodeId="ns=1;i=13" BrowseName="1:DirectoryType">
17511751
<DisplayName>DirectoryType</DisplayName>
1752-
<Category>GDS Application Directory</Category>
1753-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.3</Documentation>
1752+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.11</Documentation>
17541753
<References>
17551754
<Reference ReferenceType="HasComponent">ns=1;i=14</Reference>
17561755
<Reference ReferenceType="HasComponent">ns=1;i=15</Reference>
@@ -1773,7 +1772,7 @@
17731772
</UAObject>
17741773
<UAMethod NodeId="ns=1;i=15" BrowseName="1:FindApplications" ParentNodeId="ns=1;i=13">
17751774
<DisplayName>FindApplications</DisplayName>
1776-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.4</Documentation>
1775+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.4</Documentation>
17771776
<References>
17781777
<Reference ReferenceType="HasProperty">ns=1;i=16</Reference>
17791778
<Reference ReferenceType="HasProperty">ns=1;i=17</Reference>
@@ -1839,7 +1838,7 @@
18391838
</UAVariable>
18401839
<UAMethod NodeId="ns=1;i=18" BrowseName="1:RegisterApplication" ParentNodeId="ns=1;i=13">
18411840
<DisplayName>RegisterApplication</DisplayName>
1842-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.6</Documentation>
1841+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.6</Documentation>
18431842
<References>
18441843
<Reference ReferenceType="HasProperty">ns=1;i=19</Reference>
18451844
<Reference ReferenceType="HasProperty">ns=1;i=20</Reference>
@@ -1903,7 +1902,7 @@
19031902
</UAVariable>
19041903
<UAMethod NodeId="ns=1;i=188" BrowseName="1:UpdateApplication" ParentNodeId="ns=1;i=13">
19051904
<DisplayName>UpdateApplication</DisplayName>
1906-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.7</Documentation>
1905+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.7</Documentation>
19071906
<References>
19081907
<Reference ReferenceType="HasProperty">ns=1;i=189</Reference>
19091908
<Reference ReferenceType="HasModellingRule">i=78</Reference>
@@ -1939,7 +1938,7 @@
19391938
</UAVariable>
19401939
<UAMethod NodeId="ns=1;i=21" BrowseName="1:UnregisterApplication" ParentNodeId="ns=1;i=13">
19411940
<DisplayName>UnregisterApplication</DisplayName>
1942-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.8</Documentation>
1941+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.8</Documentation>
19431942
<References>
19441943
<Reference ReferenceType="HasProperty">ns=1;i=22</Reference>
19451944
<Reference ReferenceType="HasModellingRule">i=78</Reference>
@@ -1975,7 +1974,7 @@
19751974
</UAVariable>
19761975
<UAMethod NodeId="ns=1;i=210" BrowseName="1:GetApplication" ParentNodeId="ns=1;i=13">
19771976
<DisplayName>GetApplication</DisplayName>
1978-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.9</Documentation>
1977+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.9</Documentation>
19791978
<References>
19801979
<Reference ReferenceType="HasProperty">ns=1;i=211</Reference>
19811980
<Reference ReferenceType="HasProperty">ns=1;i=212</Reference>
@@ -2039,7 +2038,7 @@
20392038
</UAVariable>
20402039
<UAMethod NodeId="ns=1;i=868" BrowseName="1:QueryApplications" ParentNodeId="ns=1;i=13">
20412040
<DisplayName>QueryApplications</DisplayName>
2042-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.10</Documentation>
2041+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.10</Documentation>
20432042
<References>
20442043
<Reference ReferenceType="HasProperty">ns=1;i=869</Reference>
20452044
<Reference ReferenceType="HasProperty">ns=1;i=870</Reference>
@@ -2227,7 +2226,7 @@
22272226
</UAVariable>
22282227
<UAMethod NodeId="ns=1;i=23" BrowseName="1:QueryServers" ParentNodeId="ns=1;i=13">
22292228
<DisplayName>QueryServers</DisplayName>
2230-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.11</Documentation>
2229+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.11</Documentation>
22312230
<References>
22322231
<Reference ReferenceType="HasProperty">ns=1;i=24</Reference>
22332232
<Reference ReferenceType="HasProperty">ns=1;i=25</Reference>
@@ -2386,15 +2385,15 @@
23862385
<UAObjectType NodeId="ns=1;i=26" BrowseName="1:ApplicationRegistrationChangedAuditEventType" IsAbstract="true">
23872386
<DisplayName>ApplicationRegistrationChangedAuditEventType</DisplayName>
23882387
<Category>GDS Application Directory</Category>
2389-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.12</Documentation>
2388+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.12</Documentation>
23902389
<References>
23912390
<Reference ReferenceType="HasSubtype" IsForward="false">i=2127</Reference>
23922391
</References>
23932392
</UAObjectType>
23942393
<UAObjectType NodeId="ns=1;i=63" BrowseName="1:CertificateDirectoryType">
23952394
<DisplayName>CertificateDirectoryType</DisplayName>
2396-
<Category>GDS Certificate Manager Pull Model</Category>
2397-
<Documentation>https://reference.opcfoundation.org/GDS/docs/7.9.2</Documentation>
2395+
<Category>GDS Certificate Manager CheckRevocationStatus</Category>
2396+
<Documentation>https://reference.opcfoundation.org/GDS/docs/7.9.11</Documentation>
23982397
<References>
23992398
<Reference ReferenceType="Organizes">ns=1;i=511</Reference>
24002399
<Reference ReferenceType="HasComponent">ns=1;i=79</Reference>
@@ -2413,6 +2412,7 @@
24132412
<DisplayName>CertificateGroups</DisplayName>
24142413
<References>
24152414
<Reference ReferenceType="HasComponent">ns=1;i=512</Reference>
2415+
<Reference ReferenceType="Organizes">i=13916</Reference>
24162416
<Reference ReferenceType="HasTypeDefinition">i=13813</Reference>
24172417
<Reference ReferenceType="HasModellingRule">i=78</Reference>
24182418
<Reference ReferenceType="Organizes" IsForward="false">ns=1;i=63</Reference>
@@ -3443,6 +3443,7 @@
34433443
</UAVariable>
34443444
<UAMethod NodeId="ns=1;i=15003" BrowseName="1:RevokeCertificate" ParentNodeId="ns=1;i=63">
34453445
<DisplayName>RevokeCertificate</DisplayName>
3446+
<Category>GDS Certificate Manager RevokeCertificate</Category>
34463447
<Documentation>https://reference.opcfoundation.org/GDS/docs/7.9.6</Documentation>
34473448
<References>
34483449
<Reference ReferenceType="HasProperty">ns=1;i=15004</Reference>
@@ -3560,6 +3561,7 @@
35603561
</UAVariable>
35613562
<UAMethod NodeId="ns=1;i=89" BrowseName="1:GetCertificates" ParentNodeId="ns=1;i=63">
35623563
<DisplayName>GetCertificates</DisplayName>
3564+
<Category>GDS Certificate Manager GetCertificates</Category>
35633565
<Documentation>https://reference.opcfoundation.org/GDS/docs/7.9.8</Documentation>
35643566
<References>
35653567
<Reference ReferenceType="HasProperty">ns=1;i=90</Reference>
@@ -3831,6 +3833,7 @@
38313833
</UAVariable>
38323834
<UAMethod NodeId="ns=1;i=126" BrowseName="1:CheckRevocationStatus" ParentNodeId="ns=1;i=63">
38333835
<DisplayName>CheckRevocationStatus</DisplayName>
3836+
<Category>GDS Certificate Manager CheckRevocationStatus</Category>
38343837
<Documentation>https://reference.opcfoundation.org/GDS/docs/7.9.11</Documentation>
38353838
<References>
38363839
<Reference ReferenceType="HasProperty">ns=1;i=160</Reference>
@@ -3962,7 +3965,7 @@
39623965
</UAVariable>
39633966
<UAObjectType NodeId="ns=1;i=55" BrowseName="1:KeyCredentialManagementFolderType">
39643967
<DisplayName>KeyCredentialManagementFolderType</DisplayName>
3965-
<Category>GDS Key Credential Service Pull Model</Category>
3968+
<Category>Pull Model for KeyCredential Service</Category>
39663969
<Documentation>https://reference.opcfoundation.org/GDS/docs/8.5.2</Documentation>
39673970
<References>
39683971
<Reference ReferenceType="HasComponent">ns=1;i=61</Reference>
@@ -4250,7 +4253,7 @@
42504253
</UAVariable>
42514254
<UAObject NodeId="ns=1;i=1008" BrowseName="1:KeyCredentialManagement">
42524255
<DisplayName>KeyCredentialManagement</DisplayName>
4253-
<Category>GDS Key Credential Service Pull Model</Category>
4256+
<Category>Pull Model for KeyCredential Service</Category>
42544257
<Documentation>https://reference.opcfoundation.org/GDS/docs/8.5.3</Documentation>
42554258
<References>
42564259
<Reference ReferenceType="Organizes" IsForward="false">i=85</Reference>
@@ -4259,8 +4262,7 @@
42594262
</UAObject>
42604263
<UAObjectType NodeId="ns=1;i=1020" BrowseName="1:KeyCredentialServiceType">
42614264
<DisplayName>KeyCredentialServiceType</DisplayName>
4262-
<Category>GDS Key Credential Service Pull Model</Category>
4263-
<Documentation>https://reference.opcfoundation.org/GDS/docs/8.5.4</Documentation>
4265+
<Documentation>https://reference.opcfoundation.org/GDS/docs/8.5.7</Documentation>
42644266
<References>
42654267
<Reference ReferenceType="HasProperty">ns=1;i=1021</Reference>
42664268
<Reference ReferenceType="HasProperty">ns=1;i=1022</Reference>
@@ -4585,23 +4587,23 @@
45854587
</UAVariable>
45864588
<UAObjectType NodeId="ns=1;i=1039" BrowseName="1:KeyCredentialRequestedAuditEventType">
45874589
<DisplayName>KeyCredentialRequestedAuditEventType</DisplayName>
4588-
<Category>GDS Key Credential Service Pull Model</Category>
4590+
<Category>Pull Model for KeyCredential Service</Category>
45894591
<Documentation>https://reference.opcfoundation.org/GDS/docs/8.5.9</Documentation>
45904592
<References>
45914593
<Reference ReferenceType="HasSubtype" IsForward="false">i=18011</Reference>
45924594
</References>
45934595
</UAObjectType>
45944596
<UAObjectType NodeId="ns=1;i=1057" BrowseName="1:KeyCredentialDeliveredAuditEventType">
45954597
<DisplayName>KeyCredentialDeliveredAuditEventType</DisplayName>
4596-
<Category>GDS Key Credential Service Pull Model</Category>
4598+
<Category>Pull Model for KeyCredential Service</Category>
45974599
<Documentation>https://reference.opcfoundation.org/GDS/docs/8.5.10</Documentation>
45984600
<References>
45994601
<Reference ReferenceType="HasSubtype" IsForward="false">i=18011</Reference>
46004602
</References>
46014603
</UAObjectType>
46024604
<UAObjectType NodeId="ns=1;i=1075" BrowseName="1:KeyCredentialRevokedAuditEventType">
46034605
<DisplayName>KeyCredentialRevokedAuditEventType</DisplayName>
4604-
<Category>GDS Key Credential Service Pull Model</Category>
4606+
<Category>Pull Model for KeyCredential Service</Category>
46054607
<Documentation>https://reference.opcfoundation.org/GDS/docs/8.5.11</Documentation>
46064608
<References>
46074609
<Reference ReferenceType="HasSubtype" IsForward="false">i=18011</Reference>
@@ -4722,8 +4724,7 @@
47224724
</UAObject>
47234725
<UAObjectType NodeId="ns=1;i=966" BrowseName="1:AuthorizationServiceType">
47244726
<DisplayName>AuthorizationServiceType</DisplayName>
4725-
<Category>GDS Authorization Service Server</Category>
4726-
<Documentation>https://reference.opcfoundation.org/GDS/docs/9.6.4</Documentation>
4727+
<Documentation>https://reference.opcfoundation.org/GDS/docs/9.6.6</Documentation>
47274728
<References>
47284729
<Reference ReferenceType="HasProperty">ns=1;i=1003</Reference>
47294730
<Reference ReferenceType="HasProperty">ns=1;i=968</Reference>
@@ -4915,7 +4916,7 @@
49154916
<UAObject NodeId="ns=1;i=141" BrowseName="1:Directory">
49164917
<DisplayName>Directory</DisplayName>
49174918
<Category>GDS Application Directory</Category>
4918-
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.6.2</Documentation>
4919+
<Documentation>https://reference.opcfoundation.org/GDS/docs/6.5.2</Documentation>
49194920
<References>
49204921
<Reference ReferenceType="HasComponent">ns=1;i=142</Reference>
49214922
<Reference ReferenceType="HasComponent">ns=1;i=143</Reference>

0 commit comments

Comments
 (0)