X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=8233c906d456bbe26cd62a4e41f8c5b950a6980f;hp=1eff5e18b5b2b8fabd995e317a10a32f1220fcae;hb=9c63011a8f3ff8f42ad90359323606b9aa9f2e7a;hpb=d125caf630021538f19aadab045b5d17def67cdd diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index 1eff5e1..8233c90 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -14,20 +14,27 @@ # limitations under the License. import logging +import yaml from osm_common import dbmongo, dbmemory, fslocal, msglocal, msgkafka, version as common_version from osm_common.dbbase import DbException from osm_common.fsbase import FsException from osm_common.msgbase import MsgException from http import HTTPStatus -from base_topic import EngineException, versiontuple -from admin_topics import UserTopic, ProjectTopic, VimAccountTopic, SdnTopic -from descriptor_topics import VnfdTopic, NsdTopic, PduTopic, NstTopic -from instance_topics import NsrTopic, VnfrTopic, NsLcmOpTopic, NsiTopic, NsiLcmOpTopic + +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 UserTopicAuth, ProjectTopicAuth, RoleTopicAuth +from osm_nbi.descriptor_topics import VnfdTopic, NsdTopic, PduTopic, NstTopic +from osm_nbi.instance_topics import NsrTopic, VnfrTopic, NsLcmOpTopic, NsiTopic, NsiLcmOpTopic +from osm_nbi.pmjobs_topics import PmJobsTopic from base64 import b64encode -from os import urandom +from os import urandom, path +from threading import Lock __author__ = "Alfonso Tierno " -min_common_version = "0.1.8" +min_common_version = "0.1.16" class Engine(object): @@ -40,21 +47,34 @@ class Engine(object): "vnfrs": VnfrTopic, "nslcmops": NsLcmOpTopic, "vim_accounts": VimAccountTopic, + "wim_accounts": WimAccountTopic, "sdns": SdnTopic, - "users": UserTopic, - "projects": ProjectTopic, + "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 "nsis": NsiTopic, "nsilcmops": NsiLcmOpTopic # [NEW_TOPIC]: add an entry here + # "pm_jobs": PmJobsTopic will be added manually because it needs other parameters + } + + map_target_version_to_int = { + "1.0": 1000, + "1.1": 1001, + "1.2": 1002, + # Add new versions here } def __init__(self): self.db = None self.fs = None self.msg = None + self.auth = None self.config = None + self.operations = None self.logger = logging.getLogger("nbi.engine") self.map_topic = {} + self.write_lock = None def start(self, config): """ @@ -95,11 +115,48 @@ class Engine(object): self.msg.connect(config["message"]) else: raise EngineException("Invalid configuration param '{}' at '[message]':'driver'".format( - config["storage"]["driver"])) + config["message"]["driver"])) + if not self.auth: + if config["authentication"]["backend"] == "keystone": + self.auth = AuthconnKeystone(config["authentication"], self.db, None) + else: + self.auth = AuthconnInternal(config["authentication"], self.db, dict()) + if not self.operations: + if "resources_to_operations" in config["rbac"]: + resources_to_operations_file = config["rbac"]["resources_to_operations"] + else: + possible_paths = ( + __file__[:__file__.rfind("engine.py")] + "resources_to_operations.yml", + "./resources_to_operations.yml" + ) + for config_file in possible_paths: + if path.isfile(config_file): + resources_to_operations_file = config_file + break + if not resources_to_operations_file: + 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) + self.operations = [] + + for _, value in resources_to_operations["resources_to_operations"].items(): + if value not in self.operations: + self.operations += [value] + + self.write_lock = Lock() # create one class per topic for topic, topic_class in self.map_from_topic_to_class.items(): - self.map_topic[topic] = topic_class(self.db, self.fs, self.msg) + 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, + self.operations) + else: + self.map_topic[topic] = topic_class(self.db, self.fs, self.msg) + + self.map_topic["pm_jobs"] = PmJobsTopic(config["prometheus"].get("host"), config["prometheus"].get("port")) except (DbException, FsException, MsgException) as e: raise EngineException(str(e), http_code=e.http_code) @@ -109,29 +166,30 @@ class Engine(object): self.db.db_disconnect() if self.fs: self.fs.fs_disconnect() - if self.fs: - self.fs.fs_disconnect() + if self.msg: + self.msg.disconnect() + self.write_lock = None except (DbException, FsException, MsgException) as e: raise EngineException(str(e), http_code=e.http_code) - def new_item(self, rollback, session, topic, indata=None, kwargs=None, headers=None, force=False): + def new_item(self, rollback, session, topic, indata=None, kwargs=None, headers=None): """ Creates a new entry into database. For nsds and vnfds it creates an almost empty DISABLED entry, that must be completed with a call to method upload_content :param rollback: list to append created items at database in case a rollback must to be done - :param session: contains the used login username and working project + :param session: contains the used login username and working project, force to avoid checkins, public :param topic: it can be: users, projects, vim_accounts, sdns, nsrs, nsds, vnfds :param indata: data to be inserted :param kwargs: used to override the indata descriptor :param headers: http request headers - :param force: If True avoid some dependence checks :return: _id: identity of the inserted data. """ if topic not in self.map_topic: raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR) - return self.map_topic[topic].new(rollback, session, indata, kwargs, headers, force) + with self.write_lock: + return self.map_topic[topic].new(rollback, session, indata, kwargs, headers) - def upload_content(self, session, topic, _id, indata, kwargs, headers, force=False): + def upload_content(self, session, topic, _id, indata, kwargs, headers): """ Upload content for an already created entry (_id) :param session: contains the used login username and working project @@ -140,12 +198,12 @@ class Engine(object): :param indata: data to be inserted :param kwargs: used to override the indata descriptor :param headers: http request headers - :param force: If True avoid some dependence checks :return: _id: identity of the inserted data. """ if topic not in self.map_topic: raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR) - return self.map_topic[topic].upload_content(session, _id, indata, kwargs, headers, force) + with self.write_lock: + return self.map_topic[topic].upload_content(session, _id, indata, kwargs, headers) def get_item_list(self, session, topic, filter_q=None): """ @@ -195,22 +253,23 @@ class Engine(object): """ if topic not in self.map_topic: raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR) - return self.map_topic[topic].delete_list(session, _filter) + with self.write_lock: + return self.map_topic[topic].delete_list(session, _filter) - def del_item(self, session, topic, _id, force=False): + def del_item(self, session, topic, _id): """ 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 force: indicates if deletion must be forced in case of conflict :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) - return self.map_topic[topic].delete(session, _id, force) + with self.write_lock: + return self.map_topic[topic].delete(session, _id) - def edit_item(self, session, topic, _id, indata=None, kwargs=None, force=False): + def edit_item(self, session, topic, _id, indata=None, kwargs=None): """ Update an existing entry at database :param session: contains the used login username and working project @@ -218,58 +277,54 @@ class Engine(object): :param _id: identifier to be updated :param indata: data to be inserted :param kwargs: used to override the indata descriptor - :param force: If True avoid some dependence checks - :return: dictionary, raise exception if not found. + :return: dictionary with edited item _id, raise exception if not found. """ if topic not in self.map_topic: raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR) - return self.map_topic[topic].edit(session, _id, indata, kwargs, force) - - def prune(self): - """ - Prune database not needed content - :return: None - """ - return self.db.del_list("nsrs", {"_admin.to_delete": True}) - - def create_admin(self): - """ - Creates a new user admin/admin into database if database is empty. Useful for initialization - :return: _id identity of the inserted data, or None - """ - users = self.db.get_one("users", fail_on_empty=False, fail_on_more=False) - if users: - return None - # raise EngineException("Unauthorized. Database users is not empty", HTTPStatus.UNAUTHORIZED) - user_desc = {"username": "admin", "password": "admin", "projects": ["admin"]} - fake_session = {"project_id": "admin", "username": "admin", "admin": True} - roolback_list = [] - _id = self.map_topic["users"].new(roolback_list, fake_session, user_desc, force=True) - return _id + with self.write_lock: + return self.map_topic[topic].edit(session, _id, indata, kwargs) def upgrade_db(self, current_version, target_version): - if not target_version or current_version == target_version: + if target_version not in self.map_target_version_to_int.keys(): + raise EngineException("Cannot upgrade to version '{}' with this version of code".format(target_version), + http_code=HTTPStatus.INTERNAL_SERVER_ERROR) + + if current_version == target_version: return - if target_version == '1.0': - if not current_version: - # create database version - serial = urandom(32) - version_data = { - "_id": 'version', # Always 'version' - "version_int": 1000, # version number - "version": '1.0', # version text - "date": "2018-10-25", # version date - "description": "added serial", # changes in this version - 'status': 'ENABLED', # ENABLED, DISABLED (migration in process), ERROR, - 'serial': b64encode(serial) - } - self.db.create("admin", version_data) - self.db.set_secret_key(serial) - # TODO add future migrations here + + target_version_int = self.map_target_version_to_int[target_version] - raise EngineException("Wrong database version '{}'. Expected '{}'" - ". It cannot be up/down-grade".format(current_version, target_version), - http_code=HTTPStatus.INTERNAL_SERVER_ERROR) + if not current_version: + # create database version + serial = urandom(32) + version_data = { + "_id": "version", # Always "version" + "version_int": 1000, # version number + "version": "1.0", # version text + "date": "2018-10-25", # version date + "description": "added serial", # changes in this version + 'status': "ENABLED", # ENABLED, DISABLED (migration in process), ERROR, + 'serial': b64encode(serial) + } + self.db.create("admin", version_data) + self.db.set_secret_key(serial) + current_version = "1.0" + + if current_version in ("1.0", "1.1") and target_version_int >= self.map_target_version_to_int["1.2"]: + if self.config['authentication']['backend'] == "internal": + self.db.del_list("roles") + + version_data = { + "_id": "version", + "version_int": 1002, + "version": "1.2", + "date": "2019-06-11", + "description": "set new format for roles_operations" + } + + self.db.set_one("admin", {"_id": "version"}, version_data) + current_version = "1.2" + # TODO add future migrations here def init_db(self, target_version='1.0'): """ @@ -290,6 +345,4 @@ class Engine(object): if db_version != target_version: self.upgrade_db(db_version, target_version) - # create user admin if not exist - self.create_admin() return