-# $Id$
-# $URL$
import time
from PLC.Faults import *
from PLC.Leases import Lease, Leases
from PLC.Timestamp import Duration
from PLC.Methods.GetSliceFamily import GetSliceFamily
+from PLC.PersonTags import PersonTag,PersonTags
from PLC.Accessors.Accessors_standard import *
MAXINT = 2L**31-1
# slice_filter essentially contains the slice_ids for the relevant slices (on the node + system & delegated slices)
-def get_slivers(api, auth, slice_filter, node = None):
+def get_slivers(api, caller, auth, slice_filter, node = None):
# Get slice information
slices = Slices(api, slice_filter, ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids'])
# Do not set any nodegroup slice attributes for
# which there is at least one sliver attribute
# already set.
- if slice_tag not in slice_tags:
+ if slice_tag['tagname'] not in sliver_attributes:
+ sliver_attributes.append(slice_tag['tagname'])
attributes.append({'tagname': slice_tag['tagname'],
- 'value': slice_tag['value']})
+ 'value': slice_tag['value']})
- for slice_tag in [ a for a in slice_tags if a['node_id'] is None ]:
+ for slice_tag in [ a for a in slice_tags if a['node_id'] is None and a['nodegroup_id'] is None ]:
# Do not set any global slice attributes for
# which there is at least one sliver attribute
# already set.
if slice['expires'] > MAXINT: slice['expires']= MAXINT
# expose the slice vref as computed by GetSliceFamily
- family = GetSliceFamily (api).call(auth, slice['slice_id'])
+ family = GetSliceFamily (api,caller).call(auth, slice['slice_id'])
slivers.append({
'name': slice['name'],
}
def call(self, auth, node_id_or_hostname = None):
+ return self.raw_call(auth, node_id_or_hostname)
+
+
+ def raw_call(self, auth, node_id_or_hostname):
timestamp = int(time.time())
# Get node
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, auth, slice_ids, node)
+ slivers = get_slivers(self.api, self.caller, auth, slice_ids, node)
# get the special accounts and keys needed for the node
# root
# reduce ( reduce_flatten_list, [ [1] , [2,3] ], []) => [ 1,2,3 ]
def reduce_flatten_list (x,y): return x+y
+ # root users are users marked with the tag 'isrootonsite'. Hack for Mlab and other sites in which admins participate in diagnosing problems.
+ def get_site_root_user_keys(api,site_id_or_name):
+ site = Sites (api,site_id_or_name,['person_ids'])[0]
+ all_site_persons = site['person_ids']
+ all_site_person_tags = PersonTags(self.api,{'person_id':all_site_persons,'tagname':'isrootonsite'},['value','person_id'])
+ site_root_person_tags = filter(lambda r:r['value']=='true',all_site_person_tags)
+ site_root_person_ids = map(lambda r:r['person_id'],site_root_person_tags)
+ key_ids = reduce (reduce_flatten_list,
+ [ p['key_ids'] for p in \
+ Persons(api,{ 'person_id':site_root_person_ids,
+ 'enabled':True, '|role_ids' : [20, 40] },
+ ['key_ids']) ],
+ [])
+ return [ key['key'] for key in Keys (api, key_ids) if key['key_type']=='ssh']
+
# power users are pis and techs
def get_site_power_user_keys(api,site_id_or_name):
site = Sites (api,site_id_or_name,['person_ids'])[0]
personsitekeys=get_site_power_user_keys(self.api,node['site_id'])
accounts.append({'name':'site_admin','keys':personsitekeys})
- # 'root' account setup on nodes from all 'admin' users
+ # 'root' account setup on nodes from all 'admin' users and ones marked with 'isrootonsite' for this site
+ siterootkeys=get_site_root_user_keys(self.api,node['site_id'])
personsitekeys=get_all_admin_keys(self.api)
+ personsitekeys.extend(siterootkeys)
+
accounts.append({'name':'root','keys':personsitekeys})
- hrn = GetNodeHrn(self.api).call(auth,node['node_id'])
+ hrn = GetNodeHrn(self.api,self.caller).call(auth,node['node_id'])
# XMPP config for omf federation
try:
if not self.api.config.PLC_OMF_ENABLED:
- raise Exception,"OMF disabled"
- xmpp={'server':self.api.config.PLC_OMF_XMPP_SERVER,
- 'user':self.api.config.PLC_OMF_XMPP_USER,
- 'password':self.api.config.PLC_OMF_XMPP_PASSWORD,
- }
+ raise Exception,"OMF not enabled"
+ xmpp={'server':self.api.config.PLC_OMF_XMPP_SERVER}
except:
- xmpp={'server':None,'user':None,'password':None}
+ xmpp={'server':None}
node.update_last_contact()
}) ]
granularity=self.api.config.PLC_RESERVATION_GRANULARITY
- return {
+ raw_data = {
'timestamp': timestamp,
'node_id': node['node_id'],
'hostname': node['hostname'],
'reservation_policy': reservation_policy,
'leases':leases,
'lease_granularity': granularity,
- }
+ }
+
+ sanitized_data = sanitize_for_pickle (raw_data)
+ return sanitized_data
+