diff options
Diffstat (limited to 'moonv4/moon_orchestrator/moon_orchestrator/messenger.py')
-rw-r--r-- | moonv4/moon_orchestrator/moon_orchestrator/messenger.py | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/moonv4/moon_orchestrator/moon_orchestrator/messenger.py b/moonv4/moon_orchestrator/moon_orchestrator/messenger.py index 6b54255f..2b7b3866 100644 --- a/moonv4/moon_orchestrator/moon_orchestrator/messenger.py +++ b/moonv4/moon_orchestrator/moon_orchestrator/messenger.py @@ -3,28 +3,26 @@ # license which can be found in the file 'LICENSE' in this package distribution # or at 'http://www.apache.org/licenses/LICENSE-2.0'. -from oslo_config import cfg import oslo_messaging from oslo_log import log as logging import time from moon_utilities.api import APIList -from moon_utilities.security_functions import call -from moon_utilities.exceptions import RootPDPNotInitialized +from moon_utilities import configuration from oslo_config import cfg from moon_orchestrator.api.generic import Status, Logs -# from moon_orchestrator.api.configuration import Configuration from moon_orchestrator.api.containers import Containers from moon_orchestrator.api.slaves import Slaves TOPIC = "orchestrator" -LOG = logging.getLogger(__name__) +LOG = logging.getLogger("moon.orchestrator.messenger") CONF = cfg.CONF class Server: def __init__(self, containers, docker_manager, slaves): + cfg.CONF.transport_url = self.__get_transport_url() self.CONTAINERS = containers self.transport = oslo_messaging.get_transport(cfg.CONF) self.target = oslo_messaging.Target(topic=TOPIC, server='server1') @@ -37,39 +35,20 @@ class Server: Status(), Logs(), Containers(self.docker_manager), - # Configuration(), Slaves(slaves) ] self.server = oslo_messaging.get_rpc_server(self.transport, self.target, self.endpoints, executor='threading', access_policy=oslo_messaging.DefaultRPCAccessPolicy) - # @staticmethod - # def __check_root_pdp(): - # root_exist = False - # for key, value in call("manager", ctx={"user_id": "admin"}, - # method="get_pdp", args={})["pdp"].items(): - # if value["name"] == CONF.root_policy_directory: - # root_exist = True - # if not root_exist: - # ie = call("manager", ctx={"user_id": "admin"}, method="add_pdp", - # args={ - # "name": "policy_root", - # "model": CONF.root_policy_directory, - # "genre": "admin", - # "description": "policy_root" - # }) - # if "result" in ie and not ie["result"]: - # raise RootPDPNotInitialized + @staticmethod + def __get_transport_url(): + messenger = configuration.get_configuration(configuration.MESSENGER)["messenger"] + return messenger['url'] def run(self): try: self.server.start() - # try: - # raise NotImplementedError - # # self.__check_root_pdp() - # except Exception as e: - # LOG.error("Exception occurred when creating Root PDP: {}".format(e)) while True: time.sleep(1) except KeyboardInterrupt: |