X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_vini.py;h=d961443590d024c3c453ff3307443f3a077007cf;hb=5307e4e09dd0a7982f0c6dfdd13065425c802005;hp=418f034f824e0be27aa25befac377c562329f346;hpb=c805ff7f9d7a6eea97143767a83282944ab3dede;p=sfa.git diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py index 418f034f..d9614435 100644 --- a/sfa/managers/aggregate_manager_vini.py +++ b/sfa/managers/aggregate_manager_vini.py @@ -1,195 +1,132 @@ -from sfa.util.faults import * -from sfa.util.namespace import * -from sfa.server.registry import Registries -from sfa.plc.nodes import * -from sfa.plc.api import * -from sfa.rspecs.aggregates.vini.utils import * +import datetime +import time +import traceback import sys -""" -Copied from create_slice_aggregate() in sfa.plc.slices -""" -def create_slice_vini_aggregate(api, hrn, nodes): - # Get the slice record - slice = {} - registries = Registries(api) - registry = registries[api.hrn] - credential = api.getCredential() - records = registry.resolve(credential, hrn) - for record in records: - if record['type'] in ['slice']: - slice = record - if not slice: - raise RecordNotFound(hrn) - - # Make sure slice exists at plc, if it doesnt add it +from types import StringTypes +from sfa.util.xrn import urn_to_hrn, Xrn +from sfa.util.plxrn import hrn_to_pl_slicename +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.server.registry import Registries +from sfa.plc.slices import Slices +import sfa.plc.peers as peers +from sfa.managers.vini.vini_network import * +from sfa.plc.api import SfaAPI +from sfa.plc.slices import * +from sfa.managers.aggregate_manager_pl import __get_registry_objects, __get_hostnames +from sfa.util.version import version_core +from sfa.util.callids import Callids + +# VINI aggregate is almost identical to PLC aggregate for many operations, +# so lets just import the methods form the PLC manager +from sfa.managers.aggregate_manager_pl import ( +start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket, slice_status) + + +def GetVersion(api): + xrn=Xrn(api.hrn) + return version_core({'interface':'aggregate', + 'testbed':'myplc.vini', + 'hrn':xrn.get_hrn(), + }) + +def DeleteSliver(api, xrn, creds, call_id): + if Callids().already_handled(call_id): return "" + (hrn, type) = urn_to_hrn(xrn) slicename = hrn_to_pl_slicename(hrn) - slices = api.plshell.GetSlices(api.plauth, [slicename], ['node_ids']) + slices = api.plshell.GetSlices(api.plauth, {'name': slicename}) if not slices: - parts = slicename.split("_") - login_base = parts[0] - # if site doesnt exist add it - sites = api.plshell.GetSites(api.plauth, [login_base]) - if not sites: - authority = get_authority(hrn) - site_records = registry.resolve(credential, authority) - site_record = {} - if not site_records: - raise RecordNotFound(authority) - site = site_records[0] - - # add the site - site.pop('site_id') - site_id = api.plshell.AddSite(api.plauth, site) - else: - site = sites[0] - - slice_fields = {} - slice_keys = ['name', 'url', 'description'] - for key in slice_keys: - if key in slice and slice[key]: - slice_fields[key] = slice[key] - api.plshell.AddSlice(api.plauth, slice_fields) - slice = slice_fields - slice['node_ids'] = 0 - else: - slice = slices[0] - - # get the list of valid slice users from the registry and make - # they are added to the slice - researchers = record.get('researcher', []) - for researcher in researchers: - person_record = {} - person_records = registry.resolve(credential, researcher) - for record in person_records: - if record['type'] in ['user']: - person_record = record - if not person_record: - pass - person_dict = person_record - persons = api.plshell.GetPersons(api.plauth, [person_dict['email']], - ['person_id', 'key_ids']) - - # Create the person record - if not persons: - person_id=api.plshell.AddPerson(api.plauth, person_dict) - - # The line below enables the user account on the remote aggregate - # soon after it is created. - # without this the user key is not transfered to the slice - # (as GetSlivers returns key of only enabled users), - # which prevents the user from login to the slice. - # We may do additional checks before enabling the user. - - api.plshell.UpdatePerson(api.plauth, person_id, {'enabled' : True}) - key_ids = [] - else: - key_ids = persons[0]['key_ids'] - - api.plshell.AddPersonToSlice(api.plauth, person_dict['email'], - slicename) - - # Get this users local keys - keylist = api.plshell.GetKeys(api.plauth, key_ids, ['key']) - keys = [key['key'] for key in keylist] - - # add keys that arent already there - for personkey in person_dict['keys']: - if personkey not in keys: - key = {'key_type': 'ssh', 'key': personkey} - api.plshell.AddPersonKey(api.plauth, person_dict['email'], key) - - # find out where this slice is currently running - nodelist = api.plshell.GetNodes(api.plauth, slice['node_ids'], - ['hostname']) - hostnames = [node['hostname'] for node in nodelist] + return 1 + slice = slices[0] - # remove nodes not in rspec - deleted_nodes = list(set(hostnames).difference(nodes)) - # add nodes from rspec - added_nodes = list(set(nodes).difference(hostnames)) + api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids']) + return 1 +def CreateSliver(api, xrn, creds, xml, users, call_id): """ - print >> sys.stderr, "Slice on nodes:" - for n in hostnames: - print >> sys.stderr, n - print >> sys.stderr, "Wants nodes:" - for n in nodes: - print >> sys.stderr, n - print >> sys.stderr, "Deleting nodes:" - for n in deleted_nodes: - print >> sys.stderr, n - print >> sys.stderr, "Adding nodes:" - for n in added_nodes: - print >> sys.stderr, n + Verify HRN and initialize the slice record in PLC if necessary. """ - api.plshell.AddSliceToNodes(api.plauth, slicename, added_nodes) - api.plshell.DeleteSliceFromNodes(api.plauth, slicename, deleted_nodes) + if Callids().already_handled(call_id): return "" - return 1 + hrn, type = urn_to_hrn(xrn) + peer = None + reg_objects = __get_registry_objects(xrn, creds, users) + slices = Slices(api) + peer = slices.get_peer(hrn) + sfa_peer = slices.get_sfa_peer(hrn) + registries = Registries(api) + registry = registries[api.hrn] + credential = api.getCredential() + site_id, remote_site_id = slices.verify_site(registry, credential, hrn, + peer, sfa_peer, reg_objects) + slice = slices.verify_slice(registry, credential, hrn, site_id, + remote_site_id, peer, sfa_peer, reg_objects) -def get_rspec(api, xrn, origin_hrn): - hrn = urn_to_hrn(xrn)[0] - topo = Topology(api) - if (hrn): - slicename = hrn_to_pl_slicename(hrn) - slice = get_slice(api, slicename) - if slice: - slice.hrn = hrn - topo.nodeTopoFromSliceTags(slice) - else: - # call the default sfa.plc.nodes.get_rspec() method - return Nodes(api).get_rspec(hrn) + network = ViniNetwork(api) - return topo.toxml(hrn) + slice = network.get_slice(api, hrn) + current = __get_hostnames(slice.get_nodes()) + network.addRSpec(xml, "/var/www/html/schemas/vini.rng") + #network.addRSpec(xml, "/root/SVN/sfa/trunk/sfa/managers/vini/vini.rng") + request = __get_hostnames(network.nodesWithSlivers()) + + # remove nodes not in rspec + deleted_nodes = list(set(current).difference(request)) + # add nodes from rspec + added_nodes = list(set(request).difference(current)) -""" -Hook called via 'sfi.py create' -""" -def create_slice(api, xrn, xml): - hrn = urn_to_hrn(xrn)[0] - topo = Topology(api) - topo.nodeTopoFromRSpec(xml) + api.plshell.AddSliceToNodes(api.plauth, slice.name, added_nodes) + api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes) + network.updateSliceTags() - # Check request against current allocations - topo.verifyNodeTopo(hrn, topo) + # xxx - check this holds enough data for the client to understand what's happened + return network.toxml() + +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', '') + hrn, type = urn_to_hrn(xrn) - nodes = topo.nodesInTopo() - hostnames = [] - for node in nodes: - hostnames.append(node.hostname) - create_slice_vini_aggregate(api, hrn, hostnames) + # look in cache first + if api.cache and not xrn: + rspec = api.cache.get('nodes') + if rspec: + return rspec - slicename = hrn_to_pl_slicename(hrn) - slice = get_slice(api, slicename) - if slice: - topo.updateSliceTags(slice) + network = ViniNetwork(api) + if (hrn): + if network.get_slice(api, hrn): + network.addSlice() - # print topo.toxml(hrn) + rspec = network.toxml() - return True + # cache the result + if api.cache and not xrn: + api.cache.add('nodes', rspec) -""" -Returns the request context required by sfatables. At some point, this mechanism should be changed -to refer to "contexts", which is the information that sfatables is requesting. But for now, we just -return the basic information needed in a dict. -""" -def fetch_context(slice_hrn, user_hrn, contexts): - base_context = {'sfa':{'user':{'hrn':user_hrn}, - 'slice':{'hrn':slice_hrn}}} - return base_context + return rspec def main(): api = SfaAPI() - #rspec = get_rspec(api, "plc.princeton.iias", None) - #print rspec + """ + #rspec = ListResources(api, None, None,) + rspec = ListResources(api, "plc.princeton.iias", None, 'vini_test') + print rspec + """ f = open(sys.argv[1]) xml = f.read() f.close() - create_slice(api, "plc.princeton.iias", xml) + CreateSliver(api, "plc.princeton.iias", xml, 'call-id-iias') if __name__ == "__main__": main()