From 769088678d21c8caf836f41329bcf55511dbb6f4 Mon Sep 17 00:00:00 2001 From: Josh Karlin Date: Wed, 5 May 2010 18:53:29 +0000 Subject: [PATCH] minor updates --- sfa/client/sfi.py | 1 + sfa/managers/registry_manager_pl.py | 2 ++ sfa/methods/DeleteSliver.py | 1 - sfa/methods/Shutdown.py | 2 +- sfa/methods/get_credential.py | 3 ++- sfa/methods/get_geni_aggregates.py | 11 ++++++++++- sfa/trust/auth.py | 3 +++ sfa/trust/credential.py | 2 -- sfa/trust/rights.py | 4 ++-- 9 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 5b792471..655d4e0b 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -689,6 +689,7 @@ class Sfi: record_filepath = args[0] rec_file = self.get_record_file(record_filepath) record = load_record_from_file(rec_file).as_dict() + print record return self.registry.register(auth_cred, record) # update named registry entry diff --git a/sfa/managers/registry_manager_pl.py b/sfa/managers/registry_manager_pl.py index 63827fca..5ef992c9 100644 --- a/sfa/managers/registry_manager_pl.py +++ b/sfa/managers/registry_manager_pl.py @@ -18,6 +18,8 @@ def get_credential(api, xrn, type, is_self=False): hrn = urn_to_hrn(xrn)[0] else: hrn, type = urn_to_hrn(xrn) + + api.logger.info("Getting credential for " + xrn) # Is this a root or sub authority auth_hrn = api.auth.get_authority(hrn) if not auth_hrn or hrn == api.config.SFA_INTERFACE_HRN: diff --git a/sfa/methods/DeleteSliver.py b/sfa/methods/DeleteSliver.py index ed09a95e..9d02ed9c 100644 --- a/sfa/methods/DeleteSliver.py +++ b/sfa/methods/DeleteSliver.py @@ -21,7 +21,6 @@ class DeleteSliver(Method): def call(self, slice_xrn, creds): hrn, type = urn_to_hrn(slice_xrn) - self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name)) # Find the valid credentials diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py index 0cf52cbf..cd36532d 100644 --- a/sfa/methods/Shutdown.py +++ b/sfa/methods/Shutdown.py @@ -19,7 +19,7 @@ class Shutdown(Method): ] returns = Parameter(bool, "Success or Failure") - def call(self, slice_xrn, creds, expiration_time): + def call(self, slice_xrn, creds): hrn, type = urn_to_hrn(slice_xrn) self.api.logger.info("interface: %s\ttarget-hrn: %s\tcaller-creds: %s\tmethod-name: %s"%(self.api.interface, hrn, creds, self.name)) diff --git a/sfa/methods/get_credential.py b/sfa/methods/get_credential.py index c624b1b6..01b7deed 100644 --- a/sfa/methods/get_credential.py +++ b/sfa/methods/get_credential.py @@ -10,6 +10,8 @@ from sfa.util.parameter import Parameter, Mixed from sfa.util.debug import log from sfa.trust.credential import Credential +from sfa.util.sfalogging import logger + class get_credential(Method): """ Retrive a credential for an object @@ -44,7 +46,6 @@ class get_credential(Method): self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) self.api.auth.check(cred, 'getcredential') self.api.auth.verify_object_belongs_to_me(hrn) - # send the call to the right manager manager_base = 'sfa.managers' mgr_type = self.api.config.SFA_REGISTRY_TYPE diff --git a/sfa/methods/get_geni_aggregates.py b/sfa/methods/get_geni_aggregates.py index edbb73b3..e556c6e8 100644 --- a/sfa/methods/get_geni_aggregates.py +++ b/sfa/methods/get_geni_aggregates.py @@ -31,7 +31,9 @@ class get_geni_aggregates(Method): def call(self, cred, xrn = None): hrn, type = urn_to_hrn(xrn) self.api.auth.check(cred, 'list') - geni_aggs = Aggregates(self.api, '/etc/sfa/geni_aggregates.xml') + + geni_aggs = Aggregates(self.api, '/etc/sfa/geni_aggregates.xml') + hrn_list = [] if hrn: if isinstance(hrn, StringTypes): @@ -43,8 +45,15 @@ class get_geni_aggregates(Method): interfaces = geni_aggs.interfaces else: interfaces = [interface for interface in geni_aggs.interfaces if interface['hrn'] in hrn_list] + + # Remove Aggregate's default sfa-aggregate + interfaces = interfaces[:-1] # Remove empty interfaces interfaces = [interface for interface in interfaces if interface['hrn'] != ''] + # Add urns + for interface in interfaces: + interface['urn'] = hrn_to_urn(interface['hrn'], 'authority') + return interfaces diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py index 45f3d149..b1ba623e 100644 --- a/sfa/trust/auth.py +++ b/sfa/trust/auth.py @@ -238,6 +238,8 @@ class Auth: rl = RightList() type = record['type'] + logger.info("caller_hrn = " + caller_hrn + " type = " + type) + if type=="slice": researchers = record.get("researcher", []) pis = record.get("PI", []) @@ -251,6 +253,7 @@ class Auth: elif type == "authority": pis = record.get("PI", []) operators = record.get("operator", []) + logger.info("pis = " + str(pis) + " ops = " + str(operators)) if (caller_hrn == self.config.SFA_INTERFACE_HRN): rl.add("authority") rl.add("sa") diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py index 1ab34a88..aeac9de3 100644 --- a/sfa/trust/credential.py +++ b/sfa/trust/credential.py @@ -657,8 +657,6 @@ class Credential(object): refs.append("Sig_%s" % ref) for ref in refs: - logger.info('%s --verify --node-id "%s" %s %s 2>&1' \ - % (self.xmlsec_path, ref, cert_args, filename)) verified = os.popen('%s --verify --node-id "%s" %s %s 2>&1' \ % (self.xmlsec_path, ref, cert_args, filename)).read() if not verified.strip().startswith("OK"): diff --git a/sfa/trust/rights.py b/sfa/trust/rights.py index 3c12df40..5e826ea7 100644 --- a/sfa/trust/rights.py +++ b/sfa/trust/rights.py @@ -22,9 +22,9 @@ privilege_table = {"authority": ["register", "remove", "update", "resolve", "lis "sa": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver", "deleteslice", "deletesliver", "updateslice", "getsliceresources", "getticket", "loanresources", "stopslice", "startslice", "renewsliver", "deleteslice", "deletesliver", "resetslice", "listslices", "listnodes", "getpolicy", "sliverstatus"], - "embed": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver", "deleteslice", "deletesliver", "updateslice", "sliverstatus", "getsliceresources", "shutdown"], + "embed": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver", "renewsliver", "deleteslice", "deletesliver", "updateslice", "sliverstatus", "getsliceresources", "shutdown"], "bind": ["getticket", "loanresources", "redeemticket"], - "control": ["updateslice", "createslice", "createsliver", "sliverstatus", "stopslice", "startslice", "deleteslice", "deletesliver", "resetslice", "getsliceresources", "getgids"], + "control": ["updateslice", "createslice", "createsliver", "renewsliver", "sliverstatus", "stopslice", "startslice", "deleteslice", "deletesliver", "resetslice", "getsliceresources", "getgids"], "info": ["listslices", "listnodes", "getpolicy","listresources"], "ma": ["setbootstate", "getbootstate", "reboot", "getgids", "gettrustedcerts"], "operator": ["gettrustedcerts", "getgids"]} -- 2.47.0