X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=0ba57cb6fc62c58ef8c5ea29a631fa7fecdb0883;hp=5763c38cb2d32026263ad294fa7843b1f2851103;hb=d77ba6fb46f75d52475978e6e1272b2169edd56c;hpb=225200decb92bdbbe5ef4839df7572511a88208a diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index 5763c38..0ba57cb 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -22,6 +22,7 @@ from osm_common.msgbase import MsgException from http import HTTPStatus from authconn_keystone import AuthconnKeystone +from authconn_internal import AuthconnInternal from base_topic import EngineException, versiontuple from admin_topics import UserTopic, ProjectTopic, VimAccountTopic, WimAccountTopic, SdnTopic from admin_topics import UserTopicAuth, ProjectTopicAuth, RoleTopicAuth @@ -50,12 +51,20 @@ class Engine(object): "sdns": SdnTopic, "users": UserTopic, "projects": ProjectTopic, + "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 @@ -110,6 +119,8 @@ class Engine(object): if not self.auth: if config["authentication"]["backend"] == "keystone": self.auth = AuthconnKeystone(config["authentication"]) + else: + self.auth = AuthconnInternal(config["authentication"], self.db, dict()) # TO BE CONFIRMED if not self.operations: if "resources_to_operations" in config["rbac"]: resources_to_operations_file = config["rbac"]["resources_to_operations"] @@ -122,17 +133,17 @@ class Engine(object): if path.isfile(config_file): resources_to_operations_file = config_file break - if not resources_to_operations_file: + 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.operations += [value] if config["authentication"]["backend"] == "keystone": self.map_from_topic_to_class["users"] = UserTopicAuth @@ -301,11 +312,10 @@ class Engine(object): 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) + rollback_list = [] + _id = self.map_topic["users"].new(rollback_list, fake_session, user_desc) return _id def create_admin(self): @@ -315,35 +325,52 @@ class Engine(object): """ project_id = self.create_admin_project() user_id = self.create_admin_user() - if not project_id and not user_id: - return None - else: + if project_id or user_id: return {'project_id': project_id, 'user_id': user_id} + else: + return None 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) - return - # 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"]: + table = "roles_operations" if self.config['authentication']['backend'] == "keystone" else "roles" + self.db.del_list(table) + + 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'): """ @@ -364,6 +391,8 @@ class Engine(object): if db_version != target_version: self.upgrade_db(db_version, target_version) - # create user admin if not exist - self.create_admin() + # create admin project&user if they don't exist + if self.config['authentication']['backend'] == 'internal' or not self.auth: + self.create_admin() + return