From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 3 Apr 2007 19:18:12 +0000 (+0000)
Subject: - update node.last_contact if call completes
X-Git-Tag: PLCAPI-4.2-0~153
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b0ca90e9a89166a0be21696328eb11c01b159338;p=plcapi.git

- update node.last_contact if call completes
---

diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py
index 41dc7061..c0a4c568 100644
--- a/PLC/Methods/GetSlivers.py
+++ b/PLC/Methods/GetSlivers.py
@@ -26,7 +26,7 @@ def get_slivers(api, slice_filter, node = None):
         slice_attribute_ids.update(slice['slice_attribute_ids'])
 
     # Get user information
-    all_persons = Persons(api, person_ids).dict()
+    all_persons = Persons(api, person_ids, ['person_id', 'enabled', 'key_ids']).dict()
 
     # Build up list of keys
     key_ids = set()
@@ -34,7 +34,7 @@ def get_slivers(api, slice_filter, node = None):
         key_ids.update(person['key_ids'])
 
     # Get user account keys
-    all_keys = Keys(api, key_ids).dict()
+    all_keys = Keys(api, key_ids, ['key_id', 'key', 'key_type']).dict()
 
     # Get slice attributes
     all_slice_attributes = SliceAttributes(api, slice_attribute_ids).dict()
@@ -190,6 +190,8 @@ class GetSlivers(Method):
 
         slivers = get_slivers(self.api, system_slice_ids + node['slice_ids'], node)
 
+	node.update_last_contact()
+
         return {
             'timestamp': timestamp,
             'node_id': node['node_id'],