removed daemon addons directory and refereces

daemon/core/addons/__init__.py

@@ -1,6 +0,0 @@
-"""
-Optional add ons can be put in this directory. Everything listed in __all__ is automatically
-loaded by the main core module.
-"""
-
-__all__ = []

daemon/core/corehandlers.py

@@ -1137,10 +1137,9 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
         if execute_server:
             try:
                 logger.info("executing: %s", execute_server)
+                # TODO: remove this, unless we want to support udp/aux at any level
                 if not isinstance(self.server, CoreServer):  # CoreUdpServer):
                     server = self.server.mainserver
-                    # elif isinstance(self.server, CoreAuxServer):
-                    # server = self.server.mainserver
                 else:
                     server = self.server
                 if message.flags & MessageFlags.STRING.value:

daemon/core/coreserver.py

@@ -38,8 +38,6 @@ class CoreServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
         self.sessions = {}
         self.udpserver = None
         self.udpthread = None
-        self.auxserver = None
-        self.auxthread = None
         self._sessions_lock = threading.Lock()
         CoreServer.add_server(self)
         SocketServer.TCPServer.__init__(self, server_address, handler_class)
@@ -317,59 +315,3 @@ class CoreUdpServer(SocketServer.ThreadingMixIn, SocketServer.UDPServer):
         :return: nothing
         """
         self.serve_forever()
-
-
-class CoreAuxServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
-    """
-    An auxiliary TCP server.
-    """
-    daemon_threads = True
-    allow_reuse_address = True
-
-    def __init__(self, server_address, handler_class, main_server):
-        """
-        Create a CoreAuxServer instance.
-
-        :param tuple[str, int] server_address: server address
-        :param class handler_class: class for handling requests
-        :param main_server: main server to associate with
-        """
-
-        self.mainserver = main_server
-        logger.info("auxiliary server started, listening on: %s", server_address)
-        SocketServer.TCPServer.__init__(self, server_address, handler_class)
-
-    def start(self):
-        """
-        Start the core auxiliary server.
-
-        :return: nothing
-        """
-        self.serve_forever()
-
-    def set_session_master(self, handler):
-        """
-        Set the session master handler.
-
-        :param func handler: session master handler
-        :return:
-        """
-        return self.mainserver.set_session_master(handler)
-
-    def get_session(self, session_id=None):
-        """
-        Retrieve a session.
-
-        :param int session_id: id of session to retrieve
-        :return: core.session.Session
-        """
-        return self.mainserver.get_session(session_id)
-
-    def to_session_message(self, flags=0):
-        """
-        Retrieve a session message.
-
-        :param flags: message flags
-        :return: session message
-        """
-        return self.mainserver.to_session_message(flags)

daemon/core/service.py

@@ -162,7 +162,7 @@ class CoreServices(ConfigurableManager):
     config_type = RegisterTlvs.UTILITY.value
 
     _invalid_custom_names = (
-        'core', 'addons', 'api', 'bsd', 'emane', 'misc', 'netns', 'phys', 'services', 'xen'
+        'core', 'api', 'bsd', 'emane', 'misc', 'netns', 'phys', 'services', 'xen'
     )
 
     def __init__(self, session):