Commit faaccb2a authored by olivier R-D's avatar olivier R-D

update xml and generated code to 1.03 spec

parent 38ec4c16
This diff is collapsed.
......@@ -1543,7 +1543,7 @@ def create_standard_address_space_Part11(server):
attrs = ua.VariableAttributes()
attrs.DisplayName = ua.LocalizedText("NewValues")
attrs.DataType = ua.NodeId.from_string("i=920")
attrs.ValueRank = -1
attrs.ValueRank = 1
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
......@@ -1566,7 +1566,7 @@ def create_standard_address_space_Part11(server):
attrs = ua.VariableAttributes()
attrs.DisplayName = ua.LocalizedText("OldValues")
attrs.DataType = ua.NodeId.from_string("i=920")
attrs.ValueRank = -1
attrs.ValueRank = 1
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -362,6 +362,13 @@ def create_standard_address_space_Part9(server):
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=3875")
refs.append(ref)
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=47")
ref.SourceNodeId = ua.NodeId.from_string("i=2782")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=12912")
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
......@@ -972,6 +979,63 @@ def create_standard_address_space_Part9(server):
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=12912")
node.BrowseName = ua.QualifiedName.from_string("ConditionRefresh2")
node.NodeClass = ua.NodeClass.Method
node.ParentNodeId = ua.NodeId.from_string("i=2782")
node.ReferenceTypeId = ua.NodeId.from_string("i=47")
attrs = ua.MethodAttributes()
attrs.DisplayName = ua.LocalizedText("ConditionRefresh2")
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=46")
ref.SourceNodeId = ua.NodeId.from_string("i=12912")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=12913")
refs.append(ref)
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=3065")
ref.SourceNodeId = ua.NodeId.from_string("i=12912")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=2787")
refs.append(ref)
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=3065")
ref.SourceNodeId = ua.NodeId.from_string("i=12912")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=2788")
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=12913")
node.BrowseName = ua.QualifiedName.from_string("InputArguments")
node.NodeClass = ua.NodeClass.Variable
node.ParentNodeId = ua.NodeId.from_string("i=12912")
node.ReferenceTypeId = ua.NodeId.from_string("i=46")
node.TypeDefinition = ua.NodeId.from_string("i=68")
attrs = ua.VariableAttributes()
attrs.DisplayName = ua.LocalizedText("InputArguments")
attrs.DataType = ua.NodeId.from_string("i=296")
attrs.ValueRank = 1
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=37")
ref.SourceNodeId = ua.NodeId.from_string("i=12913")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=78")
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=2830")
node.BrowseName = ua.QualifiedName.from_string("DialogConditionType")
......@@ -4907,6 +4971,110 @@ def create_standard_address_space_Part9(server):
node.NodeAttributes = attrs
server.add_nodes([node])
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=13225")
node.BrowseName = ua.QualifiedName.from_string("CertificateExpirationAlarmType")
node.NodeClass = ua.NodeClass.ObjectType
node.ParentNodeId = ua.NodeId.from_string("i=11753")
node.ReferenceTypeId = ua.NodeId.from_string("i=45")
attrs = ua.ObjectTypeAttributes()
attrs.DisplayName = ua.LocalizedText("CertificateExpirationAlarmType")
attrs.IsAbstract = false
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=46")
ref.SourceNodeId = ua.NodeId.from_string("i=13225")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=13325")
refs.append(ref)
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=46")
ref.SourceNodeId = ua.NodeId.from_string("i=13225")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=13326")
refs.append(ref)
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=46")
ref.SourceNodeId = ua.NodeId.from_string("i=13225")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=13327")
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=13325")
node.BrowseName = ua.QualifiedName.from_string("ExpirationDate")
node.NodeClass = ua.NodeClass.Variable
node.ParentNodeId = ua.NodeId.from_string("i=13225")
node.ReferenceTypeId = ua.NodeId.from_string("i=46")
node.TypeDefinition = ua.NodeId.from_string("i=68")
attrs = ua.VariableAttributes()
attrs.DisplayName = ua.LocalizedText("ExpirationDate")
attrs.DataType = ua.NodeId(ua.ObjectIds.DateTime)
attrs.ValueRank = -1
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=37")
ref.SourceNodeId = ua.NodeId.from_string("i=13325")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=78")
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=13326")
node.BrowseName = ua.QualifiedName.from_string("CertificateType")
node.NodeClass = ua.NodeClass.Variable
node.ParentNodeId = ua.NodeId.from_string("i=13225")
node.ReferenceTypeId = ua.NodeId.from_string("i=46")
node.TypeDefinition = ua.NodeId.from_string("i=68")
attrs = ua.VariableAttributes()
attrs.DisplayName = ua.LocalizedText("CertificateType")
attrs.DataType = ua.NodeId(ua.ObjectIds.NodeId)
attrs.ValueRank = -1
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=37")
ref.SourceNodeId = ua.NodeId.from_string("i=13326")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=78")
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=13327")
node.BrowseName = ua.QualifiedName.from_string("Certificate")
node.NodeClass = ua.NodeClass.Variable
node.ParentNodeId = ua.NodeId.from_string("i=13225")
node.ReferenceTypeId = ua.NodeId.from_string("i=46")
node.TypeDefinition = ua.NodeId.from_string("i=68")
attrs = ua.VariableAttributes()
attrs.DisplayName = ua.LocalizedText("Certificate")
attrs.DataType = ua.NodeId(ua.ObjectIds.ByteString)
attrs.ValueRank = -1
node.NodeAttributes = attrs
server.add_nodes([node])
refs = []
ref = ua.AddReferencesItem()
ref.IsForward = true
ref.ReferenceTypeId = ua.NodeId.from_string("i=37")
ref.SourceNodeId = ua.NodeId.from_string("i=13327")
ref.TargetNodeClass = ua.NodeClass.DataType
ref.TargetNodeId = ua.NodeId.from_string("i=78")
refs.append(ref)
server.add_references(refs)
node = ua.AddNodesItem()
node.RequestedNewNodeId = ua.NodeId.from_string("i=10751")
node.BrowseName = ua.QualifiedName.from_string("TripAlarmType")
......
......@@ -38,6 +38,7 @@ class StatusCodes:
BadCertificateIssuerRevocationUnknown = 0x801C0000
BadCertificateRevoked = 0x801D0000
BadCertificateIssuerRevoked = 0x801E0000
BadCertificateChainIncomplete = 0x810D0000
BadUserAccessDenied = 0x801F0000
BadIdentityTokenInvalid = 0x80200000
BadIdentityTokenRejected = 0x80210000
......@@ -51,6 +52,7 @@ class StatusCodes:
BadRequestHeaderInvalid = 0x802A0000
BadTimestampsToReturnInvalid = 0x802B0000
BadRequestCancelledByClient = 0x802C0000
BadTooManyArguments = 0x80E50000
GoodSubscriptionTransferred = 0x002D0000
GoodCompletesAsynchronously = 0x002E0000
GoodOverload = 0x002F0000
......@@ -132,6 +134,7 @@ class StatusCodes:
BadQueryTooComplex = 0x806E0000
BadNoMatch = 0x806F0000
BadMaxAgeInvalid = 0x80700000
BadSecurityModeInsufficient = 0x80E60000
BadHistoryOperationInvalid = 0x80710000
BadHistoryOperationUnsupported = 0x80720000
BadInvalidTimestampArgument = 0x80BD0000
......@@ -204,6 +207,14 @@ class StatusCodes:
BadAggregateInvalidInputs = 0x80D60000
BadAggregateConfigurationRejected = 0x80DA0000
GoodDataIgnored = 0x00D90000
BadRequestNotAllowed = 0x80E40000
GoodEdited = 0x00DC0000
GoodPostActionFailed = 0x00DD0000
UncertainDominantValueChanged = 0x40DE0000
GoodDependentValueChanged = 0x00E00000
BadDominantValueChanged = 0x80E10000
UncertainDependentValueChanged = 0x40E20000
BadDependentValueChanged = 0x80E30000
GoodCommunicationEvent = 0x00A70000
GoodShutdownEvent = 0x00A80000
GoodCallAgain = 0x00A90000
......@@ -293,9 +304,11 @@ def get_name_and_doc(val):
elif val == 0x801C0000:
return 'BadCertificateIssuerRevocationUnknown', 'It was not possible to determine if the Issuer Certificate has been revoked.'
elif val == 0x801D0000:
return 'BadCertificateRevoked', 'The Certificate has been revoked.'
return 'BadCertificateRevoked', 'The certificate has been revoked.'
elif val == 0x801E0000:
return 'BadCertificateIssuerRevoked', 'The Issuer Certificate has been revoked.'
return 'BadCertificateIssuerRevoked', 'The issuer certificate has been revoked.'
elif val == 0x810D0000:
return 'BadCertificateChainIncomplete', 'The certificate chain is incomplete.'
elif val == 0x801F0000:
return 'BadUserAccessDenied', 'User does not have permission to perform the requested operation.'
elif val == 0x80200000:
......@@ -322,6 +335,8 @@ def get_name_and_doc(val):
return 'BadTimestampsToReturnInvalid', 'The timestamps to return parameter is invalid.'
elif val == 0x802C0000:
return 'BadRequestCancelledByClient', 'The request was cancelled by the client.'
elif val == 0x80E50000:
return 'BadTooManyArguments', 'Too many arguments were provided.'
elif val == 0x002D0000:
return 'GoodSubscriptionTransferred', 'The subscription was transferred to another session.'
elif val == 0x002E0000:
......@@ -484,6 +499,8 @@ def get_name_and_doc(val):
return 'BadNoMatch', 'The requested operation has no match to return.'
elif val == 0x80700000:
return 'BadMaxAgeInvalid', 'The max age parameter is invalid.'
elif val == 0x80E60000:
return 'BadSecurityModeInsufficient', 'The operation is not permitted over the current secure channel.'
elif val == 0x80710000:
return 'BadHistoryOperationInvalid', 'The history details parameter is not valid.'
elif val == 0x80720000:
......@@ -628,6 +645,22 @@ def get_name_and_doc(val):
return 'BadAggregateConfigurationRejected', 'The aggregate configuration is not valid for specified node.'
elif val == 0x00D90000:
return 'GoodDataIgnored', 'The request pecifies fields which are not valid for the EventType or cannot be saved by the historian.'
elif val == 0x80E40000:
return 'BadRequestNotAllowed', 'The request was rejected by the server because it did not meet the criteria set by the server.'
elif val == 0x00DC0000:
return 'GoodEdited', 'The value does not come from the real source and has been edited by the server.'
elif val == 0x00DD0000:
return 'GoodPostActionFailed', 'There was an error in execution of these post-actions.'
elif val == 0x40DE0000:
return 'UncertainDominantValueChanged', 'The related EngineeringUnit has been changed but the Variable Value is still provided based on the previous unit.'
elif val == 0x00E00000:
return 'GoodDependentValueChanged', 'A dependent value has been changed but the change has not been applied to the device.'
elif val == 0x80E10000:
return 'BadDominantValueChanged', 'The related EngineeringUnit has been changed but this change has not been applied to the device. The Variable Value is still dependent on the previous unit but its status is currently Bad.'
elif val == 0x40E20000:
return 'UncertainDependentValueChanged', 'A dependent value has been changed but the change has not been applied to the device. The quality of the dominant variable is uncertain.'
elif val == 0x80E30000:
return 'BadDependentValueChanged', 'A dependent value has been changed but the change has not been applied to the device. The quality of the dominant variable is Bad.'
elif val == 0x00A70000:
return 'GoodCommunicationEvent', 'The communication layer has raised an event.'
elif val == 0x00A80000:
......
This diff is collapsed.
This diff is collapsed.
......@@ -10,7 +10,7 @@
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
xmlns:wsa10="http://www.w3.org/2005/08/addressing"
>
<!-- This File was generated on 2013-03-06 and supports the specifications supported by the UA SDK v1.1.334.4. -->
<!-- This File was generated on 2015-08-18 and supports the specifications supported by the UA SDK v1.1.335.1. -->
<wsdl:import namespace="http://opcfoundation.org/UA/2008/02/Services.wsdl" location="http://opcfoundation.org/UA/2008/02/Services.wsdl" />
<wsdl:types />
......@@ -478,6 +478,19 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="FindServersOnNetwork">
<soap12:operation soapAction="http://opcfoundation.org/UA/2008/02/Services.wsdl/FindServersOnNetwork" style="document"/>
<wsdl:input name="FindServersOnNetworkMessage">
<soap12:body use="literal"/>
</wsdl:input>
<wsdl:output name="FindServersOnNetworkResponseMessage">
<soap12:body use="literal"/>
</wsdl:output>
<wsdl:fault name="FindServersOnNetworkFaultMessage">
<soap12:fault name="FindServersOnNetworkFaultMessage" use="literal" />
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="GetEndpoints">
<soap12:operation soapAction="http://opcfoundation.org/UA/2008/02/Services.wsdl/GetEndpoints" style="document"/>
<wsdl:input name="GetEndpointsMessage">
......@@ -522,6 +535,19 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="RegisterServer2">
<soap12:operation soapAction="http://opcfoundation.org/UA/2008/02/Services.wsdl/RegisterServer2" style="document"/>
<wsdl:input name="RegisterServer2Message">
<soap12:body use="literal"/>
</wsdl:input>
<wsdl:output name="RegisterServer2ResponseMessage">
<soap12:body use="literal"/>
</wsdl:output>
<wsdl:fault name="RegisterServer2FaultMessage">
<soap12:fault name="RegisterServer2FaultMessage" use="literal" />
</wsdl:fault>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="UAService">
......
<?xml version="1.0" encoding="utf-8"?>
<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.02" LastModified="2013-03-06T05:36:43.5442348Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2015-08-18T00:23:00Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<Models>
<Model ModelUri="http://opcfoundation.org/UA/" Version="1.02" PublicationDate="2015-08-17T17:23:51.7072359-07:00" />
</Models>
<Aliases>
<Alias Alias="Boolean">i=1</Alias>
<Alias Alias="SByte">i=2</Alias>
......
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.02" LastModified="2013-03-06T05:36:43.547235Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2015-08-18T00:23:00Z" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<Models>
<Model ModelUri="http://opcfoundation.org/UA/" Version="1.02" PublicationDate="2015-08-17T17:23:51.7281508-07:00" />
</Models>
<Aliases>
<Alias Alias="Boolean">i=1</Alias>
<Alias Alias="SByte">i=2</Alias>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,7 +8,7 @@ def status_codes():
name, val, doc = line.split(",", maxsplit=2)
additional[int(val, 0)] = (name, val, doc)
inputfile = open("StatusCode.csv")
inputfile = open("StatusCodes.csv")
result = []
for line in inputfile:
name, val, doc = line.split(",", maxsplit=2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment