X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=0211bd64146911b054ad24ead93d9ec1621f3185;hp=67a92330e4cfa24a8a491e67f4c7e92b084ce5b4;hb=fe598fe1bcb93d51b5c7bb0373bc06d74e5bf92f;hpb=32bab47c7fde8ae22795306723f3441ec544fa2b diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index 67a9233..0211bd6 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -25,6 +25,7 @@ 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 from osm_nbi.admin_topics import UserTopicAuth, ProjectTopicAuth, RoleTopicAuth from osm_nbi.descriptor_topics import VnfdTopic, NsdTopic, PduTopic, NstTopic from osm_nbi.instance_topics import NsrTopic, VnfrTopic, NsLcmOpTopic, NsiTopic, NsiLcmOpTopic @@ -49,6 +50,8 @@ class Engine(object): "vim_accounts": VimAccountTopic, "wim_accounts": WimAccountTopic, "sdns": SdnTopic, + "k8sclusters": K8sClusterTopic, + "k8srepos": K8sRepoTopic, "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 @@ -137,7 +140,7 @@ class Engine(object): 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) + resources_to_operations = yaml.load(f, Loader=yaml.Loader) self.operations = []