From: Sandrine Avakian Date: Fri, 21 Oct 2011 16:31:03 +0000 (+0200) Subject: Fixed listing resources (resources cmd from client). X-Git-Tag: sfa-2.1-24~3^2~320 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=947c0552b95675999f87187138d9edaf05d8b5e2 Fixed listing resources (resources cmd from client). Added modifications from master to aggregate manager. --- diff --git a/sfa/managers/aggregate_manager_slab.py b/sfa/managers/aggregate_manager_slab.py index 81051c25..91c00700 100644 --- a/sfa/managers/aggregate_manager_slab.py +++ b/sfa/managers/aggregate_manager_slab.py @@ -8,7 +8,7 @@ import re from types import StringTypes from sfa.util.faults import * -from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn, Xrn +from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn, Xrn, urn_to_sliver_id 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 * @@ -20,37 +20,42 @@ 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.senslab.OARrestapi import * from sfa.senslab.api import SfaAPI #from sfa.plc.aggregate import Aggregate from sfa.plc.slices import * from sfa.util.version import version_core -from sfa.rspecs.rspec_version import RSpecVersion -from sfa.rspecs.sfa_rspec import sfa_rspec_version -from sfa.rspecs.pl_rspec_version import * -#from sfa.rspecs.pg_rspec import pg_rspec_version -from sfa.rspecs.pg_rspec import pg_rspec_ad_version, pg_rspec_request_version -from sfa.rspecs.rspec_parser import parse_rspec +from sfa.rspecs.version_manager import VersionManager +from sfa.rspecs.rspec import RSpec from sfa.util.sfatime import utcparse from sfa.util.callids import Callids from sfa.senslab.OARrspec import * #from sfa.plc.aggregate import Aggregate def GetVersion(api): - print>>sys.stderr, "\r\n AGGREGATE GET_VERSION " - xrn=Xrn(api.hrn) - supported_rspecs = [dict(pg_rspec_request_version), dict(sfa_rspec_version)] - ad_rspec_versions = [dict(pg_rspec_ad_version), dict(sfa_rspec_version)] - version_more = {'interface':'aggregate', - 'testbed':'senslab', - 'hrn':xrn.get_hrn(), - 'request_rspec_versions': request_rspec_versions, - 'ad_rspec_versions': ad_rspec_versions, - 'default_ad_rspec': dict(sfa_rspec_version) - } - print>>sys.stderr, "\r\n AGGREGATE GET_VERSION : %s \r\n \r\n" %(version_core(version_more)) - return version_core(version_more) + print>>sys.stderr, "\r\n AGGREGATE GET_VERSION " + #xrn=Xrn(api.hrn) + #supported_rspecs = [dict(pg_rspec_request_version), dict(sfa_rspec_version)] + #ad_rspec_versions = [dict(pg_rspec_ad_version), dict(sfa_rspec_version)] + version_manager = VersionManager() + ad_rspec_versions = [] + request_rspec_versions = [] + for rspec_version in version_manager.versions: + if rspec_version.content_type in ['*', 'ad']: + ad_rspec_versions.append(rspec_version.to_dict()) + if rspec_version.content_type in ['*', 'request']: + request_rspec_versions.append(rspec_version.to_dict()) + default_rspec_version = version_manager.get_version("sfa 1").to_dict() + xrn=Xrn(api.hrn) + version_more = {'interface':'aggregate', + 'testbed':'senslab', + 'hrn':xrn.get_hrn(), + 'request_rspec_versions': request_rspec_versions, + 'ad_rspec_versions': ad_rspec_versions, + 'default_ad_rspec': default_rspec_version + } + print>>sys.stderr, "\r\n AGGREGATE GET_VERSION : %s \r\n \r\n" %(version_core(version_more)) + return version_core(version_more) def __get_registry_objects(slice_xrn, creds, users): """ @@ -178,47 +183,68 @@ def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): print>>sys.stderr, " \r\n AGGREGATE CreateSliver-----------------> " if Callids().already_handled(call_id): return "" - reg_objects = __get_registry_objects(slice_xrn, creds, users) - - (hrn, type) = urn_to_hrn(slice_xrn) - peer = None + #reg_objects = __get_registry_objects(slice_xrn, creds, users) aggregate = Aggregate(api) slices = Slices(api) + (hrn, type) = urn_to_hrn(slice_xrn) + peer = slices.get_peer(hrn) 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) - - slice = slices.verify_slice(registry, credential, hrn, site_id, - remote_site_id, peer, sfa_peer, reg_objects) + slice_record=None + if users: + slice_record = users[0].get('slice_record', {}) + + #registry = api.registries[api.hrn] + #credential = api.getCredential() + #(site_id, remote_site_id) = slices.verify_site(registry, credential, hrn, + #peer, sfa_peer, reg_objects) + # parse rspec + rspec = RSpec(rspec_string) + requested_attributes = rspec.version.get_slice_attributes() + + # ensure site record exists + site = slices.verify_site(hrn, slice_record, peer, sfa_peer) + # ensure slice record exists + slice = slices.verify_slice(hrn, slice_record, peer, sfa_peer) + # ensure person records exists + persons = slices.verify_persons(hrn, slice, users, peer, sfa_peer) + # ensure slice attributes exists + slices.verify_slice_attributes(slice, requested_attributes) + + # add/remove slice from nodes + requested_slivers = [str(host) for host in rspec.version.get_nodes_with_slivers()] + slices.verify_slice_nodes(slice, requested_slivers, peer) - nodes = api.oar.GetNodes(slice['node_ids'], ['hostname']) - current_slivers = [node['hostname'] for node in nodes] - rspec = parse_rspec(rspec_string) - requested_slivers = [str(host) for host in rspec.get_nodes_with_slivers()] - # remove nodes not in rspec - deleted_nodes = list(set(current_slivers).difference(requested_slivers)) - - # add nodes from rspec - added_nodes = list(set(requested_slivers).difference(current_slivers)) - - try: - if peer: - api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) - - api.plshell.AddSliceToNodes(api.plauth, slice['name'], added_nodes) - api.plshell.DeleteSliceFromNodes(api.plauth, slice['name'], deleted_nodes) - - # TODO: update slice tags - #network.updateSliceTags() - - finally: - if peer: - api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, - slice.peer_id) - + + + #nodes = api.oar.GetNodes(slice['node_ids'], ['hostname']) + #current_slivers = [node['hostname'] for node in nodes] + #rspec = parse_rspec(rspec_string) + #requested_slivers = [str(host) for host in rspec.get_nodes_with_slivers()] + ## remove nodes not in rspec + #deleted_nodes = list(set(current_slivers).difference(requested_slivers)) + + ## add nodes from rspec + #added_nodes = list(set(requested_slivers).difference(current_slivers)) + + #try: + #if peer: + #api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) + + #api.plshell.AddSliceToNodes(api.plauth, slice['name'], added_nodes) + #api.plshell.DeleteSliceFromNodes(api.plauth, slice['name'], deleted_nodes) + + ## TODO: update slice tags + ##network.updateSliceTags() + + #finally: + #if peer: + #api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, + #slice.peer_id) + # hanlde MyPLC peer association. + # only used by plc and ple. + #slices.handle_peer(site, slice, persons, peer) + return aggregate.get_rspec(slice_xrn=slice_xrn, version=rspec.version) @@ -323,29 +349,43 @@ def ListResources(api, creds, options,call_id): # get slice's hrn from options xrn = options.get('geni_slice_urn', '') (hrn, type) = urn_to_hrn(xrn) - + + version_manager = VersionManager() # get the rspec's return format from options - rspec_version = RSpecVersion(options.get('rspec_version')) - version_string = "rspec_%s" % (rspec_version.get_version_name()) + rspec_version = version_manager.get_version(options.get('rspec_version')) + version_string = "rspec_%s" % (rspec_version.to_string()) #panos adding the info option to the caching key (can be improved) if options.get('info'): - version_string = version_string + "_"+options.get('info') + version_string = version_string + "_"+options.get('info', 'default') print >>sys.stderr, "[aggregate] version string = %s "%(version_string) - - rspec = None - - if rspec_version['type'].lower() == 'protogeni': - spec = PGRSpec() - #panos pass user options to SfaRSpec - elif rspec_version['type'].lower() == 'sfa': - rspec = SfaRSpec("",{},options) - else: - rspec = SfaRSpec("",{},options) + + # look in cache first + if caching and api.cache and not xrn: + rspec = api.cache.get(version_string) + if rspec: + api.logger.info("aggregate.ListResources: returning cached value for hrn %s"%hrn) + return rspec + + #panos: passing user-defined options + #print "manager options = ",options + OAR_rspec = OARrspec(api,options) + #aggregate = Aggregate(api, options) + rspec = OAR_rspec.get_rspec(slice_xrn=xrn, version=rspec_version) + # cache the result + if caching and api.cache and not xrn: + api.cache.add(version_string, rspec) + + #if rspec_version['type'].lower() == 'protogeni': + #spec = PGRSpec() + ##panos pass user options to SfaRSpec + #elif rspec_version['type'].lower() == 'sfa': + #rspec = SfaRSpec("",{},options) + #else: + #rspec = SfaRSpec("",{},options) - OAR_rspec = OARrspec() rspec = OAR_rspec.get_rspec(slice_xrn=xrn, version=rspec_version) print >>sys.stderr, '\r\n OARImporter.GetNodes()', OARImporter.GetNodes() diff --git a/sfa/managers/slice_manager_slab.py b/sfa/managers/slice_manager_slab.py index 81a99e22..a0e1e5ac 100644 --- a/sfa/managers/slice_manager_slab.py +++ b/sfa/managers/slice_manager_slab.py @@ -37,6 +37,24 @@ import sfa.plc.peers as peers from sfa.util.version import version_core from sfa.util.callids import Callids +def _call_id_supported(api, server): + """ + Returns true if server support the optional call_id arg, false otherwise. + """ + server_version = api.get_cached_server_version(server) + + if 'sfa' in server_version: + code_tag = server_version['code_tag'] + code_tag_parts = code_tag.split("-") + + version_parts = code_tag_parts[0].split(".") + major, minor = version_parts[0:2] + rev = code_tag_parts[1] + if int(major) > 1: + if int(minor) > 0 or int(rev) > 20: + return True + return False + # we have specialized xmlrpclib.ServerProxy to remember the input url # OTOH it's not clear if we're only dealing with XMLRPCServerProxy instances def get_serverproxy_url (server): diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py index bdfd2e01..b0063f60 100644 --- a/sfa/senslab/OARrestapi.py +++ b/sfa/senslab/OARrestapi.py @@ -5,8 +5,8 @@ import json from sfa.senslab.parsing import * from sfa.senslab.SenslabImportUsers import * -#OARIP='10.127.255.254' -OARIP='192.168.0.109' +OARIP='10.127.255.254' +#OARIP='192.168.0.109' OARrequests_list = ["GET_version", "GET_timezone", "GET_jobs", "GET_jobs_table", "GET_jobs_details", diff --git a/sfa/senslab/OARrspec.py b/sfa/senslab/OARrspec.py index 039b5797..b5028e02 100644 --- a/sfa/senslab/OARrspec.py +++ b/sfa/senslab/OARrspec.py @@ -15,10 +15,11 @@ import json from sfa.util.xrn import * from sfa.util.plxrn import * -from sfa.rspecs.sfa_rspec import SfaRSpec -from sfa.rspecs.pg_rspec import PGRSpec -from sfa.rspecs.rspec_version import RSpecVersion - +#from sfa.rspecs.sfa_rspec import SfaRSpec +from sfa.rspecs.rspec import RSpec +#from sfa.rspecs.pg_rspec import PGRSpec +#from sfa.rspecs.rspec_version import RSpecVersion +from sfa.rspecs.version_manager import VersionManager from sfa.senslab.OARrestapi import * class OARrspec: @@ -69,7 +70,7 @@ class OARrspec: if not self.prepared or force: self.prepare_sites(force) self.prepare_nodes(force) - self.prepare_links(force) + #self.prepare_links(force) #self.prepare_interfaces(force) #self.prepare_node_tags(force) # add site/interface info to nodes @@ -85,24 +86,28 @@ class OARrspec: node['site'] = site #node['interfaces'] = interfaces #node['tags'] = tags - - print >>sys.stderr, "\r\n OAR prepare ", node + print >>sys.stderr, "\r\n OAR prepare ", node + self.prepared = True - + +#from plc/aggregate.py def get_rspec(self, slice_xrn=None, version = None): print>>sys.stderr, " \r\n OARrspec \t\t get_spec **************\r\n" self.prepare() rspec = None - rspec_version = RSpecVersion(version) - print >>sys.stderr, '\r\n \t\t rspec_version type', rspec_version['type'] - if rspec_version['type'].lower() == 'sfa': - rspec = SfaRSpec("",{},self.user_options) + version_manager = VersionManager() + version = version_manager.get_version(version) + #rspec_version = RSpecVersion(version) + #print >>sys.stderr, '\r\n \t\t rspec_version type',version_manager['type'] + + if not slice_xrn: + rspec_version = version_manager._get_version(version.type, version.version, 'ad') else: - rspec = SfaRSpec("",{},self.user_options) - - - rspec.add_nodes(self.nodes.values()) + rspec_version = version_manager._get_version(version.type, version.version, 'manifest') + + rspec = RSpec(version=rspec_version, user_options=self.user_options) + rspec.version.add_nodes(self.nodes.values()) print >>sys.stderr, 'after add_nodes'