X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fnodes.py;h=94e7323076175b4040d45fe47c95dc9f9a4a8243;hb=11d02cbfd5e91784119bb9377fceb4fa6adae621;hp=dcf835dc0533e9c618e47d9deb1d086afb970e20;hpb=da1aeb81d196081354c4da3b71abf4e96cdc063b;p=sfa.git diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py index dcf835dc..94e73230 100644 --- a/sfa/plc/nodes.py +++ b/sfa/plc/nodes.py @@ -7,7 +7,7 @@ import datetime import sys import traceback -from sfa.util.misc import * +from sfa.util.namespace import * from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * @@ -20,17 +20,18 @@ from sfa.server.aggregate import Aggregates class Nodes(SimpleStorage): - def __init__(self, api, ttl = 1): + def __init__(self, api, ttl = 1, origin_hrn=None): self.api = api self.ttl = ttl self.threshold = None - path = self.api.config.SFA_BASE_DIR + path = self.api.config.SFA_DATA_DIR filename = ".".join([self.api.interface, self.api.hrn, "nodes"]) filepath = path + os.sep + filename self.nodes_file = filepath SimpleStorage.__init__(self, self.nodes_file) self.policy = Policy(api) self.load() + self.origin_hrn = origin_hrn def refresh(self): @@ -47,9 +48,8 @@ class Nodes(SimpleStorage): elif self.api.interface in ['slicemgr']: self.refresh_nodes_smgr() - def refresh_nodes_aggregate(self): - rspec = Rspec() + rspec = RSpec() rspec.parseString(self.get_rspec()) # filter nodes according to policy @@ -88,7 +88,8 @@ class Nodes(SimpleStorage): self.update(node_details) self.write() - def get_remote_resources(self, hrn = None): + def get_rspec_smgr(self, xrn = None): + hrn, type = urn_to_hrn(xrn) # convert and threshold to ints if self.has_key('timestamp') and self['timestamp']: hr_timestamp = self['timestamp'] @@ -109,27 +110,28 @@ class Nodes(SimpleStorage): aggregates = Aggregates(self.api) rspecs = {} networks = [] - rspec = Rspec() - credential = self.api.getCredential() + rspec = RSpec() + credential = self.api.getCredential() + origin_hrn = self.origin_hrn for aggregate in aggregates: + if aggregate not in [self.api.auth.client_cred.get_gid_caller().get_hrn()]: try: # get the rspec from the aggregate - agg_rspec = aggregates[aggregate].get_resources(credential, hrn) + agg_rspec = aggregates[aggregate].get_resources(credential, xrn, origin_hrn) # extract the netspec from each aggregates rspec rspec.parseString(agg_rspec) networks.extend([{'NetSpec': rspec.getDictsByTagName('NetSpec')}]) except: # XX print out to some error log - print >> log, "Error calling list nodes at aggregate %s" % aggregate + print >> log, "Error getting resources at aggregate %s" % aggregate traceback.print_exc(log) - exc_type, exc_value, exc_traceback = sys.exc_info() - print exc_type, exc_value, exc_traceback + print >> log, "%s" % (traceback.format_exc()) # create the rspec dict resources = {'networks': networks, 'start_time': start_time, 'duration': duration} - resourceDict = {'Rspec': resources} + resourceDict = {'RSpec': resources} # convert rspec dict to xml rspec.parseDict(resourceDict) - return rspec + return rspec.toxml() def refresh_nodes_smgr(self): @@ -153,23 +155,19 @@ class Nodes(SimpleStorage): self.update(nodedict) self.write() - def get_rspec(self, hrn = None): + def get_rspec(self, xrn = None): if self.api.interface in ['slicemgr']: - return self.get_rspec_smgr(hrn) + return self.get_rspec_smgr(xrn) elif self.api.interface in ['aggregate']: - return self.get_rspec_aggregate(hrn) + return self.get_rspec_aggregate(xrn) - def get_rspec_smgr(self, hrn = None): - - rspec = self.get_remote_resources(hrn) - return rspec.toxml() - - def get_rspec_aggregate(self, hrn = None): + def get_rspec_aggregate(self, xrn = None): """ Get resource information from PLC """ - + hrn, type = urn_to_hrn(xrn) + slicename = None # Get the required nodes if not hrn: nodes = self.api.plshell.GetNodes(self.api.plauth, {'peer_id': None}) @@ -187,7 +185,10 @@ class Nodes(SimpleStorage): # 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) + + # ...only if they are not already assigned to this slice. + if (not slicename): + nodes = filter(public_nodes, nodes) # Get all network interfaces interface_ids = [] @@ -198,7 +199,7 @@ class Nodes(SimpleStorage): elif self.api.plshell_version in ['4.3']: interface_ids.extend(node['interface_ids']) else: - raise GeniAPIError, "Unsupported plcapi version ", \ + raise SfaAPIError, "Unsupported plcapi version ", \ self.api.plshell_version if self.api.plshell_version in ['4.2']: @@ -206,7 +207,7 @@ class Nodes(SimpleStorage): elif self.api.plshell_version in ['4.3']: interfaces = self.api.plshell.GetInterfaces(self.api.plauth, interface_ids) else: - raise GeniAPIError, "Unsupported plcapi version ", \ + raise SfaAPIError, "Unsupported plcapi version ", \ self.api.plshell_version interface_dict = {} for interface in interfaces: @@ -215,7 +216,7 @@ class Nodes(SimpleStorage): elif self.api.plshell_version in ['4.3']: interface_dict[interface['interface_id']] = interface else: - raise GeniAPIError, "Unsupported plcapi version", \ + raise SfaAPIError, "Unsupported plcapi version", \ self.api.plshell_version # join nodes with thier interfaces @@ -228,7 +229,7 @@ class Nodes(SimpleStorage): for interface_id in node['interface_ids']: node['interfaces'].append(interface_dict[interface_id]) else: - raise GeniAPIError, "Unsupported plcapi version", \ + raise SfaAPIError, "Unsupported plcapi version", \ self.api.plshell_version # convert and threshold to ints @@ -254,9 +255,9 @@ class Nodes(SimpleStorage): resources = {'networks': networks, 'start_time': start_time, 'duration': duration} # convert the plc dict to an rspec dict - resourceDict = RspecDict(resources) + resourceDict = RSpecDict(resources) # convert the rspec dict to xml - rspec = Rspec() + rspec = RSpec() rspec.parseDict(resourceDict) return rspec.toxml()