main.py

@@ -7,7 +7,6 @@ import configparser
 import os
 import socket
 import sys
-import uuid as uuid_module
 from ipaddress import AddressValueError, IPv4Address, IPv6Address
 from os import access, R_OK
 
@@ -34,17 +33,10 @@ class CloudInitRequest:
         self.remoteip = None
         self.hostinfo = ('localhost', )
         self.request = request
+        self.uuid = uuid
         self.meta_data = None
         self.meta_data_loaded = False
         self.user_data = None
-
-        try:
-            self.uuid = str(uuid_module.UUID('{' + uuid + '}'))
-        # ValueError is wrong UUID syntax
-        # TypeError is None
-        except (ValueError, TypeError):
-            self.uuid = None
-
         self._init_ip()
         self._generate_default_meta_data()
 
@@ -203,7 +195,8 @@ class CloudInitApp:
     def _wrap_metadata(metadata):
         return {'ds': {
                           'meta_data': metadata
-            }}
+                       }
+                }
 
     def _user_data(self, uuid=None):
         """
@@ -301,11 +294,11 @@ if __name__ == "__main__":
         CONFIG["server"].getint("server_port", 8081)
     ENGINE = cherrypy.engine
 
-    CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-    CONFIG = {
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    config = {
               '/include': {
                            'tools.staticdir.on': True,
-            'tools.staticdir.dir': os.path.join(CURRENT_DIR,
+                           'tools.staticdir.dir': os.path.join(current_dir,
                                                                'data',
                                                                'include'),
                            'tools.staticdir.content_types': {
@@ -313,7 +306,7 @@ if __name__ == "__main__":
                                                              }
                           }
              }
-    cherrypy.tree.mount(ROOT, config=CONFIG)
+    cherrypy.tree.mount(ROOT, config=config)
 
     if hasattr(ENGINE, "signal_handler"):
         ENGINE.signal_handler.subscribe()