# limitations under the License.
import logging
-import yaml
-from osm_common import dbmongo, dbmemory, fslocal, msglocal, msgkafka, version as common_version
+# import yaml
+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
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 K8sClusterTopic, K8sRepoTopic, OsmRepoTopic
+from osm_nbi.admin_topics import UserTopicAuth, ProjectTopicAuth, RoleTopicAuth
+from osm_nbi.descriptor_topics import VnfdTopic, NsdTopic, PduTopic, NstTopic, VnfPkgOpTopic
+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 os import urandom # , path
from threading import Lock
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
"vim_accounts": VimAccountTopic,
"wim_accounts": WimAccountTopic,
"sdns": SdnTopic,
- "users": UserTopic,
- "projects": ProjectTopic,
+ "k8sclusters": K8sClusterTopic,
+ "k8srepos": K8sRepoTopic,
+ "osmrepos": OsmRepoTopic,
+ "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
+ "nsilcmops": NsiLcmOpTopic,
+ "vnfpkgops": VnfPkgOpTopic,
# [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.1": 1001,
+ "1.2": 1002,
# 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.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):
"""
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"]))
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"])
- if not self.operations:
- if "resources_to_operations" in config["rbac"]:
- resources_to_operations_file = config["rbac"]["resources_to_operations"]
+ self.authconn = AuthconnKeystone(config["authentication"], self.db,
+ self.authenticator.role_permissions)
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]
-
- 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.authconn = AuthconnInternal(config["authentication"], self.db,
+ self.authenticator.role_permissions)
+ # 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, Loader=yaml.Loader)
+ #
+ # 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():
- 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)
+ # if self.auth and topic_class in (UserTopicAuth, ProjectTopicAuth):
+ # self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.auth)
+ 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)
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):
"""
: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:
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'):
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
projects / osm / NBI.git / blobdiff