Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 0fd309d

Browse files
br-iosbbr-iosb
committed
update I4AAS CS V3 Draft
1 parent 4372c90 commit 0fd309d

4 files changed

Lines changed: 11 additions & 38 deletions

File tree

dataformat-uanodeset/nodeset/i4aas/Opc.Ua.I4AAS_V3Draft.NodeIds.csv renamed to dataformat-uanodeset/nodeset/i4aas/Opc.Ua.I4AAS_V3Draft.NodeSet2.csv

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ Server_Namespaces_http___opcfoundation_org_UA_I4AAS_,5023,Object
7373
AASIrdiConceptDescriptionType_DataSpecification,5024,Object
7474
AASIriConceptDescriptionType_DataSpecification,5025,Object
7575
AASDataSpecificationIEC61360Type_Identification,5026,Object
76-
AASDataSpecificationIEC61360Type_Administration,5027,Object
7776
AASDataSpecificationIEC61360Type_UnitId,5028,Object
7877
AASDataSpecificationIEC61360Type_ValueList,5029,Object
7978
AASDataSpecificationIEC61360Type_ValueId,5030,Object
@@ -722,7 +721,6 @@ Server_Namespaces_http___opcfoundation_org_UA_I4AAS__NamespacePublicationDate,60
722721
Server_Namespaces_http___opcfoundation_org_UA_I4AAS__NamespaceUri,6062,Variable
723722
AASDataSpecificationIEC61360Type_DefaultInstanceBrowseName,6063,Variable
724723
AASReferableType_Category,6064,Variable
725-
AASDataSpecificationIEC61360Type_Category,6065,Variable
726724
AASDataSpecificationIEC61360Type_ShortName,6066,Variable
727725
AASDataSpecificationIEC61360Type_SourceOfDefinition,6067,Variable
728726
AASDataSpecificationIEC61360Type_Symbol,6068,Variable

