Removed NLR sites from topology
[sfa.git] / sfa / managers / slice_manager_pl.py
index d26979b..a58bc80 100644 (file)
@@ -9,7 +9,8 @@ from lxml import etree
 
 from sfa.util.sfalogging import sfa_logger
 from sfa.util.rspecHelper import merge_rspecs
-from sfa.util.xrn import urn_to_hrn, hrn_to_urn
+from sfa.util.xrn import Xrn, urn_to_hrn, hrn_to_urn
+from sfa.util.plxrn import hrn_to_pl_slicename
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *
@@ -26,8 +27,10 @@ from sfa.util.version import version_core
 def GetVersion(api):
     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' : api.hrn,
+                         'hrn' : xrn.get_hrn(),
+                         'urn' : xrn.get_urn(),
                          'peers': peers,
                          })
 
@@ -51,7 +54,7 @@ def slice_status(api, slice_xrn, creds ):
     result['geni_urn'] = slice_xrn
     result['geni_status'] = 'unknown'
     result['pl_login'] = slice['name']
-    result['pl_expires'] = slice['expires']
+    result['pl_expires'] = datetime.datetime.fromtimestamp(slice['expires']).ctime()
     
     resources = []
     
@@ -60,6 +63,8 @@ def slice_status(api, slice_xrn, creds ):
         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'] = ''
@@ -118,7 +123,7 @@ def renew_slice(api, xrn, creds, expiration_time):
     hrn, type = urn_to_hrn(xrn)
 
     # get the callers hrn
-    valid_cred = api.auth.checkCredentials(creds, 'renewesliver', hrn)[0]
+    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
@@ -133,7 +138,7 @@ def renew_slice(api, xrn, creds, expiration_time):
             continue
 
         server = api.aggregates[aggregate]
-        threads.run(server.RenewSliver, xrn, credential, expiration_time)
+        threads.run(server.RenewSliver, xrn, [credential], expiration_time)
     threads.get_results()
     return 1
 
@@ -346,7 +351,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:
@@ -355,7 +363,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]
@@ -379,31 +386,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()