(*) Peer has new fields person_ids and site_ids

[plcapi.git] / PLC / Methods / GetSlivers.py

diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py
index 46e13d3..060169f 100644 (file)
--- a/PLC/Methods/GetSlivers.py
+++ b/PLC/Methods/GetSlivers.py
@@ -61,19 +61,17 @@ class GetSlivers(Method):
         }]
     }]
 
-    event_type = 'Get'
-    object_type = 'Sliver'
 
     def call(self, auth, node_filter = None):
-       timestamp = int(time.time())
+        timestamp = int(time.time())
 
         if node_filter is None and isinstance(self.caller, Node):
             all_nodes = {self.caller['node_id']: self.caller}
         else:
             all_nodes = Nodes(self.api, node_filter).dict()
 
-        # Get default slices
-        system_slice_attributes = SliceAttributes(self.api, {'name': 'system', 'value': '1'}).dict()
+        # Get local default slices
+        system_slice_attributes = SliceAttributes(self.api, {'name': 'system', 'value': '1', 'peer_id': None}).dict()
         system_slice_ids = [slice_attribute['slice_id'] for slice_attribute in system_slice_attributes.values()]
         system_slice_ids = dict.fromkeys(system_slice_ids)
        
@@ -83,7 +81,7 @@ class GetSlivers(Method):
         for node_id, node in all_nodes.iteritems():
             all_nodenetwork_ids.update(node['nodenetwork_ids'])
             all_nodegroup_ids.update(node['nodegroup_ids'])
-            #all_slice_ids.update(node['slice_ids'])
+            all_slice_ids.update(node['slice_ids'])
        
         # Get nodenetwork information
         all_nodenetworks = NodeNetworks(self.api, all_nodenetwork_ids).dict()