[codec] Hook vendor commands during WpanApi initialization (openthrea…

…d#106)

There's no need to join VendorSpinelPropertyHandler class with
SpinelPropertyHandler since the methods in SPINEL_PROP_DISPATCH are
located in different objects anyway. This allows to move vendor
properties initialization into WpanApi class initializator, therefore
allowing to use custom Vendor module based on the command line argument.

Signed-off-by: Robert Lubos <[email protected]>

spinel/codec.py

@@ -822,15 +822,7 @@ def PROP_VALUE_REMOVED(self, wpan_api, payload, tid):
     SPINEL.RSP_PROP_VALUE_REMOVED: WPAN_CMD_HANDLER.PROP_VALUE_REMOVED,
 }
 
-try:
-    codec = importlib.import_module('vendor.codec')
-    cls = type(codec.VendorSpinelPropertyHandler.__name__,
-               (SpinelPropertyHandler, codec.VendorSpinelPropertyHandler),
-               {'__name__': codec.VendorSpinelPropertyHandler.__name__})
-    WPAN_PROP_HANDLER = cls()
-except ImportError:
-    codec = None
-    WPAN_PROP_HANDLER = SpinelPropertyHandler()
+WPAN_PROP_HANDLER = SpinelPropertyHandler()
 
 SPINEL_PROP_DISPATCH = {
     SPINEL.PROP_LAST_STATUS:
@@ -1023,9 +1015,6 @@ def PROP_VALUE_REMOVED(self, wpan_api, payload, tid):
         WPAN_PROP_HANDLER.NEST_STREAM_MFG
 }
 
-if codec is not None:
-    SPINEL_PROP_DISPATCH.update(codec.VENDOR_SPINEL_PROP_DISPATCH)
-
 
 class WpanApi(SpinelCodec):
     """ Helper class to format wpan command packets """
@@ -1044,6 +1033,13 @@ def __init__(self,
         if self.use_hdlc:
             self.hdlc = Hdlc(self.stream)
 
+        # Hook vendor properties
+        try:
+            codec = importlib.import_module('vendor.codec')
+            SPINEL_PROP_DISPATCH.update(codec.VENDOR_SPINEL_PROP_DISPATCH)
+        except ImportError:
+            pass
+
         # PARSER state
         self.rx_pkt = []
         self.callback = defaultdict(list)  # Map prop_id to list of callbacks.