X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=geni%2Fslicemgr.py;h=911833bca8e508c82ac0c05a443a67ea0f8d3947;hb=cf0261fce639a92424de847e5a605c43d0153f17;hp=b3aafea4033a38f9b38daf1caab8df6b14f9468d;hpb=e020733c48fe36df351ad04f1ea8f697769c2ef4;p=sfa.git diff --git a/geni/slicemgr.py b/geni/slicemgr.py index b3aafea4..911833bc 100644 --- a/geni/slicemgr.py +++ b/geni/slicemgr.py @@ -13,7 +13,7 @@ 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 +from geni.util.storage import SimpleStorage, XmlStorage class SliceMgr(GeniServer): @@ -50,18 +50,21 @@ class SliceMgr(GeniServer): self.time_format = "%Y-%m-%d %H:%M:%S" # Get list of aggregates this sm talks to - # XX do we use simplestorage to maintain this file manually? - aggregates_file = self.server_basedir + os.sep + 'aggregates' - self.aggregates = SimpleStorage(aggregates_file) + aggregates_file = self.server_basedir + os.sep + 'aggregates.xml' + self.aggregate_info = XmlStorage(aggregates_file, {'aggregates': {'aggregate': []}} ) + self.aggregate_info.load() + # Get cached list of nodes (rspec) nodes_file = os.sep.join([self.server_basedir, 'smgr.' + self.hrn + '.components']) self.nodes = SimpleStorage(nodes_file) self.nodes.load() - slices_file = os.sep.join([self.server_basedir, 'smgr' + self.hrn + '.slices']) + # Get cacheds slice states + slices_file = os.sep.join([self.server_basedir, 'smgr.' + self.hrn + '.slices']) self.slices = SimpleStorage(slices_file) self.slices.load() + # Get the policy policy_file = os.sep.join([self.server_basedir, 'smgr.' + self.hrn + '.policy']) self.policy = SimpleStorage(policy_file, {'whitelist': [], 'blacklist': []}) self.policy.load() @@ -71,7 +74,7 @@ class SliceMgr(GeniServer): self.connectRegistry() self.loadCredential() - self.connectAggregates(aggregates_file) + self.connectAggregates() def loadCredential(self): @@ -79,22 +82,29 @@ class SliceMgr(GeniServer): Attempt to load credential from file if it exists. If it doesnt get credential from registry. """ - - self_cred_filename = self.server_basedir + os.sep + "smgr." + self.hrn + ".cred" - ma_cred_filename = self.server_basedir + os.sep + "smgr." + self.hrn + ".sa.cred" # see if this file exists + ma_cred_filename = self.server_basedir + os.sep + "smgr." + self.hrn + ".sa.cred" try: self.credential = Credential(filename = ma_cred_filename) except IOError: - # get self credential - self_cred = self.registry.get_credential(None, 'ma', self.hrn) - self_cred.save_to_file(self_cred_filename, save_parents=True) + self.credential = self.getCrednetialFromRegistry() + + + def getCredentialFromRegistry(self): + """ + Get our current credential from the registry. + """ + # get self credential + self_cred_filename = self.server_basedir + os.sep + "smgr." + 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 = self.registry.get_credential(self_cred, 'sa', self.hrn) - ma_cred.save_to_file(ma_cred_filename, save_parents=True) - self.credential = ma_cred + # get ma credential + ma_cred_filename = self.server_basedir + os.sep + "smgr." + self.hrn + ".sa.cred" + ma_cred = self.registry.get_credential(self_cred, 'sa', self.hrn) + ma_cred.save_to_file(ma_cred_filename, save_parents=True) + return ma_cred def connectRegistry(self): """ @@ -106,33 +116,21 @@ class SliceMgr(GeniServer): url = 'http://%(address)s:%(port)s' % locals() self.registry = GeniClient(url, self.key_file, self.cert_file) - def connectAggregates(self, aggregates_file): + def connectAggregates(self): """ Get info about the aggregates available to us from file and create an xmlrpc connection to each. If any info is invalid, skip it. """ - lines = [] - try: - f = open(aggregates_file, 'r') - lines = f.readlines() - f.close() - except: raise - - for line in lines: - # Skip comments - if line.strip().startswith("#"): - continue - line = line.replace("\t", " ").replace("\n", "").replace("\r", "").strip() - agg_info = line.split(" ") - - # skip invalid info - if len(agg_info) != 3: - continue - - # create xmlrpc connection using GeniClient - hrn, address, port = agg_info[0], agg_info[1], agg_info[2] - url = 'http://%(address)s:%(port)s' % locals() - self.aggregates[hrn] = GeniClient(url, self.key_file, self.cert_file) + self.aggregates = {} + aggregates = self.aggregate_info['aggregates']['aggregate'] + if isinstance(aggregates, dict): + aggregates = [aggregates] + if isinstance(aggregates, list): + for aggregate in aggregates: + # create xmlrpc connection using GeniClient + hrn, address, port = aggregate['hrn'], aggregate['addr'], aggregate['port'] + url = 'http://%(address)s:%(port)s' % locals() + self.aggregates[hrn] = GeniClient(url, self.key_file, self.cert_file) def item_hrns(self, items): """ @@ -195,17 +193,15 @@ class SliceMgr(GeniServer): for aggregate in aggregates: try: # get the rspec from the aggregate - agg_server = self.aggregates[aggregate] agg_rspec = self.aggregates[aggregate].list_nodes(self.credential) - # extract the netspec from each aggregates rspec rspec.parseString(agg_rspec) - networks.extend(rspec.getDictsByTagName('NetSpec')) + networks.extend([{'NetSpec': rspec.getDictsByTagName('NetSpec')}]) except: # XX print out to some error log print "Error calling list nodes at aggregate %s" % aggregate raise - + # create the rspec dict resources = {'networks': networks, 'start_time': start_time, 'duration': duration} resourceDict = {'Rspec': resources} @@ -278,34 +274,30 @@ class SliceMgr(GeniServer): Return the current rspec for the specified slice. """ - if slice_hrn in self.slices.keys(): - # check if we alreay have this slices state saved - return self.slices[slice_hrn] - else: - # request this slices state from all known aggregates - rspec = Rspec() - rspecdicts = [] - networks = [] - for hrn in self.aggregates.keys(): - # check if the slice has resources at this hrn - slice_resources = self.aggregates[hrn].get_resources(self.credential, slice_hrn) - rspec.parseString(slice_resources) - networks.extend(rspec.getDictsByTagName('NetSpec')) + # request this slices state from all known aggregates + rspec = Rspec() + rspecdicts = [] + networks = [] + for hrn in self.aggregates.keys(): + # check if the slice has resources at this hrn + slice_resources = self.aggregates[hrn].get_resources(self.credential, slice_hrn) + rspec.parseString(slice_resources) + networks.extend({'NetSpec': rspec.getDictsByTagName('NetSpec')}) - # merge all these rspecs into one - start_time = int(datetime.datetime.now().strftime("%s")) - end_time = start_time - duration = end_time - start_time + # merge all these rspecs into one + start_time = int(datetime.datetime.now().strftime("%s")) + end_time = start_time + duration = end_time - start_time - resources = {'networks': networks, 'start_time': start_time, 'duration': duration} - resourceDict = {'Rspec': resources} - # convert rspec dict to xml - rspec.parseDict(resourceDict) - # save this slices resources - self.slices[slice_hrn] = rspec.toxml() - self.slices.write() + resources = {'networks': networks, 'start_time': start_time, 'duration': duration} + resourceDict = {'Rspec': resources} + # convert rspec dict to xml + rspec.parseDict(resourceDict) + # save this slices resources + #self.slices[slice_hrn] = rspec.toxml() + #self.slices.write() - return rspec.toxml() + return rspec.toxml() def createSlice(self, cred, slice_hrn, rspec): """