X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=ca7a8375857f0daf9470cde924b13b81831e8f71;hp=8233c906d456bbe26cd62a4e41f8c5b950a6980f;hb=b2e48bdecec7cd57f303becf40c5d469b8fdadff;hpb=23acf4001306e92a587de566be4bab00931104ba diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index 8233c90..ca7a837 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -15,7 +15,7 @@ import logging import yaml -from osm_common import dbmongo, dbmemory, fslocal, msglocal, msgkafka, version as common_version +from osm_common import dbmongo, dbmemory, fslocal, fsmongo, msglocal, msgkafka, version as common_version from osm_common.dbbase import DbException from osm_common.fsbase import FsException from osm_common.msgbase import MsgException @@ -25,6 +25,7 @@ from osm_nbi.authconn_keystone import AuthconnKeystone from osm_nbi.authconn_internal import AuthconnInternal from osm_nbi.base_topic import EngineException, versiontuple from osm_nbi.admin_topics import VimAccountTopic, WimAccountTopic, SdnTopic +from osm_nbi.admin_topics import K8sClusterTopic, K8sRepoTopic from osm_nbi.admin_topics import UserTopicAuth, ProjectTopicAuth, RoleTopicAuth from osm_nbi.descriptor_topics import VnfdTopic, NsdTopic, PduTopic, NstTopic from osm_nbi.instance_topics import NsrTopic, VnfrTopic, NsLcmOpTopic, NsiTopic, NsiLcmOpTopic @@ -49,6 +50,8 @@ class Engine(object): "vim_accounts": VimAccountTopic, "wim_accounts": WimAccountTopic, "sdns": SdnTopic, + "k8sclusters": K8sClusterTopic, + "k8srepos": K8sRepoTopic, "users": UserTopicAuth, # Valid for both internal and keystone authentication backends "projects": ProjectTopicAuth, # Valid for both internal and keystone authentication backends "roles": RoleTopicAuth, # Valid for both internal and keystone authentication backends @@ -65,16 +68,18 @@ class Engine(object): # Add new versions here } - def __init__(self): + def __init__(self, authenticator): self.db = None self.fs = None self.msg = None - self.auth = None + self.authconn = None self.config = None self.operations = None self.logger = logging.getLogger("nbi.engine") self.map_topic = {} self.write_lock = None + # self.token_cache = token_cache + self.authenticator = authenticator def start(self, config): """ @@ -103,6 +108,9 @@ class Engine(object): if config["storage"]["driver"] == "local": self.fs = fslocal.FsLocal() self.fs.fs_connect(config["storage"]) + elif config["storage"]["driver"] == "mongo": + self.fs = fsmongo.FsMongo() + self.fs.fs_connect(config["storage"]) else: raise EngineException("Invalid configuration param '{}' at '[storage]':'driver'".format( config["storage"]["driver"])) @@ -116,11 +124,11 @@ class Engine(object): else: raise EngineException("Invalid configuration param '{}' at '[message]':'driver'".format( config["message"]["driver"])) - if not self.auth: + if not self.authconn: if config["authentication"]["backend"] == "keystone": - self.auth = AuthconnKeystone(config["authentication"], self.db, None) + self.authconn = AuthconnKeystone(config["authentication"], self.db) else: - self.auth = AuthconnInternal(config["authentication"], self.db, dict()) + self.authconn = AuthconnInternal(config["authentication"], self.db) if not self.operations: if "resources_to_operations" in config["rbac"]: resources_to_operations_file = config["rbac"]["resources_to_operations"] @@ -137,7 +145,7 @@ class Engine(object): raise EngineException("Invalid permission configuration: resources_to_operations file missing") with open(resources_to_operations_file, 'r') as f: - resources_to_operations = yaml.load(f) + resources_to_operations = yaml.load(f, Loader=yaml.Loader) self.operations = [] @@ -148,15 +156,16 @@ class Engine(object): self.write_lock = Lock() # create one class per topic for topic, topic_class in self.map_from_topic_to_class.items(): - if self.auth and topic_class in (UserTopicAuth, ProjectTopicAuth): - self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.auth) - elif self.auth and topic_class == RoleTopicAuth: - self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.auth, + # if self.auth and topic_class in (UserTopicAuth, ProjectTopicAuth): + # self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.auth) + if self.authconn and topic_class == RoleTopicAuth: + self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.authconn, self.operations) else: - self.map_topic[topic] = topic_class(self.db, self.fs, self.msg) + self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.authconn) - self.map_topic["pm_jobs"] = PmJobsTopic(config["prometheus"].get("host"), config["prometheus"].get("port")) + self.map_topic["pm_jobs"] = PmJobsTopic(self.db, config["prometheus"].get("host"), + config["prometheus"].get("port")) except (DbException, FsException, MsgException) as e: raise EngineException(str(e), http_code=e.http_code) @@ -256,18 +265,21 @@ class Engine(object): with self.write_lock: return self.map_topic[topic].delete_list(session, _filter) - def del_item(self, session, topic, _id): + def del_item(self, session, topic, _id, not_send_msg=None): """ Delete item by its internal id :param session: contains the used login username and working project :param topic: it can be: users, projects, vnfds, nsds, ... :param _id: server id of the item + :param not_send_msg: If False, message will not be sent to kafka. + If a list, message is not sent, but content is stored in this variable so that the caller can send this + message using its own loop. If None, message is sent :return: dictionary with deleted item _id. It raises exception if not found. """ if topic not in self.map_topic: raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR) with self.write_lock: - return self.map_topic[topic].delete(session, _id) + return self.map_topic[topic].delete(session, _id, not_send_msg=not_send_msg) def edit_item(self, session, topic, _id, indata=None, kwargs=None): """