# 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
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
+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 base64 import b64encode
-from os import urandom, path
+from os import urandom # , path
from threading import Lock
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
"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,
# [NEW_TOPIC]: add an entry here
# "pm_jobs": PmJobsTopic will be added manually because it needs other parameters
}
# 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):
"""
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)
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"))
projects / osm / NBI.git / blobdiff