#2119 Support for the OPC UA protocol using the PLC4X library:

- Added error if server not found; - Corrected String connection for type SecurityPolicy.NONE; - Default value negotiationTimeout is 6000 ms - Corrected translation for timeouts added unit [ms];
SCADA-LTS · Dec 6, 2024 · c8d2585 · c8d2585
1 parent ee1d591
commit c8d2585
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 60 deletions.
diff --git a/src/br/org/scadabr/vo/dataSource/opcua/OpcUaDataSourceVO.java b/src/br/org/scadabr/vo/dataSource/opcua/OpcUaDataSourceVO.java
@@ -231,7 +231,7 @@ public Type getType() {
 
      */
 	@JsonRemoteProperty
-	private long negotiationTimeout = 60000;
+	private long negotiationTimeout = 6000;
 
 	/*
     @ConfigurationParameter("request-timeout")
@@ -569,7 +569,7 @@ public String getConnectionString() {
 		/// Sec
 
 		if (getSecurityPolicy() != null) {
-			query += MessageFormat.format("&security-policy={0}", getSecurityPolicy().getDescription());
+			query += MessageFormat.format("&security-policy={0}", getSecurityPolicy().getCode());
 
 			if(getSecurityPolicy() != OpcUaSecurityPolicyType.NONE) {
 

diff --git a/src/br/org/scadabr/vo/dataSource/opcua/OpcUaPointLocatorVO.java b/src/br/org/scadabr/vo/dataSource/opcua/OpcUaPointLocatorVO.java
@@ -226,9 +226,9 @@ public void setAttributes(String attributes) {
 
 	public String getNodeId() {
 		if (!StringUtils.isEmpty(getAttributes())) {
-			return MessageFormat.format("ns={0};{1}={2};{3};{4}", getNamespaceIndex(), getIdentifierType().getCode(), getIdentifier(), getAttributes(), getDataType());
+			return MessageFormat.format("ns={0};{1}={2};{3};{4}", getNamespaceIndex(), getIdentifierType().getCode(), getIdentifier(), getAttributes(), getDataType().getCode());
 		}
-		return MessageFormat.format("ns={0};{1}={2};{3}", getNamespaceIndex(), getIdentifierType().getCode(), getIdentifier(), getDataType());
+		return MessageFormat.format("ns={0};{1}={2};{3}", getNamespaceIndex(), getIdentifierType().getCode(), getIdentifier(), getDataType().getCode());
 	}
 
 	public OpcUaPointLocatorVO copy() {

diff --git a/src/br/org/scadabr/vo/dataSource/opcua/OpcUaSecurityPolicyType.java b/src/br/org/scadabr/vo/dataSource/opcua/OpcUaSecurityPolicyType.java
@@ -18,7 +18,7 @@ public enum OpcUaSecurityPolicyType {
     }
 
     public String getCode() {
-        return this.name();
+        return this == NONE ? this.name() : this.description;
     }
 
     public String getDescription() {

diff --git a/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java b/src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java
@@ -2446,6 +2446,7 @@ public LinkedHashSet<String> searchServerOpcUa(OpcUaDataSourceVO<?> dataSourceVO
             opcUaMaster.terminate();
         } catch (Exception e) {
             LOG.error(e.getMessage(), e);
+            serverList.add("Error: " + e.getMessage());
         }
         return serverList;
     }

diff --git a/webapp-resources/messages_de.properties b/webapp-resources/messages_de.properties
@@ -3402,11 +3402,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_en.properties b/webapp-resources/messages_en.properties
@@ -3405,11 +3405,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_es.properties b/webapp-resources/messages_es.properties
@@ -3445,11 +3445,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_fi.properties b/webapp-resources/messages_fi.properties
@@ -3530,11 +3530,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_fr.properties b/webapp-resources/messages_fr.properties
@@ -3399,11 +3399,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_lu.properties b/webapp-resources/messages_lu.properties
@@ -3418,11 +3418,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_nl.properties b/webapp-resources/messages_nl.properties
@@ -3520,11 +3520,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_pl.properties b/webapp-resources/messages_pl.properties
@@ -3542,11 +3542,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_pt.properties b/webapp-resources/messages_pt.properties
@@ -3557,11 +3557,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_ru.properties b/webapp-resources/messages_ru.properties
@@ -3553,11 +3553,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size

diff --git a/webapp-resources/messages_zh.properties b/webapp-resources/messages_zh.properties
@@ -3505,11 +3505,11 @@ dsEdit.opcua.keyStorePassword=Key Store Password
 dsEdit.opcua.trustStoreType=Trust Store Type
 dsEdit.opcua.trustStoreFile=Trust Store File
 dsEdit.opcua.trustStorePassword=Trust Store Password
-dsEdit.opcua.channelLifetime=Channel Lifetime
-dsEdit.opcua.sessionTimeout=Session Timeout
-dsEdit.opcua.negotiationTimeout=Negotiation Timeout
-dsEdit.opcua.requestTimeout=Request Timeout
-dsEdit.opcua.defaultTimeout=Default Timeout [TCP]
+dsEdit.opcua.channelLifetime=Channel Lifetime [ms]
+dsEdit.opcua.sessionTimeout=Session Timeout [ms]
+dsEdit.opcua.negotiationTimeout=Negotiation Timeout [ms]
+dsEdit.opcua.requestTimeout=Request Timeout [ms]
+dsEdit.opcua.defaultTimeout=Default Timeout [ms][TCP]
 dsEdit.opcua.receiveBufferSize=Receiver Buffer Size
 dsEdit.opcua.sendBufferSize=Send Buffer Size
 dsEdit.opcua.maxMessageSize=Max Message Size