From d35362b6d7c96dec551a846a9316d17c22d25be6 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sun, 21 Nov 2010 22:21:57 +0100 Subject: [PATCH] bugfix, don't use methods... --- PLC/AuthorizeHelpers.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/PLC/AuthorizeHelpers.py b/PLC/AuthorizeHelpers.py index 1f3b8a9..8c09cc3 100644 --- a/PLC/AuthorizeHelpers.py +++ b/PLC/AuthorizeHelpers.py @@ -2,24 +2,25 @@ # Thierry Parmentelat - INRIA # from PLC.Faults import * -from PLC.Persons import Person -from PLC.Nodes import Node +from PLC.Persons import Persons,Person +from PLC.Sites import Sites,Site +from PLC.Nodes import Nodes,Node class AuthorizeHelpers: @staticmethod def interface_belongs_to_person (api,interface, person): try: - node=api.GetNodes(interface['node_id'])[0] - return node_belong_to_person (api, node, person) + node=Nodes(api,[interface['node_id']])[0] + return AuthorizeHelpers.node_belong_to_person (api, node, person) except: return False @staticmethod def node_belongs_to_person (api, node, person): try: - site=api.GetSites(node['site_id'])[0] - return person_belongs_to_site (api, person, site) + site=Sites(api,[node['site_id']])[0] + return AuthorizeHelpers.person_belongs_to_site (api, person, site) except: return False @@ -55,7 +56,7 @@ class AuthorizeHelpers: if isinstance (node_id_or_hostname,int): return node_id_or_hostname in slice['node_ids'] else: - try: return GetNodes(node_id_or_hostname_in_slice)[0]['node_id'] in slice['node_ids'] + try: return Nodes(api,node_id_or_hostname_in_slice)[0]['node_id'] in slice['node_ids'] except:return False -- 2.43.0