X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwprojectmano%2Fplugins%2Frwprojectmano%2Frift%2Ftasklets%2Frwprojectmano%2Frolesmano.py;h=0083c060fffd4c36f85f30cd4f42b5253c85099a;hb=refs%2Fchanges%2F22%2F1522%2F1;hp=694a704da62d8e4b42bec196ee73fc373d3227ab;hpb=d4e37aaf94ee50b1bcc271d81adab9fda2322833;p=osm%2FSO.git diff --git a/rwprojectmano/plugins/rwprojectmano/rift/tasklets/rwprojectmano/rolesmano.py b/rwprojectmano/plugins/rwprojectmano/rift/tasklets/rwprojectmano/rolesmano.py index 694a704d..0083c060 100644 --- a/rwprojectmano/plugins/rwprojectmano/rift/tasklets/rwprojectmano/rolesmano.py +++ b/rwprojectmano/plugins/rwprojectmano/rift/tasklets/rwprojectmano/rolesmano.py @@ -34,7 +34,6 @@ from gi.repository import ( ) import rift.tasklets -#TODO: Fix once merged to latest platform from rift.tasklets.rwproject.project import ( StateMachine, User, @@ -48,10 +47,7 @@ from rift.mano.utils.project import ( ) -MANO_PROJECT_ROLES = [ - 'rw-project-mano:catalog-oper', - 'rw-project-mano:catalog-admin', -] +from .projectmano import MANO_PROJECT_ROLES class ProjectConfigSubscriber(object): @@ -260,7 +256,7 @@ class RoleConfigPublisher(rift.tasklets.DtsConfigPublisher): self.project_name = project.name self.rbac_int = RwRbacInternalYang.YangData_RwRbacInternal_RwRbacInternal() self.roles = {} - self.proj_roles = MANO_PROJECT_ROLES + self.proj_roles = [role['mano-role'] for role in MANO_PROJECT_ROLES] self.proj_roles_published = False def get_xpath(self):