merge changes from HEAD

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

diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py
index 41dc706..890b65f 100644 (file)
--- a/PLC/Methods/GetSlivers.py
+++ b/PLC/Methods/GetSlivers.py
@@ -13,6 +13,7 @@ from PLC.Slices import Slice, Slices
 from PLC.Persons import Person, Persons
 from PLC.Keys import Key, Keys
 from PLC.SliceAttributes import SliceAttribute, SliceAttributes
+from PLC.InitScripts import InitScript, InitScripts
 
 def get_slivers(api, slice_filter, node = None):
     # Get slice information
@@ -26,7 +27,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 +35,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()
@@ -63,6 +64,8 @@ def get_slivers(api, slice_filter, node = None):
 
         # Per-node sliver attributes take precedence over global
         # slice attributes, so set them first.
+        # Then comes nodegroup slice attributes
+       # Followed by global slice attributes
         sliver_attributes = []
 
         if node is not None:
@@ -71,6 +74,15 @@ def get_slivers(api, slice_filter, node = None):
                 attributes.append({'name': sliver_attribute['name'],
                                    'value': sliver_attribute['value']})
 
+           # set nodegroup 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
+                # which there is at least one sliver attribute
+                # already set.
+               if slice_attribute['name'] not in slice_attributes:
+                   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
             # which there is at least one sliver attribute
@@ -117,6 +129,7 @@ class GetSlivers(Method):
         'networks': [NodeNetwork.fields],
         'groups': [NodeGroup.fields['name']],
         'conf_files': [ConfFile.fields],
+       'initscripts': [InitScript.fields],
         'slivers': [{
             'name': Slice.fields['name'],
             'slice_id': Slice.fields['slice_id'],
@@ -184,11 +197,22 @@ class GetSlivers(Method):
             if conf_file_id in all_conf_files:
                 conf_files[conf_file['dest']] = all_conf_files[conf_file_id]
             
+
+       # 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
+       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']
+
+       slivers = get_slivers(self.api, slice_ids, node)
 
-        slivers = get_slivers(self.api, system_slice_ids + node['slice_ids'], node)
+       node.update_last_contact()
 
         return {
             'timestamp': timestamp,
@@ -197,5 +221,6 @@ class GetSlivers(Method):
             'networks': networks,
             'groups': groups,
             'conf_files': conf_files.values(),
+           'initscripts': initscripts,
             'slivers': slivers
             }