GetVersion['peers'] for SMs also reports local AM when relevant, with localhost resolved

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

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index a888521..44715dd 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -24,55 +24,25 @@ import sfa.util.xmlrpcprotocol as xmlrpcprotocol
 import sfa.plc.peers as peers
 from sfa.util.version import version_core
 
+# XX FIX ME:  should merge result from multiple aggregates instead of 
+# calling aggregate implementation
+from sfa.managers.aggregate_manager_pl import slice_status
+
 def GetVersion(api):
+    # peers explicitly in aggregates.xml
     peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.aggregates.items() 
                    if peername != api.hrn])
     xrn=Xrn (api.hrn)
-    return version_core({'interface':'slicemgr',
-                         'hrn' : xrn.get_hrn(),
-                         'urn' : xrn.get_urn(),
-                         'peers': peers,
-                         })
-
-def slice_status(api, slice_xrn, creds ):
-    hrn, type = urn_to_hrn(slice_xrn)
-    # find out where this slice is currently running
-    api.logger.info(hrn)
-    slicename = hrn_to_pl_slicename(hrn)
-    api.logger.info("Checking status for %s" % slicename)
-    slices = api.plshell.GetSlices(api.plauth, [slicename], ['node_ids','person_ids','name','expires'])
-    if len(slices) == 0:        
-        raise Exception("Slice %s not found (used %s as slicename internally)" % (slice_xrn, slicename))
-    slice = slices[0]
-    
-    nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'],
-                                    ['hostname', 'boot_state', 'last_contact'])
-    api.logger.info(slice)
-    api.logger.info(nodes)
-    
-    result = {}
-    result['geni_urn'] = slice_xrn
-    result['geni_status'] = 'unknown'
-    result['pl_login'] = slice['name']
-    result['pl_expires'] = datetime.datetime.fromtimestamp(slice['expires']).ctime()
-    
-    resources = []
-    
-    for node in nodes:
-        res = {}
-        res['pl_hostname'] = node['hostname']
-        res['pl_boot_state'] = node['boot_state']
-        res['pl_last_contact'] = node['last_contact']
-        if not node['last_contact'] is None:
-            res['pl_last_contact'] = datetime.datetime.fromtimestamp(node['last_contact']).ctime()
-        res['geni_urn'] = ''
-        res['geni_status'] = 'unknown'
-        res['geni_error'] = ''
-
-        resources.append(res)
-        
-    result['geni_resources'] = resources
-    return result
+    sm_version=version_core({'interface':'slicemgr',
+                             'hrn' : xrn.get_hrn(),
+                             'urn' : xrn.get_urn(),
+                             'peers': peers,
+                             })
+    # local aggregate if present needs to have localhost resolved
+    if api.hrn in api.aggregates:
+        local_am_url=api.aggregates[api.hrn]._ServerProxy__host
+        sm_version['peers'][api.hrn]=local_am_url.replace('localhost',sm_version['hostname'])
+    return sm_version
 
 def create_slice(api, xrn, creds, rspec, users):
     hrn, type = urn_to_hrn(xrn)
@@ -351,7 +321,10 @@ def get_rspec(api, creds, options):
     # get hrn of the original caller
     origin_hrn = options.get('origin_hrn', None)
     if not origin_hrn:
-        origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
+        if isinstance(creds, list):
+            origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
+        else:
+            origin_hrn = Credential(string=creds).get_gid_caller().get_hrn()
     
     # look in cache first 
     if api.cache and not xrn:
@@ -360,7 +333,6 @@ def get_rspec(api, creds, options):
             return rspec
 
     hrn, type = urn_to_hrn(xrn)
-    rspec = None
 
     # get the callers hrn
     valid_cred = api.auth.checkCredentials(creds, 'listnodes', hrn)[0]
@@ -384,31 +356,13 @@ def get_rspec(api, creds, options):
         #threads.run(server.get_resources, cred, xrn, origin_hrn)
                     
     results = threads.get_results()
-    # combine the rspecs into a single rspec 
-    for agg_rspec in results:
-        try:
-            tree = etree.parse(StringIO(agg_rspec))
-        except etree.XMLSyntaxError:
-            message = str(agg_rspec) + ": " + str(sys.exc_info()[1])
-            raise InvalidRSpec(message)
+    merged_rspec = merge_rspecs(results)
 
-        root = tree.getroot()
-        if root.get("type") in ["SFA"]:
-            if rspec == None:
-                rspec = root
-            else:
-                for network in root.iterfind("./network"):
-                    rspec.append(deepcopy(network))
-                for request in root.iterfind("./request"):
-                    rspec.append(deepcopy(request))
-    
-    sfa_logger().debug('get_rspec: rspec=%r'%rspec)
-    rspec =  etree.tostring(rspec, xml_declaration=True, pretty_print=True)
     # cache the result
     if api.cache and not xrn:
-        api.cache.add('nodes', rspec)
+        api.cache.add('nodes', merged_rspec)
  
-    return rspec
+    return merged_rspec
 
 def main():
     r = RSpec()