-### $Id: slices.py 15842 2009-11-22 09:56:13Z anil $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/plc/slices.py $
-
import datetime
import time
import traceback
import sys
-
+import re
from types import StringTypes
-from sfa.util.namespace import *
+
+from sfa.util.faults import *
+from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn, Xrn
+from sfa.util.plxrn import slicename_to_hrn, hrn_to_pl_slicename, hostname_to_urn
from sfa.util.rspec import *
from sfa.util.specdict import *
-from sfa.util.faults import *
from sfa.util.record import SfaRecord
from sfa.util.policy import Policy
from sfa.util.record import *
from sfa.util.sfaticket import SfaTicket
-from sfa.util.debug import log
from sfa.plc.slices import Slices
from sfa.trust.credential import Credential
import sfa.plc.peers as peers
from sfa.plc.network import *
from sfa.plc.api import SfaAPI
from sfa.plc.slices import *
+from sfa.util.version import version_core
+from sfa.util.sfatime import utcparse
+from sfa.util.callids import Callids
-"""
-Create a new plauth object that the Aggregate Manager can use to execute
-plshell commands as the authenticated user.
-"""
-def __get_user_plauth(api, registry, credential, creds, operation, hrn):
- plauth = None
-
- user_creds = api.auth.checkCredentials(creds, operation, hrn)
- user_cred_obj = Credential(string=user_creds[0])
-
- # If user cred has a parent then the caller is the parent's cred.
- # This is true for delegated creds.
- if user_cred_obj.parent:
- user_hrn = user_cred_obj.parent.get_gid_caller().get_hrn()
- else:
- user_hrn = user_cred_obj.get_gid_caller().get_hrn()
-
- user_record = registry.Resolve(user_hrn, [credential])[0]
- email = user_record['email']
-
- person = api.plshell.GetPersons(api.plauth, email)
- if person:
- person_id = person[0]['person_id']
- # Get the user's session if one exists, create one otherwise
- session = api.plshell.GetSessions(api.plauth, {'person_id': person_id})
- if not session:
- session = api.plshell.AddSession(api.plauth, person_id)
- else:
- session = session[0]['session_id']
-
- # Create new authentication token
- plauth = {'Username':email, 'AuthMethod':'session', 'session':session}
-
- return plauth
-
+def GetVersion(api):
+ xrn=Xrn(api.hrn)
+ return version_core({'interface':'aggregate',
+ 'testbed':'myplc',
+ 'hrn':xrn.get_hrn(),
+ })
def __get_registry_objects(slice_xrn, creds, users):
"""
reg_objects = None
if users:
+ # dont allow special characters in the site login base
+ #only_alphanumeric = re.compile('[^a-zA-Z0-9]+')
+ #login_base = only_alphanumeric.sub('', hrn_auth[:20]).lower()
+ slicename = hrn_to_pl_slicename(hrn)
+ login_base = slicename.split('_')[0]
reg_objects = {}
-
site = {}
site['site_id'] = 0
- site['name'] = 'geni.%s' % hrn_auth[:20]
+ site['name'] = 'geni.%s' % login_base
site['enabled'] = True
site['max_slices'] = 100
# Note:
# Is it okay if this login base is the same as one already at this myplc site?
# Do we need uniqueness? Should use hrn_auth instead of just the leaf perhaps?
- site['login_base'] = hrn_auth[:20]
- site['abbreviated_name'] = hrn_auth[:20]
+ site['login_base'] = login_base
+ site['abbreviated_name'] = login_base
site['max_slivers'] = 1000
reg_objects['site'] = site
slice = {}
- slice['expires'] = int(time.mktime(Credential(string=creds[0]).get_lifetime().timetuple()))
+
+ extime = Credential(string=creds[0]).get_expiration()
+ # If the expiration time is > 60 days from now, set the expiration time to 60 days from now
+ if extime > datetime.datetime.utcnow() + datetime.timedelta(days=60):
+ extime = datetime.datetime.utcnow() + datetime.timedelta(days=60)
+ slice['expires'] = int(time.mktime(extime.timetuple()))
slice['hrn'] = hrn
- slice['name'] = site['login_base'] + "_" + get_leaf(hrn)
+ slice['name'] = hrn_to_pl_slicename(hrn)
slice['url'] = hrn
slice['description'] = hrn
slice['pointer'] = 0
for user in users:
user['key_ids'] = []
hrn, _ = urn_to_hrn(user['urn'])
- user['email'] = hrn + "@geni.net"
+ user['email'] = hrn_to_pl_slicename(hrn) + "@geni.net"
user['first_name'] = hrn
user['last_name'] = hrn
reg_objects['users'][user['email']] = user
hostnames.append(node.hostname)
return hostnames
-def get_version():
- version = {}
- version['geni_api'] = 1
- version['sfa'] = 1
- return version
-
def slice_status(api, slice_xrn, creds):
+ hrn, type = urn_to_hrn(slice_xrn)
+ # find out where this slice is currently running
+ api.logger.info(hrn)
+ slicename = hrn_to_pl_slicename(hrn)
+
+ slices = api.plshell.GetSlices(api.plauth, [slicename], ['node_ids','person_ids','name','expires'])
+ if len(slices) == 0:
+ raise Exception("Slice %s not found (used %s as slicename internally)" % slice_xrn, slicename)
+ slice = slices[0]
+
+ nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'],
+ ['hostname', 'site_id', 'boot_state', 'last_contact'])
+ site_ids = [node['site_id'] for node in nodes]
+ sites = api.plshell.GetSites(api.plauth, site_ids, ['site_id', 'login_base'])
+ sites_dict = {}
+ for site in sites:
+ sites_dict[site['site_id']] = site['login_base']
+
+ # XX remove me
+ #api.logger.info(slice_xrn)
+ #api.logger.info(slice)
+ #api.logger.info(nodes)
+ # XX remove me
+
result = {}
- result['geni_urn'] = slice_xrn
- result['geni_status'] = 'unknown'
- result['geni_resources'] = {}
+ top_level_status = 'unknown'
+ if nodes:
+ top_level_status = 'ready'
+ result['geni_urn'] = Xrn(slice_xrn, 'slice').get_urn()
+ result['pl_login'] = slice['name']
+ result['pl_expires'] = datetime.datetime.fromtimestamp(slice['expires']).ctime()
+
+ resources = []
+ for node in nodes:
+ res = {}
+ res['pl_hostname'] = node['hostname']
+ res['pl_boot_state'] = node['boot_state']
+ res['pl_last_contact'] = node['last_contact']
+ if not node['last_contact'] is None:
+ res['pl_last_contact'] = datetime.datetime.fromtimestamp(node['last_contact']).ctime()
+ res['geni_urn'] = hostname_to_urn(api.hrn, sites_dict[node['site_id']], node['hostname'])
+ if node['boot_state'] == 'boot':
+ res['geni_status'] = 'ready'
+ else:
+ res['geni_status'] = 'failed'
+ top_level_staus = 'failed'
+
+ res['geni_error'] = ''
+
+ resources.append(res)
+
+ result['geni_status'] = top_level_status
+ result['geni_resources'] = resources
+ # XX remove me
+ #api.logger.info(result)
+ # XX remove me
return result
-def create_slice(api, slice_xrn, creds, rspec, users):
+def CreateSliver(api, slice_xrn, creds, rspec, users, call_id):
"""
Create the sliver[s] (slice) at this aggregate.
Verify HRN and initialize the slice record in PLC if necessary.
"""
+ if Callids().already_handled(call_id): return False
+
reg_objects = __get_registry_objects(slice_xrn, creds, users)
hrn, type = urn_to_hrn(slice_xrn)
sfa_peer = slices.get_sfa_peer(hrn)
registry = api.registries[api.hrn]
credential = api.getCredential()
- site_id, remote_site_id = slices.verify_site(registry, credential, hrn,
- peer, sfa_peer, reg_objects)
+ (site_id, remote_site_id) = slices.verify_site(registry, credential, hrn,
+ peer, sfa_peer, reg_objects)
slice_record = slices.verify_slice(registry, credential, hrn, site_id,
- remote_site_id, peer, sfa_peer, reg_objects)
-
- user_plauth = __get_user_plauth(api, registry, credential, creds,
- "createsliver", hrn)
-
- # The Network instance will use user_plauth to call the PLCAPI
- network = Network(api, user_plauth)
+ remote_site_id, peer, sfa_peer, reg_objects)
+
+ network = Network(api)
slice = network.get_slice(api, hrn)
slice.peer_id = slice_record['peer_slice_id']
if peer:
api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice.id, peer)
- api.plshell.AddSliceToNodes(user_plauth, slice.name, added_nodes)
- api.plshell.DeleteSliceFromNodes(user_plauth, slice.name, deleted_nodes)
+ api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes)
+ api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes)
network.updateSliceTags()
slice.peer_id)
# print network.toxml()
+
return True
-def renew_slice(api, xrn, creds, exipration_time):
+def renew_slice(api, xrn, creds, expiration_time):
hrn, type = urn_to_hrn(xrn)
slicename = hrn_to_pl_slicename(hrn)
slices = api.plshell.GetSlices(api.plauth, {'name': slicename}, ['slice_id'])
if not slices:
raise RecordNotFound(hrn)
slice = slices[0]
- slice['expires'] = expiration_time
- api.plshell.UpdateSlice(api.plauth, slice['slice_id'], slice)
+ requested_time = utcparse(expiration_time)
+ record = {'expires': int(time.mktime(requested_time.timetuple()))}
+ api.plshell.UpdateSlice(api.plauth, slice['slice_id'], record)
return 1
def start_slice(api, xrn, creds):
return slice_urns
-def get_rspec(api, creds, options):
+# xxx Thierry : caching at the aggregate level sounds wrong...
+caching=True
+#caching=False
+def ListResources(api, creds, options,call_id):
+ if Callids().already_handled(call_id): return ""
# get slice's hrn from options
- xrn = options.get('geni_slice_urn', None)
- hrn, type = urn_to_hrn(xrn)
+ xrn = options.get('geni_slice_urn', '')
+ (hrn, type) = urn_to_hrn(xrn)
- """
# look in cache first
- if api.cache and not xrn:
+ if caching and api.cache and not xrn:
rspec = api.cache.get('nodes')
if rspec:
+ api.logger.info("aggregate.ListResources: returning cached value for hrn %s"%hrn)
return rspec
- """
- registry = api.registries[api.hrn]
- credential = api.getCredential()
- user_plauth = __get_user_plauth(api, registry, credential, creds,
- "listnodes", hrn)
-
- # The Network instance will use user_plauth to call the PLCAPI
- network = Network(api, user_plauth)
+ network = Network(api)
if (hrn):
if network.get_slice(api, hrn):
network.addSlice()
rspec = network.toxml()
- """
# cache the result
- if api.cache and not xrn:
+ if caching and api.cache and not xrn:
api.cache.add('nodes', rspec)
- """
+
return rspec
credential = api.getCredential()
records = registry.Resolve(xrn, credential)
- # similar to create_slice, we must verify that the required records exist
+ # similar to CreateSliver, we must verify that the required records exist
# at this aggregate before we can issue a ticket
site_id, remote_site_id = slices.verify_site(registry, credential, slice_hrn,
peer, sfa_peer, reg_objects)
def main():
api = SfaAPI()
"""
- rspec = get_rspec(api, "plc.princeton.sapan", None)
- #rspec = get_rspec(api, "plc.princeton.coblitz", None)
- #rspec = get_rspec(api, "plc.pl.sirius", None)
+ rspec = ListResources(api, "plc.princeton.sapan", None, 'pl_test_sapan')
+ #rspec = ListResources(api, "plc.princeton.coblitz", None, 'pl_test_coblitz')
+ #rspec = ListResources(api, "plc.pl.sirius", None, 'pl_test_sirius')
print rspec
"""
f = open(sys.argv[1])
xml = f.read()
f.close()
- create_slice(api, "plc.princeton.sapan", xml)
+ CreateSliver(api, "plc.princeton.sapan", xml, 'CreateSliver_sapan')
if __name__ == "__main__":
main()
git://git.onelab.eu / sfa.git / blobdiff