mktime should be time.mktime

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

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index c1a6d0c..54c6583 100644 (file)
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -54,7 +54,7 @@ def __get_registry_objects(slice_xrn, creds, users):
         reg_objects['site'] = site
 
         slice = {}
-        slice['expires'] = int(mktime(Credential(string=creds[0]).get_lifetime().timetuple()))
+        slice['expires'] = int(time.mktime(Credential(string=creds[0]).get_lifetime().timetuple()))
         slice['hrn'] = hrn
         slice['name'] = site['login_base'] + "_" +  get_leaf(hrn)
         slice['url'] = hrn
@@ -79,11 +79,10 @@ def __get_hostnames(nodes):
         hostnames.append(node.hostname)
     return hostnames
 
-
-
 def get_version():
     version = {}
     version['geni_api'] = 1
+    version['sfa'] = 1
     return version
 
 def slice_status(api, slice_xrn, creds):
@@ -266,7 +265,7 @@ def get_ticket(api, xrn, creds, rspec, users):
     # get the slice record
     registry = api.registries[api.hrn]
     credential = api.getCredential()
-    records = registry.resolve(credential, xrn)
+    records = registry.Resolve(xrn, credential)
 
     # similar to create_slice, we must verify that the required records exist
     # at this aggregate before we can issue a ticket