# Per-node sliver attributes take precedence over global
# slice attributes, so set them first.
# Then comes nodegroup slice attributes
- # Followed by global slice attributes
+ # Followed by global slice attributes
sliver_attributes = []
if node is not None:
attributes.append({'name': sliver_attribute['name'],
'value': sliver_attribute['value']})
- # set nodegroup slice attributes
+ # set nodegroup slice attributes
slice_attribute_names = [ slice_attribute['name'] for slice_attribute in slice_attributes ]
- for slice_attribute in filter(lambda a: a['nodegroup_id'] in node['nodegroup_ids'], slice_attributes):
- # Do not set any nodegroup slice attributes for
+ for slice_attribute in filter(lambda a: a['nodegroup_id'] in node['nodegroup_ids'], slice_attributes):
+ # Do not set any nodegroup slice attributes for
# which there is at least one sliver attribute
# already set.
if slice_attribute['name'] not in slice_attribute_names:
- attributes.append({'name': slice_attribute['name'],
- 'value': slice_attribute['value']})
+ attributes.append({'name': slice_attribute['name'],
+ 'value': slice_attribute['value']})
for slice_attribute in filter(lambda a: a['node_id'] is None, slice_attributes):
# Do not set any global slice attributes for
'networks': [NodeNetwork.fields],
'groups': [NodeGroup.fields['name']],
'conf_files': [ConfFile.fields],
- 'initscripts': [InitScript.fields],
+ 'initscripts': [InitScript.fields],
'slivers': [{
'name': Slice.fields['name'],
'slice_id': Slice.fields['slice_id'],
conf_file = all_conf_files[conf_file_id]
conf_files[conf_file['dest']] = conf_file
- # Get all (enabled) initscripts
- initscripts = InitScripts(self.api, {'enabled': True})
+ # Get all (enabled) initscripts
+ initscripts = InitScripts(self.api, {'enabled': True})
# Get system slices
system_slice_attributes = SliceAttributes(self.api, {'name': 'system', 'value': '1'}).dict('slice_id')
system_slice_ids = system_slice_attributes.keys()
-
- # Get nm-controller slices
+
+ # Get nm-controller slices
controller_and_delegated_slice_ids = []
- if not node['slice_ids_whitelist']:
- controller_and_delegated_slices = Slices(self.api, {'instantiation': ['nm-controller', 'delegated']}, ['slice_id']).dict('slice_id')
- controller_and_delegated_slice_ids = controller_and_delegated_slices.keys()
+ if not node['slice_ids_whitelist']:
+ controller_and_delegated_slices = Slices(self.api, {'instantiation': ['nm-controller', 'delegated']}, ['slice_id']).dict('slice_id')
+ controller_and_delegated_slice_ids = controller_and_delegated_slices.keys()
- slice_ids = system_slice_ids + controller_and_delegated_slice_ids + node['slice_ids']
+ slice_ids = system_slice_ids + controller_and_delegated_slice_ids + node['slice_ids']
- slivers = get_slivers(self.api, slice_ids, node)
+ slivers = get_slivers(self.api, slice_ids, node)
- node.update_last_contact()
+ node.update_last_contact()
return {
'timestamp': timestamp,
'networks': networks,
'groups': groups,
'conf_files': conf_files.values(),
- 'initscripts': initscripts,
+ 'initscripts': initscripts,
'slivers': slivers
}