X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=a647784ec17ff97dae5d8a9eb14332ed8aa21401;hp=3f83557453b7e79db5e088b9fef3f6e2a27e201d;hb=2c4f9ec63fb977be6df40053be3ea50e409cf97f;hpb=bee3bad8d15fe0893855d0dff92cef4351629edb diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index 3f83557..a647784 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -14,7 +14,7 @@ # limitations under the License. import logging -import yaml +# 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 @@ -23,15 +23,17 @@ from http import HTTPStatus from osm_nbi.authconn_keystone import AuthconnKeystone from osm_nbi.authconn_internal import AuthconnInternal +from osm_nbi.authconn_tacacs import AuthconnTacacs 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 +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 +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 osm_nbi.subscription_topics import NslcmSubscriptionsTopic from base64 import b64encode -from os import urandom, path +from os import urandom # , path from threading import Lock __author__ = "Alfonso Tierno " @@ -52,11 +54,14 @@ class Engine(object): "sdns": SdnTopic, "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, + "nslcm_subscriptions": NslcmSubscriptionsTopic, # [NEW_TOPIC]: add an entry here # "pm_jobs": PmJobsTopic will be added manually because it needs other parameters } @@ -68,17 +73,18 @@ class Engine(object): # Add new versions here } - def __init__(self, token_cache): + 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.token_cache = token_cache + self.authenticator = authenticator def start(self, config): """ @@ -123,45 +129,47 @@ class Engine(object): 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"], self.db, None) + self.authconn = AuthconnKeystone(config["authentication"], self.db, + self.authenticator.role_permissions) + elif config["authentication"]["backend"] == "tacacs": + self.authconn = AuthconnTacacs(config["authentication"], self.db, + self.authenticator.role_permissions) else: - self.auth = AuthconnInternal(config["authentication"], self.db, self.token_cache) - 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.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) - if 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.auth) + self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.authconn) self.map_topic["pm_jobs"] = PmJobsTopic(self.db, config["prometheus"].get("host"), config["prometheus"].get("port")) @@ -213,29 +221,31 @@ class Engine(object): 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): + def get_item_list(self, session, topic, filter_q=None, api_req=False): """ Get a list of items :param session: contains the used login username and working project :param topic: it can be: users, projects, vnfds, nsds, ... :param filter_q: filter of data to be applied + :param api_req: True if this call is serving an external API request. False if serving internal request. :return: The list, it can be empty if no one match the filter_q. """ if topic not in self.map_topic: raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR) - return self.map_topic[topic].list(session, filter_q) + return self.map_topic[topic].list(session, filter_q, api_req) - def get_item(self, session, topic, _id): + def get_item(self, session, topic, _id, api_req=False): """ Get complete information on an item :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 api_req: True if this call is serving an external API request. False if serving internal request. :return: dictionary, 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].show(session, _id) + return self.map_topic[topic].show(session, _id, api_req) def get_file(self, session, topic, _id, path=None, accept_header=None): """