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 base64 import b64encode
from os import urandom, path
from threading import Lock
"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
+ # Add new versions here
}
def __init__(self):
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)
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)
with self.write_lock:
- return self.map_topic[topic].new(rollback, session, indata, kwargs, headers, force)
+ 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
: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)
with self.write_lock:
- return self.map_topic[topic].upload_content(session, _id, indata, kwargs, headers, force)
+ return self.map_topic[topic].upload_content(session, _id, indata, kwargs, headers)
def get_item_list(self, session, topic, filter_q=None):
"""
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)
with self.write_lock:
- return self.map_topic[topic].delete(session, _id, force)
+ 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
: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.
"""
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, force)
+ return self.map_topic[topic].edit(session, _id, indata, kwargs)
def create_admin_project(self):
"""
if projects:
return None
project_desc = {"name": "admin"}
- fake_session = {"project_id": "admin", "username": "admin", "admin": True}
+ 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, force=True)
+ _id = self.map_topic["projects"].new(rollback_list, fake_session, project_desc)
return _id
def create_admin_user(self):
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}
+ 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, force=True)
+ _id = self.map_topic["users"].new(roolback_list, fake_session, user_desc)
return _id
def create_admin(self):
return {'project_id': project_id, 'user_id': user_id}
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("Wrong database version '{}'. Expected '{}'"
+ ". It cannot be up/down-grade".format(current_version, 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]
+
+ 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 == "1.0" and target_version_int >= self.map_target_version_to_int["1.1"]:
+ self.db.del_list("roles_operations")
+
+ version_data = {
+ "_id": "version",
+ "version_int": 1001,
+ "version": "1.1",
+ "date": "2019-05-24",
+ "description": "set new format for roles_operations"
+ }
- raise EngineException("Wrong database version '{}'. Expected '{}'"
- ". It cannot be up/down-grade".format(current_version, target_version),
- http_code=HTTPStatus.INTERNAL_SERVER_ERROR)
+ self.db.set_one("admin", {"_id": "version"}, version_data)
+ current_version = "1.1"
+ # TODO add future migrations here
def init_db(self, target_version='1.0'):
"""
self.upgrade_db(db_version, target_version)
# create user admin if not exist
- self.create_admin()
+ if not self.auth:
+ self.create_admin()
+
return
projects / osm / NBI.git / blobdiff