‎dataformat-uanodeset/nodeset/i4aas/Opc.Ua.I4AAS_V3Draft.NodeSet2.xml‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@
3737
<Alias Alias="AASValueTypeDataType">ns=1;i=3004</Alias>
3838
<Alias Alias="AASPathDataType">ns=1;i=3005</Alias>
3939
<Alias Alias="AASEntityTypeDataType">ns=1;i=3006</Alias>
40-
<Alias Alias="AASCategoryDataType">ns=1;i=3007</Alias>
4140
<Alias Alias="AASDataTypeIEC61360DataType">ns=1;i=3008</Alias>
4241
<Alias Alias="AASLevelTypeDataType">ns=1;i=3009</Alias>
4342
<Alias Alias="AASIdentifierTypeDataType">ns=1;i=3010</Alias>
4443
<Alias Alias="AASKeyDataType">ns=1;i=3011</Alias>
4544
<Alias Alias="AASKeyElementsDataType">ns=1;i=3012</Alias>
45+
<Alias Alias="AASQualifierDataType">ns=1;i=3013</Alias>
4646
<Alias Alias="AASModelingKindDataType">ns=1;i=3015</Alias>
4747
<Alias Alias="AASMimeDataType">ns=1;i=3016</Alias>
4848
</Aliases>
4949
<Extensions>
5050
<Extension>
51-
<ua:ModelInfo Tool="UaModeler" Hash="5YBqhajXggXXUJ5PAV/6DA==" Version="1.6.4"/>
51+
<ua:ModelInfo Tool="UaModeler" Hash="0YniIjH4AVNmbb3mMi+TKQ==" Version="1.6.4"/>
5252
</Extension>
5353
</Extensions>
5454
<UADataType NodeId="ns=1;i=3003" BrowseName="1:AASAssetKindDataType">
@@ -1859,7 +1859,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
18591859
<Reference ReferenceType="HasProperty">ns=1;i=6469</Reference>
18601860
</References>
18611861
</UAObject>
1862-
<UAVariable DataType="String" ParentNodeId="ns=1;i=5391" NodeId="ns=1;i=6468" BrowseName="1:Type" AccessLevel="3">
1862+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=5391" NodeId="ns=1;i=6468" BrowseName="1:Type" AccessLevel="3">
18631863
<DisplayName>Type</DisplayName>
18641864
<References>
18651865
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -1970,8 +1970,6 @@ Note: In an object oriented view, an instance denotes an object of a template (c
19701970
<References>
19711971
<Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=1027</Reference>
19721972
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5136</Reference>
1973-
<Reference ReferenceType="HasComponent">ns=1;i=5027</Reference>
1974-
<Reference ReferenceType="HasProperty">ns=1;i=6065</Reference>
19751973
<Reference ReferenceType="HasProperty">ns=1;i=6072</Reference>
19761974
<Reference ReferenceType="HasProperty">ns=1;i=6063</Reference>
19771975
<Reference ReferenceType="HasProperty">ns=1;i=6073</Reference>
@@ -1989,27 +1987,6 @@ Note: In an object oriented view, an instance denotes an object of a template (c
19891987
<Reference ReferenceType="HasComponent">ns=1;i=5029</Reference>
19901988
</References>
19911989
</UAObjectType>
1992-
<UAObject ParentNodeId="ns=1;i=1028" NodeId="ns=1;i=5027" BrowseName="1:Administration">
1993-
<DisplayName>Administration</DisplayName>
1994-
<References>
1995-
<Reference ReferenceType="HasTypeDefinition">ns=1;i=1030</Reference>
1996-
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5132</Reference>
1997-
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1028</Reference>
1998-
<Reference ReferenceType="HasModellingRule">i=78</Reference>
1999-
</References>
2000-
</UAObject>
2001-
<UAVariable DataType="AASCategoryDataType" ParentNodeId="ns=1;i=1028" NodeId="ns=1;i=6065" BrowseName="1:Category" AccessLevel="3">
2002-
<DisplayName>Category</DisplayName>
2003-
<References>
2004-
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5133</Reference>
2005-
<Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=1028</Reference>
2006-
<Reference ReferenceType="HasModellingRule">i=80</Reference>
2007-
<Reference ReferenceType="HasTypeDefinition">i=68</Reference>
2008-
</References>
2009-
<Value>
2010-
<uax:Int32>0</uax:Int32>
2011-
</Value>
2012-
</UAVariable>
20131990
<UAVariable DataType="AASDataTypeIEC61360DataType" ParentNodeId="ns=1;i=1028" NodeId="ns=1;i=6072" BrowseName="1:DataType" AccessLevel="3">
20141991
<DisplayName>DataType</DisplayName>
20151992
<References>
@@ -2300,7 +2277,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
23002277
<Reference ReferenceType="HasProperty">ns=1;i=6015</Reference>
23012278
</References>
23022279
</UAObjectType>
2303-
<UAVariable DataType="String" ParentNodeId="ns=1;i=1032" NodeId="ns=1;i=6010" BrowseName="1:Type" AccessLevel="3">
2280+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=1032" NodeId="ns=1;i=6010" BrowseName="1:Type" AccessLevel="3">
23042281
<DisplayName>Type</DisplayName>
23052282
<References>
23062283
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -2434,9 +2411,9 @@ Note: In an object oriented view, an instance denotes an object of a template (c
24342411
<DisplayName>AssetInformation</DisplayName>
24352412
<References>
24362413
<Reference ReferenceType="HasTypeDefinition">ns=1;i=1031</Reference>
2414+
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1002</Reference>
24372415
<Reference ReferenceType="HasProperty">ns=1;i=6120</Reference>
24382416
<Reference ReferenceType="HasModellingRule">i=78</Reference>
2439-
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1002</Reference>
24402417
<Reference ReferenceType="HasComponent">ns=1;i=5389</Reference>
24412418
</References>
24422419
</UAObject>
@@ -2658,7 +2635,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
26582635
<Reference ReferenceType="HasProperty">ns=1;i=6459</Reference>
26592636
</References>
26602637
</UAObject>
2661-
<UAVariable DataType="String" ParentNodeId="ns=1;i=5386" NodeId="ns=1;i=6458" BrowseName="1:Type" AccessLevel="3">
2638+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=5386" NodeId="ns=1;i=6458" BrowseName="1:Type" AccessLevel="3">
26622639
<DisplayName>Type</DisplayName>
26632640
<References>
26642641
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -2740,7 +2717,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
27402717
<Reference ReferenceType="HasProperty">ns=1;i=6136</Reference>
27412718
</References>
27422719
</UAObject>
2743-
<UAVariable DataType="String" ParentNodeId="ns=1;i=5405" NodeId="ns=1;i=6081" BrowseName="1:Type" AccessLevel="3">
2720+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=5405" NodeId="ns=1;i=6081" BrowseName="1:Type" AccessLevel="3">
27442721
<DisplayName>Type</DisplayName>
27452722
<References>
27462723
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -2843,7 +2820,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
28432820
<Reference ReferenceType="HasProperty">ns=1;i=6135</Reference>
28442821
</References>
28452822
</UAObject>
2846-
<UAVariable DataType="String" ParentNodeId="ns=1;i=5385" NodeId="ns=1;i=6080" BrowseName="1:Type" AccessLevel="3">
2823+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=5385" NodeId="ns=1;i=6080" BrowseName="1:Type" AccessLevel="3">
28472824
<DisplayName>Type</DisplayName>
28482825
<References>
28492826
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -3863,7 +3840,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
38633840
<Reference ReferenceType="HasProperty">ns=1;i=6461</Reference>
38643841
</References>
38653842
</UAObject>
3866-
<UAVariable DataType="String" ParentNodeId="ns=1;i=5387" NodeId="ns=1;i=6460" BrowseName="1:Type" AccessLevel="3">
3843+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=5387" NodeId="ns=1;i=6460" BrowseName="1:Type" AccessLevel="3">
38673844
<DisplayName>Type</DisplayName>
38683845
<References>
38693846
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -3987,7 +3964,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
39873964
<Reference ReferenceType="HasProperty">ns=1;i=6467</Reference>
39883965
</References>
39893966
</UAObject>
3990-
<UAVariable DataType="String" ParentNodeId="ns=1;i=5390" NodeId="ns=1;i=6466" BrowseName="1:Type" AccessLevel="3">
3967+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=5390" NodeId="ns=1;i=6466" BrowseName="1:Type" AccessLevel="3">
39913968
<DisplayName>Type</DisplayName>
39923969
<References>
39933970
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -4849,7 +4826,7 @@ Note: In an object oriented view, an instance denotes an object of a template (c
48494826
<Reference ReferenceType="HasProperty">ns=1;i=6475</Reference>
48504827
</References>
48514828
</UAObject>
4852-
<UAVariable DataType="String" ParentNodeId="ns=1;i=5406" NodeId="ns=1;i=6474" BrowseName="1:Type" AccessLevel="3">
4829+
<UAVariable DataType="AASQualifierDataType" ParentNodeId="ns=1;i=5406" NodeId="ns=1;i=6474" BrowseName="1:Type" AccessLevel="3">
48534830
<DisplayName>Type</DisplayName>
48544831
<References>
48554832
<Reference ReferenceType="HasDictionaryEntry">ns=1;i=5100</Reference>
@@ -10968,7 +10945,6 @@ Note: In an object oriented view, an instance denotes an object of a template (c
1096810945
<DisplayName>Admin-shell.io/DataSpecification/administration</DisplayName>
1096910946
<References>
1097010947
<Reference ReferenceType="HasTypeDefinition">ns=1;i=1025</Reference>
10971-
<Reference ReferenceType="HasDictionaryEntry" IsForward="false">ns=1;i=5027</Reference>
1097210948
<Reference ReferenceType="Organizes" IsForward="false">i=17594</Reference>
1097310949
<Reference ReferenceType="HasComponent">ns=1;i=5323</Reference>
1097410950
<Reference ReferenceType="HasProperty">ns=1;i=6223</Reference>
@@ -11046,7 +11022,6 @@ Note: In an object oriented view, an instance denotes an object of a template (c
1104611022
<Reference ReferenceType="HasComponent">ns=1;i=5575</Reference>
1104711023
<Reference ReferenceType="HasComponent">ns=1;i=5326</Reference>
1104811024
<Reference ReferenceType="HasComponent">ns=1;i=5574</Reference>
11049-
<Reference ReferenceType="HasDictionaryEntry" IsForward="false">ns=1;i=6065</Reference>
1105011025
</References>
1105111026
</UAObject>
1105211027
<UAObject ParentNodeId="ns=1;i=5133" NodeId="ns=1;i=5325" BrowseName="1:Administration">

dataformat-uanodeset/nodeset/xsd/Opc.Ua.I4AAS_V3Draft.Types.bsd renamed to dataformat-uanodeset/nodeset/xsd/Opc.Ua.I4AAS_V3Draft.NodeSet2.bsd

File renamed without changes.

dataformat-uanodeset/nodeset/xsd/Opc.Ua.I4AAS_V3Draft.Types.xsd renamed to dataformat-uanodeset/nodeset/xsd/Opc.Ua.I4AAS_V3Draft.NodeSet2.xsd

File renamed without changes.

0 commit comments

Comments
 (0)