Merge branch 'fix-generic-manager-relationships' into 'master'

Fix generic manager relationships

Closes #29

See merge request acs/public/villas/controller!24

Author: stv0g

doc/openapi.yaml

@@ -12,7 +12,7 @@ info:
     url: https://www.apache.org/licenses/LICENSE-2.0
 
 servers:
-- url: https://villas.k8s.eonerc.rwth-aachen.de/api/v1
+- url: https://villas.k8s.eonerc.rwth-aachen.de/controller/api/v1
   description: Demo instance at RWTH Aachen
 
 paths:

villas/controller/api.py

@@ -8,6 +8,8 @@
 REGEX_UUID = r'\b[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}-[0-9a-fA-F]' \
              r'{4}-[0-9a-fA-F]{4}-\b[0-9a-fA-F]{12}\b'
 
+BASE = '/api/v1'
+
 
 class RequestHandler(tornado.web.RequestHandler):
 
@@ -32,7 +34,7 @@ def run(self):
         port = self.controller.config.api.port
         self.app.listen(port)
 
-        LOGGER.info('Starting API')
+        LOGGER.info('Starting API at http://localhost:%d%s', port, BASE)
 
         self.loop = IOLoop.current(instance=True)
         self.loop.start()
@@ -48,7 +50,7 @@ def handlers(self):
         }
 
         return [
-            (r'/', MainRequestHandler, args),
-            (r'/health', HealthRequestHandler, args),
-            (r'/component/('+REGEX_UUID+r')', ComponentRequestHandler, args)
+            (BASE + r'/', MainRequestHandler, args),
+            (BASE + r'/health', HealthRequestHandler, args),
+            (BASE + r'/component/('+REGEX_UUID+r')', ComponentRequestHandler, args)  # noqa E501
         ]

villas/controller/config.py

@@ -3,6 +3,7 @@
 import logging
 import os
 import dotmap
+from typing import List
 
 from os import getcwd
 from xdg import (
@@ -75,7 +76,7 @@ def find_default_path(self, filename='config',
                 return fn
 
     @property
-    def components(self):
+    def components(self) -> List[Component]:
         return [Component.from_dict(c) for c in self.config.components]
 
     def __getattr__(self, attr):

villas/controller/controller.py

@@ -7,6 +7,7 @@
 
 from villas.controller.api import Api
 from villas.controller import __version__ as version
+from villas.controller.config import Config
 from villas.controller.components.managers.generic import GenericManager
 
 
@@ -17,25 +18,25 @@ class ControllerMixin(kombu.mixins.ConsumerProducerMixin):
 
     def __init__(self, connection, args):
         self.args = args
-        self.config = args.config
+        self.config: Config = args.config
 
-        comps = self.config.components
-        self.components = {c.uuid: c for c in comps if c.enabled}
         self.connection = connection
         self.exchange = kombu.Exchange(name='villas',
                                        type='headers',
                                        durable=True)
 
         self.publish_queue = queue.Queue()
 
+        # Components are activated by first call to on_iteration()
+        self.components = {}
+        self.active_components = {}
+
         manager = self.add_managers()
 
-        for _, comp in self.components.items():
+        comps = [c for c in self.config.components if c.enabled]
+        for comp in comps:
             LOGGER.info('Adding %s', comp)
-            comp.set_manager(manager)
-
-        # Components are activated by first call to on_iteration()
-        self.active_components = {}
+            manager.add_component(comp)
 
     def get_consumers(self, _, channel):
         return map(lambda comp: comp.get_consumer(channel),
@@ -59,6 +60,8 @@ def add_managers(self):
                 location=socket.gethostname()
             )
 
+            mgr.mixin = self
+
             self.components[mgr.uuid] = mgr
         else:
             mgr = mgrs[0]