Merge branch 'master' into senslab2

[sfa.git] / sfa / managers / slice_manager.py

diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py
index be6cc7e..b261fe2 100644 (file)
--- a/sfa/managers/slice_manager.py
+++ b/sfa/managers/slice_manager.py
@@ -48,15 +48,17 @@ class SliceManager:
             if rspec_version.content_type in ['*', 'request']:
                 request_rspec_versions.append(rspec_version.to_dict())
         xrn=Xrn(api.hrn, 'authority+sa')
-        version_more = {'interface':'slicemgr',
-                        'sfa': 2,
-                        'geni_api': 2,
-                        'hrn' : xrn.get_hrn(),
-                        'urn' : xrn.get_urn(),
-                        'peers': peers,
-                        'geni_request_rspec_versions': request_rspec_versions,
-                        'geni_ad_rspec_versions': ad_rspec_versions,
-                    }
+        version_more = {
+            'interface':'slicemgr',
+            'sfa': 2,
+            'geni_api': 2,
+            'geni_api_versions': {'2': 'http://%s:%s' % (api.config.SFA_SM_HOST, api.config.SFA_SM_PORT)},
+            'hrn' : xrn.get_hrn(),
+            'urn' : xrn.get_urn(),
+            'peers': peers,
+            'geni_request_rspec_versions': request_rspec_versions,
+            'geni_ad_rspec_versions': ad_rspec_versions,
+            }
         sm_version=version_core(version_more)
         # local aggregate if present needs to have localhost resolved
         if api.hrn in api.aggregates:
@@ -114,6 +116,7 @@ class SliceManager:
                     forward_options['rspec_version'] = version_manager.get_version('SFA 1').to_dict()
                 else:
                     forward_options['rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict()
+                    forward_options['geni_rspec_version'] = {'type': 'geni', 'version': '3.0'}
                 rspec = server.ListResources(credential, forward_options)
                 return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"}
             except Exception, e:
@@ -131,7 +134,8 @@ class SliceManager:
         version_string = "rspec_%s" % (rspec_version)
     
         # look in cache first
-        if self.cache and not xrn:
+        cached_requested = options.get('cached', True)
+        if not xrn and self.cache and cached_requested:
             rspec =  self.cache.get(version_string)
             if rspec:
                 api.logger.debug("SliceManager.ListResources returns cached advertisement")
@@ -257,18 +261,26 @@ class SliceManager:
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return True
 
-        def _RenewSliver(server, xrn, creds, expiration_time, options):
-            return server.RenewSliver(xrn, creds, expiration_time, options)
-    
-        (hrn, type) = urn_to_hrn(xrn)
+        def _RenewSliver(aggregate, server, xrn, creds, expiration_time, options):
+            try:
+                result=server.RenewSliver(xrn, creds, expiration_time, options)
+                if type(result)!=dict:
+                    result = {"code": {"geni_code": 0}, value: result}
+                result["aggregate"] = aggregate
+                return result
+            except:
+                logger.log_exc('Something wrong in _RenewSliver with URL %s'%server.url)
+                return {"aggregate": aggregate, "exc_info": traceback.format_exc(), "code": {"geni_code": -1}, "value": False, "output": ""}
+
+        (hrn, urn_type) = urn_to_hrn(xrn)
         # get the callers hrn
         valid_cred = api.auth.checkCredentials(creds, 'renewsliver', hrn)[0]
         caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
-    
+
         # attempt to use delegated credential first
         cred = api.getDelegatedCredential(creds)
         if not cred:
-            cred = api.getCredential()
+            cred = api.getCredential(minimumExpiration=31*86400)
         threads = ThreadManager()
         for aggregate in api.aggregates:
             # prevent infinite loop. Dont send request back to caller
@@ -277,13 +289,24 @@ class SliceManager:
                 continue
             interface = api.aggregates[aggregate]
             server = api.server_proxy(interface, cred)
-            threads.run(_RenewSliver, server, xrn, [cred], expiration_time, options)
-        # 'and' the results
-        results = [ReturnValue.get_value(result) for result in threads.get_results()]
-        return reduce (lambda x,y: x and y, results , True)
-    
+            threads.run(_RenewSliver, aggregate, server, xrn, [cred], expiration_time, options)
+
+        results = threads.get_results()
+
+        geni_code = 0
+        geni_output = ",".join([x.get("output","") for x in results])
+        geni_value = reduce (lambda x,y: x and y, [result.get("value",False) for result in results], True)
+        for agg_result in results:
+            agg_geni_code = agg_result["code"].get("geni_code",0)
+            if agg_geni_code:
+                geni_code = agg_geni_code
+
+        results = {"aggregates": results, "code": {"geni_code": geni_code}, "value": geni_value, "output": geni_output}
+
+        return results
+
     def DeleteSliver(self, api, xrn, creds, options):
-        call_id = options.get('call_id') 
+        call_id = options.get('call_id')
         if Callids().already_handled(call_id): return ""
 
         def _DeleteSliver(server, xrn, creds, options):
@@ -293,7 +316,7 @@ class SliceManager:
         # get the callers hrn
         valid_cred = api.auth.checkCredentials(creds, 'deletesliver', hrn)[0]
         caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
-    
+
         # attempt to use delegated credential first
         cred = api.getDelegatedCredential(creds)
         if not cred: