X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=8233c906d456bbe26cd62a4e41f8c5b950a6980f;hp=d8409ea06b4c1b0afae15bbf67a6d88bdaccf27f;hb=9c63011a8f3ff8f42ad90359323606b9aa9f2e7a;hpb=a519a962c9bf008ddbee26500557b1de287f323a diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index d8409ea..8233c90 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -21,13 +21,14 @@ from osm_common.fsbase import FsException from osm_common.msgbase import MsgException from http import HTTPStatus -from authconn_keystone import AuthconnKeystone -from base_topic import EngineException, versiontuple -from admin_topics import UserTopic, ProjectTopic, VimAccountTopic, WimAccountTopic, SdnTopic -from admin_topics import UserTopicAuth, ProjectTopicAuth, RoleTopicAuth -from descriptor_topics import VnfdTopic, NsdTopic, PduTopic, NstTopic -from instance_topics import NsrTopic, VnfrTopic, NsLcmOpTopic, NsiTopic, NsiLcmOpTopic -from pmjobs_topics import PmJobsTopic +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, path from threading import Lock @@ -48,8 +49,9 @@ class Engine(object): "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 @@ -58,7 +60,8 @@ class Engine(object): map_target_version_to_int = { "1.0": 1000, - "1.1": 1001 + "1.1": 1001, + "1.2": 1002, # Add new versions here } @@ -115,7 +118,9 @@ class Engine(object): config["message"]["driver"])) if not self.auth: if config["authentication"]["backend"] == "keystone": - self.auth = AuthconnKeystone(config["authentication"]) + 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"] @@ -140,11 +145,6 @@ class Engine(object): if value not in self.operations: self.operations += [value] - if config["authentication"]["backend"] == "keystone": - self.map_from_topic_to_class["users"] = UserTopicAuth - self.map_from_topic_to_class["projects"] = ProjectTopicAuth - self.map_from_topic_to_class["roles"] = RoleTopicAuth - self.write_lock = Lock() # create one class per topic for topic, topic_class in self.map_from_topic_to_class.items(): @@ -277,59 +277,16 @@ class Engine(object): :param _id: identifier to be updated :param indata: data to be inserted :param kwargs: used to override the indata descriptor - :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) with self.write_lock: return self.map_topic[topic].edit(session, _id, indata, kwargs) - def create_admin_project(self): - """ - Creates a new project 'admin' into database if database is empty. Useful for initialization. - :return: _id identity of the inserted data, or None - """ - - projects = self.db.get_one("projects", fail_on_empty=False, fail_on_more=False) - if projects: - return None - project_desc = {"name": "admin"} - fake_session = {"project_id": "admin", "username": "admin", "admin": True, "force": True, "public": None} - rollback_list = [] - _id = self.map_topic["projects"].new(rollback_list, fake_session, project_desc) - return _id - - def create_admin_user(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, "force": True, "public": None} - roolback_list = [] - _id = self.map_topic["users"].new(roolback_list, fake_session, user_desc) - return _id - - def create_admin(self): - """ - Creates new 'admin' user and project into database if database is empty. Useful for initialization. - :return: _id identity of the inserted data, or None - """ - project_id = self.create_admin_project() - user_id = self.create_admin_user() - if not project_id and not user_id: - return None - else: - return {'project_id': project_id, 'user_id': user_id} - def upgrade_db(self, current_version, target_version): if target_version not in self.map_target_version_to_int.keys(): - raise EngineException("Wrong database version '{}'. Expected '{}'" - ". It cannot be up/down-grade".format(current_version, target_version), + 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: @@ -353,19 +310,20 @@ class Engine(object): self.db.set_secret_key(serial) current_version = "1.0" - if current_version == "1.0" and target_version_int >= self.map_target_version_to_int["1.1"]: - self.db.del_list("roles_operations") - + 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": 1001, - "version": "1.1", - "date": "2019-05-24", + "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.1" + current_version = "1.2" # TODO add future migrations here def init_db(self, target_version='1.0'): @@ -387,8 +345,4 @@ class Engine(object): if db_version != target_version: self.upgrade_db(db_version, target_version) - # create user admin if not exist - if not self.auth: - self.create_admin() - return