X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=geni%2Faggregate.py;h=1db8ed14ed4555cc00e1d66cfa2f5dcc66acb1b6;hb=30f1cdbc93668bdd7ca5382dcb4bc104e2fd0724;hp=87746ce37749ee7434cd0d157d7e97ddb36f743a;hpb=e87e3e22848154e6606242dad8d0113fd38ed088;p=sfa.git diff --git a/geni/aggregate.py b/geni/aggregate.py index 87746ce3..1db8ed14 100644 --- a/geni/aggregate.py +++ b/geni/aggregate.py @@ -4,28 +4,33 @@ import datetime import time import xmlrpclib +from types import StringTypes, ListType from geni.util.geniserver import GeniServer from geni.util.geniclient import * from geni.util.cert import Keypair, Certificate +from geni.util.credential import Credential from geni.util.trustedroot import TrustedRootList from geni.util.excep import * from geni.util.misc import * from geni.util.config import Config from geni.util.rspec import Rspec +from geni.util.specdict import * +from geni.util.storage import SimpleStorage class Aggregate(GeniServer): hrn = None - nodes_file = None nodes_ttl = None - nodes = [] - whitelist_file = None - blacklist_file = None - policy = {} + nodes = None + slices = None + policy = None timestamp = None threshold = None shell = None registry = None + key_file = None + cert_file = None + credential = None ## # Create a new aggregate object. @@ -35,55 +40,106 @@ class Aggregate(GeniServer): # @param key_file private key filename of registry # @param cert_file certificate filename containing public key (could be a GID file) - def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/util/geni_config"): + def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/geni/util/geni_config"): GeniServer.__init__(self, ip, port, key_file, cert_file) - self.conf = Config(config) - basedir = self.conf.GENI_BASE_DIR + os.sep - server_basedir = basedir + os.sep + "geni" + os.sep - self.hrn = self.conf.GENI_INTERFACE_HRN - self.nodes_file = os.sep.join([server_basedir, 'components', self.hrn + '.comp']) - self.whitelist_file = os.sep.join([server_basedir, 'policy', 'whitelist']) - self.blacklist_file = os.sep.join([server_basedir, 'policy', 'blacklist']) - self.timestamp_file = os.sep.join([server_basedir, 'components', self.hrn + '.timestamp']) + self.key_file = key_file + self.cert_file = cert_file + self.config = Config(config) + self.basedir = self.config.GENI_BASE_DIR + os.sep + self.server_basedir = self.basedir + os.sep + "geni" + os.sep + self.hrn = self.config.GENI_INTERFACE_HRN + + nodes_file = os.sep.join([self.server_basedir, 'agg.' + self.hrn + '.components']) + self.nodes = SimpleStorage(nodes_file) + self.nodes.load() + + slices_file = os.sep.join([self.server_basedir, 'agg.' + self.hrn + '.slices']) + self.slices = SimpleStorage(slices_file) + self.slices.load() + + policy_file = os.sep.join([self.server_basedir, 'agg.' + self.hrn + '.policy']) + self.policy = SimpleStorage(policy_file, {'whitelist': [], 'blacklist': []}) + self.policy.load() + + timestamp_file = os.sep.join([self.server_basedir, 'agg.' + self.hrn + '.timestamp']) + self.timestamp = SimpleStorage(timestamp_file) + + # How long before we refresh nodes cache self.nodes_ttl = 1 - self.nodes = [] - self.policy = {'whitelist': [], 'blacklist': []} + self.connectPLC() self.connectRegistry() + self.loadCredential() def connectRegistry(self): """ Connect to the registry """ - pass + # connect to registry using GeniClient + address = self.config.GENI_REGISTRY_HOSTNAME + port = self.config.GENI_REGISTRY_PORT + url = 'http://%(address)s:%(port)s' % locals() + self.registry = GeniClient(url, self.key_file, self.cert_file) + def connectPLC(self): """ Connect to the plc api interface. First attempt to impor thte shell, if that fails try to connect to the xmlrpc server. """ - self.auth = {'Username': self.conf.GENI_PLC_USER, + self.auth = {'Username': self.config.GENI_PLC_USER, 'AuthMethod': 'password', - 'AuthString': self.conf.GENI_PLC_PASSWORD} + 'AuthString': self.config.GENI_PLC_PASSWORD} try: # try to import PLC.Shell directly - sys.path.append(self.conf.GENI_PLC_SHELL_PATH) + sys.path.append(self.config.GENI_PLC_SHELL_PATH) import PLC.Shell self.shell = PLC.Shell.Shell(globals()) self.shell.AuthCheck() except ImportError: # connect to plc api via xmlrpc - plc_host = self.conf.GENI_PLC_HOST - plc_port = self.conf.GENI_PLC_PORT - plc_api_path = self.conf.GENI_PLC_API_PATH + plc_host = self.config.GENI_PLC_HOST + plc_port = self.config.GENI_PLC_PORT + plc_api_path = self.config.GENI_PLC_API_PATH url = "https://%(plc_host)s:%(plc_port)s/%(plc_api_path)s/" % locals() - self.auth = {'Username': self.conf.GENI_PLC_USER, + self.auth = {'Username': self.config.GENI_PLC_USER, 'AuthMethod': 'password', - 'AuthString': self.conf.GENI_PLC_PASSWORD} + 'AuthString': self.config.GENI_PLC_PASSWORD} self.shell = xmlrpclib.Server(url, verbose = 0, allow_none = True) - self.shell.AuthCheck(self.auth) + self.shell.AuthCheck(self.auth) + + def loadCredential(self): + """ + Attempt to load credential from file if it exists. If it doesnt get + credential from registry. + """ + + ma_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".ma.cred" + + # see if this file exists + try: + self.credential = Credential(filename = ma_cred_filename) + except IOError: + self.credential = self.getCredentialFromRegistry() + + def getCredentialFromRegistry(self): + """ + Get our current credential from the registry + """ + # get self credential + self_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".cred" + self_cred = self.registry.get_credential(None, 'ma', self.hrn) + self_cred.save_to_file(self_cred_filename, save_parents = True) + + + # get ma credential + ma_cred_filename = self.server_basedir + os.sep + "agg." + self.hrn + ".ma.cred" + ma_cred = self.registry.get_credential(self_cred, 'ma', self.hrn) + ma_cred.save_to_file(ma_cred_filename, save_parents=True) + return ma_cred + def hostname_to_hrn(self, login_base, hostname): """ @@ -96,229 +152,335 @@ class Aggregate(GeniServer): """ Convert hrn to planetlab name. """ - slicename = slicename.replace("_", ".") - return ".".join([self.hrn, slicename]) + parts = slicename.split("_") + slice_hrn = ".".join([self.hrn, parts[0]]) + "." + "_".join(parts[1:]) + + return slice_hrn def refresh_components(self): """ - Update the cached list of nodes. + Update the cached list of nodes and save in 4 differnt formats + (rspec, dns, ip) """ - # resolve component hostnames - nodes = self.shell.GetNodes(self.auth, {}, ['hostname', 'site_id']) - - # resolve site login_bases - site_ids = [node['site_id'] for node in nodes] - sites = self.shell.GetSites(self.auth, site_ids, ['site_id', 'login_base']) - site_dict = {} - for site in sites: - site_dict[site['site_id']] = site['login_base'] - - # convert plc names to geni hrn - self.nodes = [self.hostname_to_hrn(site_dict[node['site_id']], node['hostname']) for node in nodes] - - # apply policy. Do not allow nodes found in blacklist, only allow nodes found in whitelist - whitelist_policy = lambda node: node in self.policy['whitelist'] - blacklist_policy = lambda node: node not in self.policy['blacklist'] - - if self.policy['blacklist']: - self.nodes = blacklist_policy(self.nodes) - if self.policy['whitelist']: - self.nodes = whitelist_policy(self.nodes) - + + # get node list in rspec format + rspec = Rspec() + rspec.parseString(self.get_rspec(self.hrn, 'aggregate')) + + # filter nodes according to policy + rspec.filter('NodeSpec', 'name', blacklist=self.policy['blacklist'], whitelist=self.policy['whitelist']) + + # extract ifspecs from rspec to get ip's + ips = [] + ifspecs = rspec.getDictsByTagName('IfSpec') + for ifspec in ifspecs: + if ifspec.has_key('addr') and ifspec['addr']: + ips.append(ifspec['addr']) + + # extract nodespecs from rspec to get dns names + hostnames = [] + nodespecs = rspec.getDictsByTagName('NodeSpec') + for nodespec in nodespecs: + if nodespec.has_key('name') and nodespec['name']: + hostnames.append(nodespec['name']) + + + node_details = {} + node_details['rspec'] = rspec.toxml() + node_details['ip'] = ips + node_details['dns'] = hostnames + # save state + self.nodes = SimpleStorage(self.nodes.db_filename, node_details) + self.nodes.write() + + # update timestamp and threshold - self.timestamp = datetime.datetime.now() + self.timestamp['timestamp'] = datetime.datetime.now() delta = datetime.timedelta(hours=self.nodes_ttl) - self.threshold = self.timestamp + delta - - f = open(self.nodes_file, 'w') - f.write(str(self.nodes)) - f.close() - f = open(self.timestamp_file, 'w') - f.write(str(self.threshold)) - f.close() + self.threshold = self.timestamp['timestamp'] + delta + self.timestamp.write() def load_components(self): """ Read cached list of nodes. """ # Read component list from cached file - if os.path.exists(self.nodes_file): - f = open(self.nodes_file, 'r') - self.nodes = eval(f.read()) - f.close() - + self.nodes.load() + self.timestamp.load() time_format = "%Y-%m-%d %H:%M:%S" - if os.path.exists(self.timestamp_file): - f = open(self.timestamp_file, 'r') - timestamp = str(f.read()).split(".")[0] - self.timestamp = datetime.datetime.fromtimestamp(time.mktime(time.strptime(timestamp, time_format))) - delta = datetime.timedelta(hours=self.nodes_ttl) - self.threshold = self.timestamp + delta - f.close() + timestamp = self.timestamp['timestamp'] + self.timestamp['timestamp'] = datetime.datetime.fromtimestamp(time.mktime(time.strptime(timestamp, time_format))) + delta = datetime.timedelta(hours=self.nodes_ttl) + self.threshold = self.timestamp['timestamp'] + delta def load_policy(self): """ Read the list of blacklisted and whitelisted nodes. """ - whitelist = [] - blacklist = [] - if os.path.exists(self.whitelist_file): - f = open(self.whitelist_file, 'r') - lines = f.readlines() - f.close() - for line in lines: - line = line.strip().replace(" ", "").replace("\n", "") - whitelist.extend(line.split(",")) - - - if os.path.exists(self.blacklist_file): - f = open(self.blacklist_file, 'r') - lines = f.readlines() - f.close() - for line in lines: - line = line.strip().replace(" ", "").replace("\n", "") - blacklist.extend(line.split(",")) + self.policy.load() - self.policy['whitelist'] = whitelist - self.policy['blacklist'] = blacklist - def get_components(self): + def getNodes(self, format = 'rspec'): """ Return a list of components at this aggregate. """ + valid_formats = ['rspec', 'hrn', 'dns', 'ip'] + if not format: + format = 'rspec' + if format not in valid_formats: + raise Exception, "Invalid format specified, must be one of the following: %s" \ + % ", ".join(valid_formats) + # Reload components list now = datetime.datetime.now() #self.load_components() - if not self.threshold or not self.timestamp or now > self.threshold: + if not self.threshold or not self.timestamp['timestamp'] or now > self.threshold: self.refresh_components() - elif now < self.threshold and not self.nodes: + elif now < self.threshold and not self.nodes.keys(): self.load_components() - return self.nodes - + return self.nodes[format] + + def getSlices(self): + """ + Return a list of instnatiated managed by this slice manager. + """ + + slices = self.shell.GetSlices(self.auth, {}, ['name']) + slice_hrns = [self.slicename_to_hrn(slice['name']) for slice in slices] + + return slice_hrns + def get_rspec(self, hrn, type): - rspec = Rspec() - rspec['nodespec'] = {'name': self.conf.GENI_INTERFACE_HRN} - rsepc['nodespec']['nodes'] = [] - if type in ['node']: + """ + Get resource information from PLC + """ + + # Get the required nodes + if type in ['aggregate']: nodes = self.shell.GetNodes(self.auth) + try: linkspecs = self.shell.GetLinkSpecs() # if call is supported + except: linkspecs = [] elif type in ['slice']: slicename = hrn_to_pl_slicename(hrn) slices = self.shell.GetSlices(self.auth, [slicename]) node_ids = slices[0]['node_ids'] nodes = self.shell.GetNodes(self.auth, node_ids) - for node in nodes: - nodespec = {'name': node['hostname'], 'type': 'std'} - elif type in ['aggregate']: - pass + + # Filter out whitelisted nodes + public_nodes = lambda n: n.has_key('slice_ids_whitelist') and not n['slice_ids_whitelist'] + nodes = filter(public_nodes, nodes) + + # Get all network interfaces + interface_ids = [] + for node in nodes: + interface_ids.extend(node['nodenetwork_ids']) + interfaces = self.shell.GetNodeNetworks(self.auth, interface_ids) + interface_dict = {} + for interface in interfaces: + interface_dict[interface['nodenetwork_id']] = interface + + # join nodes with thier interfaces + for node in nodes: + node['interfaces'] = [] + for nodenetwork_id in node['nodenetwork_ids']: + node['interfaces'].append(interface_dict[nodenetwork_id]) + + # convert and threshold to ints + if self.timestamp.has_key('timestamp') and self.timestamp['timestamp']: + timestamp = self.timestamp['timestamp'] + threshold = self.threshold + else: + timestamp = datetime.datetime.now() + delta = datetime.timedelta(hours=self.nodes_ttl) + threshold = timestamp + delta - return rspec + + start_time = int(timestamp.strftime("%s")) + end_time = int(threshold.strftime("%s")) + duration = end_time - start_time + + # create the plc dict + networks = [{'nodes': nodes, + 'links': linkspecs, + 'name': self.hrn, + 'start_time': start_time, + 'duration': duration}] + resources = {'networks': networks, 'start_time': start_time, 'duration': duration} + + # convert the plc dict to an rspec dict + resourceDict = RspecDict(resources) + # convert the rspec dict to xml + rspec = Rspec() + rspec.parseDict(resourceDict) + return rspec.toxml() - def get_resources(self, slice_hrn): + def getResources(self, slice_hrn): """ Return the current rspec for the specified slice. """ - slicename = hrn_to_plcslicename(slice_hrn) - rspec = self.get_rspec(slicenamem, 'slice') + rspec = self.get_rspec(slice_hrn, 'slice') return rspec - def create_slice(self, slice_hrn, rspec, attributes = []): + + def getTicket(self, hrn, rspec): """ - Instantiate the specified slice according to whats defined in the rspec. + Retrieve a ticket. This operation is currently implemented on PLC + only (see SFA, engineering decisions); it is not implemented on + components. + + @param name name of the slice to retrieve a ticket for + @param rspec resource specification dictionary + @return the string representation of a ticket object """ - slicename = self.hrn_to_plcslicename(slice_hrn) - spec = Rspec(rspec) - nodespecs = spec.getDictsByTagName('NodeSpec') - nodes = [nodespec['name'] for nodespec in nodespecs] - self.shell.AddSliceToNodes(self.auth, slicename, nodes) - for attribute in attributes: - type, value, node, nodegroup = attribute['type'], attribute['value'], attribute['node'], attribute['nodegroup'] - shell.AddSliceAttribute(self.auth, slicename, type, value, node, nodegroup) - - # XX contact the registry to get the list of users on this slice and - # their keys. - #slice_record = self.registry.resolve(slice_hrn) - #person_records = slice_record['users'] - # for person in person_record: - # email = person['email'] - # self.shell.AddPersonToSlice(self.auth, email, slicename) - + #self.registry.get_ticket(name, rspec) + + return - return 1 - def update_slice(self, slice_hrn, rspec, attributes = []): + def createSlice(self, slice_hrn, rspec, attributes = []): """ - Update the specified slice. + Instantiate the specified slice according to whats defined in the rspec. """ - # Get slice info - slicename = self.hrn_to_plcslicename(slice_hrn) - slices = self.shell.GetSlices(self.auth, [slicename], ['node_ids']) - if not slice: + + spec = Rspec(rspec) + # save slice state locally + # we can assume that spec object has been validated so its safer to + # save this instead of the unvalidated rspec the user gave us + self.slices[slice_hrn] = spec.toxml() + self.slices.write() + + # Get the slice record from geni + slice = {} + records = self.registry.resolve(self.cred, slice_hrn) + if not records: raise RecordNotFound(slice_hrn) - slice = slices[0] - + + for record in records: + if record.get_type() in ['slice']: + slice_info = record.as_dict() + slice = slice_info['pl_info'] + + # Make sure slice exists at plc, if it doesnt add it + slicename = hrn_to_pl_slicename(slice_hrn) + slices = self.shell.GetSlices(self.auth, [slicename], ['node_ids']) + if not slices: + # if site doesnt exist add it + parts = slicename.split("_") + login_base = parts[0] + sites = self.shell.GetSites(self.auth, [login_base]) + if not sites: + authority = get_authority(slice_hrn) + site_record = self.registry.reolve(self.cred, authority) + site_info = site_record.as_dict() + site = site_info['pl_info'] + + # add the site + site.pop('site_id') + site_id = self.shell.AddSite(self.auth, site) + else: + site = sites[0] + + self.shell.AddSlice(self.auth, slice_info) + + # get the list of valid slice users from the registry and make + # they are added to the slice + geni_info = slice_info['geni_info'] + researchers = geni_info['researcher'] + for researcher in researchers: + person_record = {} + person_records = self.registry.resolve(self.credential, researcher) + for record in person_records: + if record.get_type() in ['user']: + person_record = person_records[0] + if not person_record: + pass + person_dict = person_record.as_dict()['plc_info'] + persons = self.shell.GetPersons(self.auth, [person_dict['email']], ['person_id', 'key_ids']) + + # Create the person record + if not persons: + self.shell.AddPerson(self.auth, person_dict) + self.shell.AddPersonToSlice(self.auth, person_dict['email'], login_base) + # Add this person's public keys + for personkey in person_dict['keys']: + key = {'type': 'ssh', 'key': personkey} + self.shellAddPersonKey(self.auth, person_dict['email'], key) + # find out where this slice is currently running - nodes = self.shell.GetNodes(self.auth, slice['node_ids'], ['hostname']) - hostnames = [node['hostname'] for node in nodes] + nodelist = self.shell.GetNodes(self.auth, slice['node_ids'], ['hostname']) + hostnames = [node['hostname'] for node in nodelist] # get netspec details - spec = Rspec(rspec) nodespecs = spec.getDictsByTagName('NodeSpec') - nodes = [nodespec['name'] for nodespec in nodespecs] + nodes = [] + for nodespec in nodespecs: + if isinstance(nodespec['name'], list): + nodes.extend(nodespec['name']) + elif isinstance(nodespec['name'], StringTypes): + nodes.append(nodespec['name']) + + # save slice state locally + # we can assume that spec object has been validated so its safer to + # save this instead of the unvalidated rspec the user gave us + self.slices[slice_hrn] = spec.toxml() + self.slices.write() + # remove nodes not in rspec - delete_nodes = set(hostnames).difference(nodes) + deleted_nodes = list(set(hostnames).difference(nodes)) # add nodes from rspec - added_nodes = set(nodes).difference(hostnames) + added_nodes = list(set(nodes).difference(hostnames)) - shell.AddSliceToNodes(self.auth, slicename, added_nodes) - shell.DeleteSliceFromNodes(self.auth, slicename, deleted_nodes) + self.shell.AddSliceToNodes(self.auth, slicename, added_nodes) + self.shell.DeleteSliceFromNodes(self.auth, slicename, deleted_nodes) - for attribute in attributes: - type, value, node, nodegroup = attribute['type'], attribute['value'], attribute['node'], attribute['nodegroup'] - shell.AddSliceAttribute(self.auth, slicename, type, value, node, nodegroup) - - # contact registry to get slice users and add them to the slice - # slice_record = self.registry.resolve(slice_hrn) - # persons = slice_record['users'] - - #for person in persons: - # shell.AddPersonToSlice(person['email'], slice_name) - def delete_slice_(self, slice_hrn): + return 1 + + def updateSlice(self, slice_hrn, rspec, attributes = []): + return self.create_slice(slice_hrn, rspec, attributes) + + def deleteSlice(self, slice_hrn): """ Remove this slice from all components it was previouly associated with and free up the resources it was using. """ - slicename = self.hrn_to_plcslicename(slice_hrn) - slices = shell.GetSlices(self.auth, [slicename]) - if not slice: - raise RecordNotFound(slice_hrn) + if self.slices.has_key(slice_hrn): + self.slices.pop(slice_hrn) + self.slices.write() + + slicename = hrn_to_pl_slicename(slice_hrn) + slices = self.shell.GetSlices(self.auth, [slicename]) + if not slices: + return 1 slice = slices[0] - shell.DeleteSliceFromNodes(self.auth, slicename, slice['node_ids']) + self.shell.DeleteSliceFromNodes(self.auth, slicename, slice['node_ids']) return 1 - def start_slice(self, slice_hrn): + def startSlice(self, slice_hrn): """ Stop the slice at plc. """ - slicename = hrn_to_plcslicename(slice_hrn) + slicename = hrn_to_pl_slicename(slice_hrn) slices = self.shell.GetSlices(self.auth, {'name': slicename}, ['slice_id']) if not slices: - raise RecordNotFound(slice_hrn) + #raise RecordNotFound(slice_hrn) + return 1 slice_id = slices[0] atrribtes = self.shell.GetSliceAttributes({'slice_id': slice_id, 'name': 'enabled'}, ['slice_attribute_id']) attribute_id = attreibutes[0] self.shell.UpdateSliceAttribute(self.auth, attribute_id, "1" ) return 1 - def stop_slice(self, slice_hrn): + def stopSlice(self, slice_hrn): """ Stop the slice at plc """ - slicename = hrn_to_plcslicename(slice_hrn) + slicename = hrn_to_pl_slicename(slice_hrn) slices = self.shell.GetSlices(self.auth, {'name': slicename}, ['slice_id']) if not slices: - raise RecordNotFound(slice_hrn) + #raise RecordNotFound(slice_hrn) + return 1 slice_id = slices[0] atrribtes = self.shell.GetSliceAttributes({'slice_id': slice_id, 'name': 'enabled'}, ['slice_attribute_id']) attribute_id = attreibutes[0] @@ -326,14 +488,14 @@ class Aggregate(GeniServer): return 1 - def reset_slice(self, slice_hrn): + def resetSlice(self, slice_hrn): """ Reset the slice """ - slicename = self.hrn_to_plcslicename(slice_hrn) + # XX not yet implemented return 1 - def get_policy(self): + def getPolicy(self): """ Return this aggregates policy. """ @@ -346,60 +508,68 @@ class Aggregate(GeniServer): ## Server methods here for now ############################## - def components(self): - return self.get_components() - #def slices(self): - # return self.get_slices() + # XX fix rights, should be function name defined in + # privilege_table (from util/rights.py) + def list_nodes(self, cred): + self.decode_authentication(cred, 'listnodes') + return self.getNodes() - def resources(self, cred, hrn): - self.decode_authentication(cred, 'info') - self.verify_object_belongs_to_me(hrn) + def list_slices(self, cred): + self.decode_authentication(cred, 'listslices') + return self.getSlices() - return self.get_resources(hrn) + def get_resources(self, cred, hrn = None): + self.decode_authentication(cred, 'listnodes') + if not hrn: + return self.getNodes() + else: + return self.getResources(hrn) - def createSlice(self, cred, hrn, rspec): - self.decode_authentication(cred, 'embed') - self.verify_object_belongs_to_me(hrn) - return self.create_slice(hrn) + def get_ticket(self, cred, hrn, rspec): + self.decode_authentication(cred, 'getticket') + return self.getTicket(hrn, rspec) + + def get_policy(self, cred): + self.decode_authentication(cred, 'getpolicy') + return self.getPolicy() - def updateSlice(self, cred, hrn, rspec): - self.decode_authentication(cred, 'embed') - self.verify_object_belongs_to_me(hrn) - return self.update_slice(hrn) + def create_slice(self, cred, hrn, rspec): + self.decode_authentication(cred, 'createslice') + return self.createSlice(hrn, rspec) - def deleteSlice(self, cred, hrn): - self.decode_authentication(cred, 'embed') - self.verify_object_belongs_to_me(hrn) - return self.delete_slice(hrn) + def update_slice(self, cred, hrn, rspec): + self.decode_authentication(cred, 'updateslice') + return self.updateSlice(hrn) - def startSlice(self, cred, hrn): - self.decode_authentication(cred, 'control') - return self.start_slice(hrn) + def delete_slice(self, cred, hrn): + self.decode_authentication(cred, 'deleteslice') + return self.deleteSlice(hrn) - def stopSlice(self, cred, hrn): - self.decode_authentication(cred, 'control') - return self.stop(hrn) + def start_slice(self, cred, hrn): + self.decode_authentication(cred, 'startslice') + return self.startSlice(hrn) - def resetSlice(self, cred, hrn): - self.decode_authentication(cred, 'control') - return self.reset(hrn) + def stop_slice(self, cred, hrn): + self.decode_authentication(cred, 'stopslice') + return self.stopSlice(hrn) - def policy(self, cred): - self.decode_authentication(cred, 'info') - return self.get_policy() + def reset_slice(self, cred, hrn): + self.decode_authentication(cred, 'resetslice') + return self.resetSlice(hrn) def register_functions(self): GeniServer.register_functions(self) # Aggregate interface methods - self.server.register_function(self.components) - #self.server.register_function(self.slices) - self.server.register_function(self.resources) - self.server.register_function(self.createSlice) - self.server.register_function(self.deleteSlice) - self.server.register_function(self.startSlice) - self.server.register_function(self.stopSlice) - self.server.register_function(self.resetSlice) - self.server.register_function(self.policy) + self.server.register_function(self.list_nodes) + self.server.register_function(self.list_slices) + self.server.register_function(self.get_resources) + self.server.register_function(self.get_policy) + self.server.register_function(self.create_slice) + self.server.register_function(self.update_slice) + self.server.register_function(self.delete_slice) + self.server.register_function(self.start_slice) + self.server.register_function(self.stop_slice) + self.server.register_function(self.reset_slice)