(*) 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 79f3d45..060169f 100644 (file)
--- a/PLC/Methods/GetSlivers.py
+++ b/PLC/Methods/GetSlivers.py
@@ -61,16 +61,17 @@ class GetSlivers(Method):
         }]
     }]
 
+
     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)
        
@@ -80,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()
@@ -146,11 +147,11 @@ class GetSlivers(Method):
             
            # filter out any slices in this nodes slice_id list that may be invalid
             # (i.e. expired slices)
-           slice_ids = dict.fromkeys([slice['slice_id'] for slice in all_slice_ids])
-            
+            slice_ids = dict.fromkeys(filter(lambda slice_id: slice_id in all_slice_ids, node['slice_ids']))
+           
            # If not a foreign node, add all of our default system
             # slices to it.
-            if node['peer_id'] is not None:
+            if node['peer_id'] is None:
                slice_ids.update(system_slice_ids)
 
             slivers = [] 
@@ -167,22 +168,29 @@ class GetSlivers(Method):
                     keys += [{'key_type':'missing',
                               'key':'key caching not implemented yet'}]
 
-                attributes = {}
+                sliver_attributes = []
+                attributes = []
                 ### still missing in foreign slices
                 try:
-                    for slice_attribute in map(lambda id: all_slice_attributes[id],
-                                               slice['slice_attribute_ids']):
-                        # Per-node sliver attributes (slice attributes
-                        # with non-null node_id fields) take precedence
-                        # over global slice attributes.
-                        if not attributes.has_key(slice_attribute['name']) or \
-                               slice_attribute['node_id'] is not None:
-                            attributes[slice_attribute['name']] = {
-                                'name': slice_attribute['name'],
-                                'value': slice_attribute['value']
-                                }
-                except:
-                        attributes={'ignored':{'name':'attributes caching','value':'not implemented yet'}}
+                    slice_attributes = map(lambda id: all_slice_attributes[id],
+                                           slice['slice_attribute_ids'])
+
+                    # Per-node sliver attributes take precedence over
+                    # global slice attributes, so set them first.
+                    for sliver_attribute in filter(lambda a: a['node_id'] == node_id, slice_attributes):
+                        sliver_attributes.append(sliver_attribute['name'])
+                        attributes.append({'name': sliver_attribute['name'],
+                                           'value': sliver_attribute['value']})
+
+                    for slice_attribute in filter(lambda a: a['node_id'] is None, slice_attributes):
+                        # Do not set any global slice attributes for
+                        # which there is at least one sliver attribute
+                        # already set.
+                        if slice_attribute['name'] not in sliver_attributes:
+                            attributes.append({'name': slice_attribute['name'],
+                                               'value': slice_attribute['value']})
+                except Exception, err:
+                    attributes=[{'name':'attributes caching','value':'not implemented yet'}]
 
                 slivers.append({
                     'name': slice['name'],
@@ -190,7 +198,7 @@ class GetSlivers(Method):
                     'instantiation': slice['instantiation'],
                     'expires': slice['expires'],
                     'keys': keys,
-                    'attributes': attributes.values()
+                    'attributes': attributes
                     })
            
             nodes.append({