add StatusCode values

Author: ttulka

examples/prosys/opc30200/src/main/java/com/connectedcooking/opcua/dynamicnodemanager/examples/prosys/opc30200/ProsysOpc30200Server.java

@@ -2,6 +2,7 @@
 
 import com.connectedcooking.opcua.dynamicnodemanager.adaptor.prosys.ProsysDynNodeManagerAdaptor;
 import com.connectedcooking.opcua.dynamicnodemanager.core.DynNodeManager;
+import com.connectedcooking.opcua.dynamicnodemanager.core.DynResponse;
 import com.connectedcooking.opcua.dynamicnodemanager.core.RealNodeId;
 import com.connectedcooking.opcua.dynamicnodemanager.core.datatype.DynLocalizedText;
 import com.connectedcooking.opcua.dynamicnodemanager.examples.prosys.opc30200.model.cke.server.CommercialKitchenEquipmentServerInformationModel;
@@ -194,6 +195,12 @@ private void initialize() throws Exception {
                         errorId -> new RealNodeId(errorConditions.realNodeId(deviceId), "Error_" + errorId)).collect(toList()))
                 .registerAndGet();
 
+        dynNodeManager.nodeBuilder()
+                .childVariable("Quality")
+                .asComponent(error)
+                .value(DynResponse.StatusCodes.Uncertain)
+                .register();
+
         dynNodeManager.nodeBuilder()
                 .childVariable("ActiveState")
                 .asComponent(error)

examples/prosys/opc30200/src/test/java/com/connectedcooking/opcua/dynamicnodemanager/examples/prosys/opc30200/ProsysOpc30200ServerITTest.java

@@ -721,6 +721,7 @@ void ErrorConditions_Error_references() throws Exception {
         assertThat(containsReference(ReferenceTypeIds.HasComponent, new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/ActiveState"), new NodeId(0, 63), references)).isTrue();
         assertThat(containsReference(ReferenceTypeIds.HasProperty, new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/InputNode"), new NodeId(0, 68), references)).isTrue();
         assertThat(containsReference(ReferenceTypeIds.HasProperty, new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/SuppressedOrShelved"), new NodeId(0, 68), references)).isTrue();
+        assertThat(containsReference(ReferenceTypeIds.HasComponent, new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/Quality"), new NodeId(0, 63), references)).isTrue();
     }
 
     @Test
@@ -742,6 +743,43 @@ void ErrorConditions_Error_attributes() throws Exception {
         );
     }
 
+    @Test
+    void ErrorConditions_Error_Quality_TypeDefinition() throws Exception {
+        var typeDefinition = client.getAddressSpace().getTypeDefinition(new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/Quality"));
+
+        assertThat(typeDefinition).isEqualTo(new ExpandedNodeId(new NodeId(0, 63)));
+    }
+
+    @Test
+    void ErrorConditions_Error_Quality_references() throws Exception {
+        var references = client.getAddressSpace().browse(new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/Quality"));
+
+        assertThat(references).isEmpty();
+    }
+
+    @Test
+    void ErrorConditions_Error_Quality_attributes() throws Exception {
+        var browseId = new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/Quality");
+
+        var nodeId = client.readAttribute(browseId, Attributes.NodeId);
+        var nodeClass = client.readAttribute(browseId, Attributes.NodeClass);
+        var browseName = client.readAttribute(browseId, Attributes.BrowseName);
+        var displayName = client.readAttribute(browseId, Attributes.DisplayName);
+        var description = client.readAttribute(browseId, Attributes.Description);
+        var dataType = client.readAttribute(browseId, Attributes.DataType);
+        var value = client.readAttribute(browseId, Attributes.Value);
+
+        assertAll(
+                () -> assertThat(nodeId.getValue().getValue()).isEqualTo(browseId),
+                () -> assertThat(nodeClass.getValue().getValue()).isEqualTo(NodeClass.Variable.getValue()),
+                () -> assertThat(((QualifiedName) browseName.getValue().getValue()).getName()).isEqualTo("Quality"),
+                () -> assertThat(((LocalizedText) displayName.getValue().getValue()).getText()).isEqualTo("Quality"),
+                () -> assertThat(((LocalizedText) description.getValue().getValue()).getText()).isEqualTo(""),
+                () -> assertThat(dataType.getValue().getValue()).isEqualTo(DataTypeIdentifiers.StatusCode),
+                () -> assertThat(value.getValue().getValue()).isEqualTo(StatusCodes.Uncertain)
+        );
+    }
+
     @Test
     void ErrorConditions_Error_ActiveState_TypeDefinition() throws Exception {
         var typeDefinition = client.getAddressSpace().getTypeDefinition(new NodeId(NS, "CombiSteamerDevice_1/ErrorConditions/Error_801/ActiveState"));

src/main/java/com/connectedcooking/opcua/dynamicnodemanager/adaptor/prosys/ProsysDynNodeManagerAdaptor.java

@@ -662,6 +662,9 @@ private Object convertValueToStandard(Object value) {
             if (value instanceof RealNodeId) {
                 return TypeUtils.toNodeId((RealNodeId) value, namespaceIndex);
             }
+            if (value instanceof DynResponse.StatusCodes) {
+                return TypeUtils.toStatusCode((DynResponse.StatusCodes) value);
+            }
             return value;
         }
     }

src/main/java/com/connectedcooking/opcua/dynamicnodemanager/adaptor/prosys/TypeUtils.java

@@ -281,6 +281,8 @@ static UnsignedInteger toStatusCode(DynResponse.StatusCodes status) {
                 return StatusCodes.Bad_NotSupported;
             case Bad_NotImplemented:
                 return StatusCodes.Bad_NotImplemented;
+            case Uncertain:
+                return StatusCodes.Uncertain;
         }
         return StatusCodes.Bad;
     }
@@ -352,6 +354,8 @@ static RealNodeId guessValueDataType(Object value) {
             return BasicValueDataTypes.NodeId;
         } else if (value instanceof ExpandedNodeId) {
             return BasicValueDataTypes.ExpandedNodeId;
+        } else if (value instanceof DynResponse.StatusCodes) {
+            return BasicValueDataTypes.StatusCode;
         }
         return null;
     }

src/main/java/com/connectedcooking/opcua/dynamicnodemanager/core/DynResponse.java

@@ -22,7 +22,8 @@ public enum StatusCodes {
         Bad_AttributeIdInvalid,
         Bad_NotFound,
         Bad_NotSupported,
-        Bad_NotImplemented;
+        Bad_NotImplemented,
+        Uncertain;
 
         /**
          * Indicates whether the response is successful.