Return from the back, from the hell, from my mind ... of UUID :)

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2314 b32b6428-25c9-4566-ad07-03861ab6144f

apps/tools/xaal/tools/info.py

@@ -34,7 +34,7 @@ class InfoDumper:
     def __init__(self,engine):
         self.eng = engine
         # new fake device
-        addr = tools.get_random_address()
+        addr = tools.get_random_uuid()
         dev = Device("cli.experimental",addr)
         dev.vendor_id = "IHSEV"
         dev.product_id = "xAAL InfoDumper"
@@ -83,7 +83,7 @@ class InfoDumper:
 
 def main():
     if len(sys.argv) == 2:
-        addr = tools.get_address(sys.argv[1])
+        addr = tools.parse_uuid(sys.argv[1])
         if addr:
             t0 = time.time()
             eng = Engine()

apps/tools/xaal/tools/isalive.py

@@ -31,7 +31,7 @@ class Scanner:
     def __init__(self,engine):
         self.eng = engine
         # new fake device
-        self.dev = Device("cli.experimental",tools.get_random_address())
+        self.dev = Device("cli.experimental",tools.get_random_uuid())
         self.eng.add_device(self.dev)
         self.eng.add_rx_handler(self.parse_answer)
 

devices/test/DummyDevices/lamp.py

@@ -43,7 +43,9 @@ if __name__ =='__main__':
     try:
         addr = None
         if len(sys.argv) > 1:
-            addr = tools.get_address(sys.argv[-1])
+            addr = tools.parse_uuid(sys.argv[-1])
+            if not addr:
+                print("Wrong address")
         main(addr)
     except KeyboardInterrupt:
         pass

libs/lib/xaal/lib/__init__.py

@@ -9,5 +9,6 @@ from . import config
 from .core import Engine,Timer
 from .network import NetworkConnector
 from .devices import Device, Attribute, Attributes
-from .messages import Message,MessageFactory
+from .messages import Message,MessageFactory,MessageType
+from .uuids import UUID
 from .exceptions import *

libs/lib/xaal/lib/exceptions.py

@@ -13,5 +13,7 @@ class CallbackError(Exception):
 class MessageParserError(Exception):pass
 class MessageError(Exception):pass
 
+# addresses.py
+class UUIDError(Exception):pass
 
 __all__ = ["DeviceError","XAALError","CallbackError","MessageParserError","MessageError"]

libs/lib/xaal/lib/messages.py

@@ -25,6 +25,7 @@ from __future__ import print_function
 
 from . import tools
 from . import config
+from .uuids import UUID
 from .exceptions import MessageError,MessageParserError
 
 import cbor
@@ -38,7 +39,6 @@ import codecs
 import logging
 logger = logging.getLogger(__name__)
 
-from uuid import UUID
 from enum import Enum
 
 class MessageFactory(object):
@@ -213,7 +213,6 @@ class Message(object):
     """ Message object used for incomming & outgoint message """
 
     def __init__(self):
-        
         self.version = config.STACK_VERSION  # message API version
         self.__targets = []                  # target property
         self.timestamp = None                # message timestamp

libs/lib/xaal/lib/tools.py

@@ -30,6 +30,7 @@ import sys
 from configobj import ConfigObj
 
 from . import config
+from .uuids import UUID
 
 XAAL_DEVTYPE_PATTERN = '^[a-zA-Z][a-zA-Z0-9_-]*\.[a-zA-Z][a-zA-Z0-9_-]*$'
 
@@ -64,22 +65,22 @@ def new_cfg(app_name):
     return cfg
 
 def get_random_uuid():
-    return uuid.uuid1()
+    return UUID.random()
 
-def get_address(addr):
-    """ return an xAAL address (standard py UUID class) for a given string"""
+def get_random_base_uuid():
+    return UUID.random_base()
+
+def parse_uuid(value):
+    """ return an xAAL address for a given string"""
     try:
-        addr = uuid.UUID(addr)
+        addr = UUID(value)
         return addr
     except ValueError:
         pass
     return None
 
-def get_random_address():
-    return get_random_uuid()
-
 def is_valid_address(val):
-    if type(val) == uuid.UUID:
+    if type(val) == UUID:
         return True
     return False
 
@@ -108,15 +109,9 @@ def pass2key(passphrase):
 
 def reduce_addr(addr):
     """return a string based addred without all  digits"""
-    tmp = str(addr)
+    tmp = addr.str
     return tmp[:5] + '..' + tmp[-5:]
 
-def get_logger(name,level,filename=None):
-    print("!!!!!!!!!!!! PLEASE DONT USE get_logger ANYMORE !!!!!!!!!!!!!")
-    import logging
-    logging.basicConfig(level=level)
-    return logging.getLogger(name)
-
 def timeit(method):
   def timed(*args, **kw):
     import time