X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fmethods%2FDescribe.py;h=6930f1eb876a753b4dd877c61bf309f2bb19d3f3;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=69d4fb7b4f1e2836f8c503cf199fa89ccdfedcd7;hpb=c1c136b3042a24604823c6da135308b7c031c234;p=sfa.git

diff --git a/sfa/methods/Describe.py b/sfa/methods/Describe.py
index 69d4fb7b..6930f1eb 100644
--- a/sfa/methods/Describe.py
+++ b/sfa/methods/Describe.py
@@ -8,6 +8,7 @@ from sfa.trust.credential import Credential
 
 from sfa.storage.parameter import Parameter, Mixed
 
+
 class Describe(Method):
     """
     Retrieve a manifest RSpec describing the resources contained by the 
@@ -21,43 +22,47 @@ class Describe(Method):
     interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(type([str]), "List of URNs"),
-        Mixed(Parameter(str, "Credential string"), 
+        Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
         Parameter(dict, "Options")
-        ]
+    ]
     returns = Parameter(str, "List of resources")
 
     def call(self, urns, creds, options):
-        self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
-       
+        self.api.logger.info("interface: %s\tmethod-name: %s" %
+                             (self.api.interface, self.name))
+
         # client must specify a version
         if not options.get('geni_rspec_version'):
             if options.get('rspec_version'):
                 options['geni_rspec_version'] = options['rspec_version']
             else:
-                raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null')
-        valid_creds  = self.api.auth.checkCredentialsSpeaksFor(
-            creds, 'listnodes', urns, 
-            check_sliver_callback = self.api.driver.check_sliver_credentials,
+                raise SfaInvalidArgument(
+                    'Must specify an rspec version option. geni_rspec_version cannot be null')
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(
+            creds, 'listnodes', urns,
+            check_sliver_callback=self.api.driver.check_sliver_credentials,
             options=options)
 
-        # get hrn of the original caller 
+        # get hrn of the original caller
         origin_hrn = options.get('origin_hrn', None)
         if not origin_hrn:
-            origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn()
+            origin_hrn = Credential(
+                cred=valid_creds[0]).get_gid_caller().get_hrn()
         desc = self.api.manager.Describe(self.api, creds, urns, options)
 
-        # filter rspec through sfatables 
+        # filter rspec through sfatables
         if self.api.interface in ['aggregate']:
             chain_name = 'OUTGOING'
-        elif self.api.interface in ['slicemgr']: 
+        elif self.api.interface in ['slicemgr']:
             chain_name = 'FORWARD-OUTGOING'
-        self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name)
-        desc['geni_rspec'] = run_sfatables(chain_name, '', origin_hrn, desc['geni_rspec']) 
- 
+        self.api.logger.debug(
+            "ListResources: sfatables on chain %s" % chain_name)
+        desc['geni_rspec'] = run_sfatables(
+            chain_name, '', origin_hrn, desc['geni_rspec'])
+
         if 'geni_compressed' in options and options['geni_compressed'] == True:
-            desc['geni_rspec'] = zlib.compress(desc['geni_rspec']).encode('base64')
+            desc['geni_rspec'] = zlib.compress(
+                desc['geni_rspec']).encode('base64')
 
-        return desc  
-    
-    
+        return desc