Fixed (S)Byte string_to_val

Author: bitkeeper

opcua/common/ua_utils.py

@@ -78,15 +78,15 @@ def string_to_val(string, vtype):
             val = True
         else:
             val = False
-    elif vtype in (ua.VariantType.Int16, ua.VariantType.Int32, ua.VariantType.Int64):
+    elif vtype in (ua.VariantType.SByte, ua.VariantType.Int16, ua.VariantType.Int32, ua.VariantType.Int64):
         val = int(string)
-    elif vtype in (ua.VariantType.UInt16, ua.VariantType.UInt32, ua.VariantType.UInt64):
+    elif vtype in (ua.VariantType.Byte, ua.VariantType.UInt16, ua.VariantType.UInt32, ua.VariantType.UInt64):
         val = int(string)
     elif vtype in (ua.VariantType.Float, ua.VariantType.Double):
         val = float(string)
     elif vtype in (ua.VariantType.String, ua.VariantType.XmlElement):
         val = string
-    elif vtype in (ua.VariantType.Byte, ua.VariantType.SByte, ua.VariantType.ByteString):
+    elif vtype == ua.VariantType.ByteString:
         val = string.encode("utf-8")
     elif vtype in (ua.VariantType.NodeId, ua.VariantType.ExpandedNodeId):
         val = ua.NodeId.from_string(string)

tests/tests_xml.py

@@ -380,3 +380,17 @@ def _test_xml_var_type(self, node, typename, test_equality=True):
         self.assertEqual(dim, node2.get_array_dimensions())
         self.assertEqual(nclass, node2.get_node_class())
         return node2
+
+    def test_xml_byte(self):
+        o = self.opc.nodes.objects.add_variable(2, "byte", 255, ua.VariantType.Byte)
+        dtype = o.get_data_type()
+        dv = o.get_data_value()
+
+        self.opc.export_xml([o], "export-byte.xml")
+        self.opc.delete_nodes([o])
+        new_nodes = self.opc.import_xml("export-byte.xml")
+        o2 = self.opc.get_node(new_nodes[0])
+
+        self.assertEqual(o, o2)
+        self.assertEqual(dtype, o2.get_data_type())
+        self.assertEqual(dv.Value, o2.get_data_value().Value)