Bugfix/474 (#1081)

* work around issues in #474

* add test

* use cleaned name for class retrieval

Co-authored-by: Nick James <nick.james@dorabot.com>

Author: driftregion

opcua/common/structures.py

@@ -81,7 +81,7 @@ def __init__(self, name, value):
 
 class Struct(object):
     def __init__(self, name):
-        self.name = name
+        self.name = _clean_name(name)
         self.fields = []
         self.typeid = None
 
@@ -258,7 +258,6 @@ def load_type_definitions(server, nodes=None):
     generators = []
     for node in nodes:
         xml = node.get_value()
-        xml = xml.decode("utf-8")
         generator = StructGenerator()
         generators.append(generator)
         generator.make_model_from_string(xml)
@@ -299,6 +298,8 @@ def _clean_name(name):
     but cannot be part of of Python class names
     """
     name = re.sub(r'\W+', '_', name)
+    name = re.sub(r'\.', '_', name)
+    name = re.sub(r'"', '_', name)
     name = re.sub(r'^[0-9]+', r'_\g<0>', name)
 
     return name

opcua/common/type_dictionary_buider.py

@@ -1,6 +1,7 @@
 from opcua import ua
 from enum import Enum
 import logging
+from .structures import _clean_name
 
 import xml.etree.ElementTree as Et
 import re
@@ -282,4 +283,4 @@ def add_field(self, field_name, data_type, is_array=False):
 
 def get_ua_class(ua_class_name):
     #return getattr(ua, _to_camel_case(ua_class_name))
-    return getattr(ua, ua_class_name)
+    return getattr(ua, _clean_name(ua_class_name))

tests/tests_custom_structures.py

@@ -374,6 +374,12 @@ def test_functional_advance(self):
         nested_result = nested_var.get_value()
         self.assertEqual(nested_result, nested_msg)
 
+    def test_siemens_flavored_struct_name(self):
+        struct_name = '"Siemens"."OPC-UA"."Identifiers_LookLikeThis"'
+        struct_node = self.dict_builder.create_data_type(struct_name)
+        struct_node.add_field('"a"."field"', ua.VariantType.Int32)
+        self.dict_builder.set_dict_byte_string()
+        self.srv.load_type_definitions()
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.WARNING)