fix bug in selection of special account ssh keys

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

diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py
index 5405d5f..d4dbba8 100644 (file)
--- a/PLC/Methods/GetSlivers.py
+++ b/PLC/Methods/GetSlivers.py
@@ -1,4 +1,5 @@
 # $Id$
+# $URL$
 import time
 
 from PLC.Faults import *
@@ -12,10 +13,15 @@ from PLC.NodeGroups import NodeGroup, NodeGroups
 from PLC.ConfFiles import ConfFile, ConfFiles
 from PLC.Slices import Slice, Slices
 from PLC.Persons import Person, Persons
+from PLC.Sites import Sites
+from PLC.Roles import Roles
 from PLC.Keys import Key, Keys
 from PLC.SliceTags import SliceTag, SliceTags
 from PLC.InitScripts import InitScript, InitScripts
 
+# XXX used to check if slice expiration time is sane
+MAXINT =  2L**31-1
+
 def get_slivers(api, slice_filter, node = None):
     # Get slice information
     slices = Slices(api, slice_filter, ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids'])
@@ -80,7 +86,7 @@ def get_slivers(api, slice_filter, node = None):
                # Do not set any nodegroup slice attributes for
                 # which there is at least one sliver attribute
                 # already set.
-               if slice_tag['tagname'] not in slice_tags:
+               if slice_tag not in slice_tags:
                    attributes.append({'tagname': slice_tag['tagname'],
                                   'value': slice_tag['value']})
 
@@ -92,6 +98,10 @@ def get_slivers(api, slice_filter, node = None):
                 attributes.append({'tagname': slice_tag['tagname'],
                                    'value': slice_tag['value']})
 
+        # XXX Sanity check; though technically this should be a system invariant
+        # checked with an assertion
+        if slice['expires'] > MAXINT:  slice['expires']= MAXINT
+
         slivers.append({
             'name': slice['name'],
             'slice_id': slice['slice_id'],
@@ -131,6 +141,13 @@ class v43GetSlivers(Method):
         'groups': [NodeGroup.fields['groupname']],
         'conf_files': [ConfFile.fields],
        'initscripts': [InitScript.fields],
+        'accounts': [{
+            'name': Parameter(str, "unix style account name", max = 254),
+            'keys': [{
+                'key_type': Key.fields['key_type'],
+                'key': Key.fields['key']
+            }],
+            }],
         'slivers': [{
             'name': Slice.fields['name'],
             'slice_id': Slice.fields['slice_id'],
@@ -214,6 +231,46 @@ class v43GetSlivers(Method):
 
        slivers = get_slivers(self.api, slice_ids, node)
 
+        # get the special accounts and keys needed for the node
+        # root
+        # site_admin
+        accounts = []
+        if False and 'site_id' not in node:
+            nodes = Nodes(self.api, node['node_id'])
+            node = nodes[0]
+
+        def getpersonsitekeys(site_id_or_name,theroles):
+            site_filter = site_id_or_name
+            site_return_filter = ['person_ids']
+            sites = Sites(self.api, site_filter, site_return_filter)
+            site = sites[0]
+            person_filter =  {'person_id':site['person_ids'],'enabled':True}
+            person_return_filter = ['person_id', 'enabled', 'key_ids','role_ids','roles'] 
+            site_persons = Persons(self.api, person_filter, person_return_filter)
+
+            # collect the keys into a table to weed out duplicates
+            site_keys = {}
+            for site_person in site_persons:
+                if site_person['enabled'] is False: continue
+                for role in theroles:
+                    if role in site_person['roles']:
+                        keys_filter = site_person['key_ids']
+                        keys_return_filter = ['key_id', 'key', 'key_type']
+                        keys = Keys(self.api, keys_filter, keys_return_filter)
+                        for key in keys:
+                            if key['key_type'] == 'ssh':
+                                site_keys[key['key']]=None
+            return site_keys.keys()
+
+        # 'site_admin' account setup
+        personsitekeys=getpersonsitekeys(node['site_id'],['pi','tech'])
+        accounts.append({'name':'site_admin','keys':personsitekeys})
+
+        # 'root' account setup on nodes from all 'admin' users
+        # registered with the PLC main site
+        personsitekeys=getpersonsitekeys(self.api.config.PLC_SLICE_PREFIX,['admin'])
+        accounts.append({'name':'root','keys':personsitekeys})
+
        node.update_last_contact()
 
         return {
@@ -224,19 +281,13 @@ class v43GetSlivers(Method):
             'groups': groups,
             'conf_files': conf_files.values(),
            'initscripts': initscripts,
-            'slivers': slivers
+            'slivers': slivers,
+            'accounts': accounts
             }
 
 class v42GetSlivers(v43GetSlivers):
     """
-    Returns a struct containing information about the specified node
-    (or calling node, if called by a node and node_id_or_hostname is
-    not specified), including the current set of slivers bound to the
-    node.
-
-    All of the information returned by this call can be gathered from
-    other calls, e.g. GetNodes, GetInterfaces, GetSlices, etc. This
-    function exists almost solely for the benefit of Node Manager.
+    Legacy wrapper for v43GetSlivers.
     """
 
     def call(self, auth, node_id_or_hostname = None):
@@ -254,4 +305,16 @@ class v42GetSlivers(v43GetSlivers):
         result['networks']=networks
         return result
 
-GetSlivers = v42GetSlivers
+class GetSlivers(v42GetSlivers):
+    """
+    Returns a struct containing information about the specified node
+    (or calling node, if called by a node and node_id_or_hostname is
+    not specified), including the current set of slivers bound to the
+    node.
+
+    All of the information returned by this call can be gathered from
+    other calls, e.g. GetNodes, GetInterfaces, GetSlices, etc. This
+    function exists almost solely for the benefit of Node Manager.
+    """
+
+    pass