-
- slice_ids = dict.fromkeys(node['slice_ids'])
-
- # If not a foreign node, add all of our default system
- # slices to it.
- # XXX if not node['peer_id']:
- slice_ids.update(system_slice_ids)
-
- slivers = []
- for slice in map(lambda id: all_slices[id], slice_ids.keys()):
- keys = []
- ### still missing in foreign slices
- try:
- for person in map(lambda id: all_persons[id], slice['person_ids']):
- keys += [{'key_type': all_keys[key_id]['key_type'],
- 'key': all_keys[key_id]['key']} \
- for key_id in person['key_ids']]
- except:
- keys += [{'key_type':'missing',
- 'key':'key caching not implemented yet'}]
-
- 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'}}
-
- slivers.append({
- 'name': slice['name'],
- 'slice_id': slice['slice_id'],
- 'instantiation': slice['instantiation'],
- 'expires': slice['expires'],
- 'keys': keys,
- 'attributes': attributes.values()
- })
-
- nodes.append({
- 'timestamp': timestamp,
- 'node_id': node['node_id'],
- 'hostname': node['hostname'],
- 'networks': networks,
- 'groups': groups,
- 'conf_files': conf_files.values(),
- 'slivers': slivers
+
+ # Node configuration files take precedence over node group
+ # configuration files.
+ for conf_file_id in node['conf_file_ids']:
+ if conf_file_id in all_conf_files:
+ conf_files[conf_file['dest']] = all_conf_files[conf_file_id]
+
+ slivers = []
+ for slice in slices:
+ keys = []
+ for person_id in slice['person_ids']:
+ if person_id in all_persons:
+ person = all_persons[person_id]
+ if not person['enabled']:
+ continue
+ for key_id in person['key_ids']:
+ if key_id in all_keys:
+ key = all_keys[key_id]
+ keys += [{'key_type': key['key_type'],
+ 'key': key['key']}]
+
+ attributes = []
+
+ # All (per-node and global) attributes for this slice
+ slice_attributes = []
+ for slice_attribute_id in slice['slice_attribute_ids']:
+ if slice_attribute_id in all_slice_attributes:
+ slice_attributes.append(all_slice_attributes[slice_attribute_id])
+
+ # Per-node sliver attributes take precedence over global
+ # slice attributes, so set them first.
+ sliver_attributes = []
+ for sliver_attribute in filter(lambda a: a['node_id'] == node['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']})
+
+ slivers.append({
+ 'name': slice['name'],
+ 'slice_id': slice['slice_id'],
+ 'instantiation': slice['instantiation'],
+ 'expires': slice['expires'],
+ 'keys': keys,
+ 'attributes': attributes