X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fnetwork.py;h=9276fb0f3f856aac02299fdec9ba6bb7775b3f06;hb=db091e73c33c373b7f6c2c96bd2caf6a2acf0178;hp=3b16226f0c56466297e368299c2758ac3dbac57c;hpb=4d17883d9210a0bee2572d7c237e2e40d1e66b5c;p=sfa.git diff --git a/sfa/plc/network.py b/sfa/plc/network.py index 3b16226f..9276fb0f 100644 --- a/sfa/plc/network.py +++ b/sfa/plc/network.py @@ -1,13 +1,14 @@ from __future__ import with_statement +import sys import re import socket -from sfa.util.namespace import * -from sfa.util.faults import * -from xmlbuilder import XMLBuilder -from lxml import etree -import sys from StringIO import StringIO +from lxml import etree +from xmlbuilder import XMLBuilder +from sfa.util.faults import * +from sfa.util.xrn import get_authority +from sfa.util.plxrn import hrn_to_pl_slicename, hostname_to_urn class Sliver: def __init__(self, node): @@ -30,10 +31,10 @@ class Iface: self.hostname = iface['hostname'] self.primary = iface['is_primary'] - """ - Just print out bwlimit right now - """ def toxml(self, xml): + """ + Just print out bwlimit right now + """ if self.bwlimit: with xml.bw_limit(units="kbps"): xml << str(self.bwlimit / 1000) @@ -49,6 +50,9 @@ class Node: self.iface_ids = node['interface_ids'] self.sliver = None self.whitelist = node['slice_ids_whitelist'] + auth = self.network.api.hrn + login_base = self.get_site().idtag + self.urn = hostname_to_urn(auth, login_base, self.hostname) def get_primary_iface(self): for id in self.iface_ids: @@ -72,6 +76,8 @@ class Node: with xml.node(id = self.idtag): with xml.hostname: xml << self.hostname + with xml.urn: + xml << self.urn iface = self.get_primary_iface() if iface: iface.toxml(xml) @@ -83,11 +89,11 @@ class Site: def __init__(self, network, site): self.network = network self.id = site['site_id'] - self.idtag = "s%s" % self.id self.node_ids = site['node_ids'] self.node_ids.sort() self.name = site['abbreviated_name'] self.tag = site['login_base'] + self.idtag = site['login_base'] self.public = site['is_public'] self.enabled = site['enabled'] self.links = set() @@ -125,10 +131,18 @@ class Slice: def get_multi_tag(self, tagname, node = None): tags = [] for i in self.slice_tag_ids: - tag = self.network.lookupSliceTag(i) - if tag.tagname == tagname: - if not (node and node.id != tag.node_id): - tags.append(tag) + try: + tag = self.network.lookupSliceTag(i) + if tag.tagname == tagname: + if node: + if node.id == tag.node_id: + tags.append(tag) + elif not tag.node_id: + tags.append(tag) + except InvalidRSpec, e: + # As they're not needed, we ignore some tag types from + # GetSliceTags call. See Slicetag.ignore_tags + pass return tags """ @@ -136,10 +150,18 @@ class Slice: """ def get_tag(self, tagname, node = None): for i in self.slice_tag_ids: - tag = self.network.lookupSliceTag(i) - if tag.tagname == tagname: - if (not node) or (node.id == tag.node_id): - return tag + try: + tag = self.network.lookupSliceTag(i) + if tag.tagname == tagname: + if node: + if node.id == tag.node_id: + return tag + elif not tag.node_id: + return tag + except InvalidRSpec, e: + # As they're not needed, we ignore some tag types from + # GetSliceTags call. See Slicetag.ignore_tags + pass return None def get_nodes(self): @@ -150,8 +172,10 @@ class Slice: return n # Add a new slice tag - def add_tag(self, tagname, value, node = None): + def add_tag(self, tagname, value, node = None, role = "user"): tt = self.network.lookupTagType(tagname) + if not tt.permit_update(role): + raise InvalidRSpec("permission denied to modify '%s' tag" % tagname) tag = Slicetag() tag.initialize(tagname, value, node, self.network) self.network.tags[tag.id] = tag @@ -159,21 +183,28 @@ class Slice: return tag # Update a slice tag if it exists, else add it - def update_tag(self, tagname, value, node = None): + def update_tag(self, tagname, value, node = None, role = "user"): tag = self.get_tag(tagname, node) + if tag and tag.value == value: + return tag + + tt = self.network.lookupTagType(tagname) + if not tt.permit_update(role): + raise InvalidRSpec("permission denied to modify '%s' tag" % tagname) + if tag: tag.change(value) else: - tag = self.add_tag(tagname, value, node) + tag = self.add_tag(tagname, value, node, role) return tag - def update_multi_tag(self, tagname, value, node = None): + def update_multi_tag(self, tagname, value, node = None, role = "user"): tags = self.get_multi_tag(tagname, node) for tag in tags: if tag and tag.value == value: break else: - tag = self.add_tag(tagname, value, node) + tag = self.add_tag(tagname, value, node, role) return tag def tags_to_xml(self, xml, node = None): @@ -198,6 +229,8 @@ class Slice: class Slicetag: newid = -1 + filter_fields = ['slice_tag_id','slice_id','tagname','value','node_id','category'] + ignore_tags = ['hmac','ssh_key'] def __init__(self, tag = None): if not tag: return @@ -247,25 +280,23 @@ class Slicetag: def was_updated(self): return (self.status != None) - def write(self, api, user_plauth): - try: - if self.was_added(): - api.plshell.AddSliceTag(user_plauth, self.slice_id, - self.tagname, self.value, self.node_id) - elif self.was_changed(): - api.plshell.UpdateSliceTag(user_plauth, self.id, self.value) - elif self.was_deleted(): - api.plshell.DeleteSliceTag(user_plauth, self.id) - except: - raise InvalidRSpec("user cannot modify '%s' tag" % self.tagname) - + def write(self, api): + if self.was_added(): + api.plshell.AddSliceTag(api.plauth, self.slice_id, + self.tagname, self.value, self.node_id) + elif self.was_changed(): + api.plshell.UpdateSliceTag(api.plauth, self.id, self.value) + elif self.was_deleted(): + api.plshell.DeleteSliceTag(api.plauth, self.id) class TagType: + ignore_tags = ['hmac','ssh_key'] def __init__(self, tagtype): self.id = tagtype['tag_type_id'] self.category = tagtype['category'] self.tagname = tagtype['tagname'] + self.roles = tagtype['roles'] self.multi = False self.in_rspec = False if self.category == 'slice/rspec': @@ -273,6 +304,11 @@ class TagType: if self.tagname in ['codemux', 'ip_addresses', 'vsys']: self.multi = True + def permit_update(self, role): + if role in self.roles: + return True + return False + class Network: """ @@ -281,9 +317,8 @@ class Network: * a dictionary mapping node IDs to Node objects * a dictionary mapping interface IDs to Iface objects """ - def __init__(self, api, user_plauth, type = "SFA"): + def __init__(self, api, type = "SFA"): self.api = api - self.user_plauth = user_plauth self.type = type self.sites = self.get_sites(api) self.nodes = self.get_nodes(api) @@ -291,15 +326,29 @@ class Network: self.tags = self.get_slice_tags(api) self.tagtypes = self.get_tag_types(api) self.slice = None + self.sitemap = {} + for s in self.sites: + site = self.sites[s] + self.sitemap[site.idtag] = site.id + + def lookupSiteIdtag(self, name): + """ Lookup site id from name """ + val = None + try: + val = self.sitemap[name] + except: + raise InvalidRSpec("site name '%s' not found" % name) + return val def lookupSite(self, id): """ Lookup site based on id or idtag value """ val = None if isinstance(id, basestring): - id = int(id.lstrip('s')) + id = self.lookupSiteIdtag(id) try: val = self.sites[id] except: + self.api.logger.error("Invalid RSpec: site ID %s not found" % id ) raise InvalidRSpec("site ID %s not found" % id) return val @@ -385,7 +434,7 @@ class Network: """ if element is None: return - + tagtypes = self.getTagTypes() for tt in tagtypes: if tt.in_rspec: @@ -424,6 +473,10 @@ class Network: if not relaxng(tree): error = relaxng.error_log.last_error message = "%s (line %s)" % (error.message, error.line) + self.api.logger.error("failed to validate rspec %r"%message) + self.api.logger.debug("---------- XML input BEG") + self.api.logger.debug(xml) + self.api.logger.debug("---------- XML input END") raise InvalidRSpec(message) self.rspec = rspec @@ -473,13 +526,14 @@ class Network: """ for tag in self.getSliceTags(): if tag.category == 'slice/rspec' and not tag.was_updated(): - # The user wants to delete this tag - tag.delete() + tt = self.lookupTagType(tag.tagname) + if tt.permit_update("user"): + tag.delete() # Update slice tags in database for tag in self.getSliceTags(): if tag.slice_id == self.slice.id: - tag.write(self.api, self.user_plauth) + tag.write(self.api) def toxml(self): """ @@ -506,10 +560,9 @@ class Network: Create a dictionary of site objects keyed by site ID """ tmp = [] - for site in api.plshell.GetSites(self.user_plauth, {'peer_id': None}): + for site in api.plshell.GetSites(api.plauth, {'peer_id': None}): t = site['site_id'], Site(self, site) tmp.append(t) - return dict(tmp) @@ -518,9 +571,13 @@ class Network: Create a dictionary of node objects keyed by node ID """ tmp = [] - for node in api.plshell.GetNodes(self.user_plauth, {'peer_id': None}): - t = node['node_id'], Node(self, node) - tmp.append(t) + for node in api.plshell.GetNodes(api.plauth, {'peer_id': None}): + try: + t = node['node_id'], Node(self, node) + tmp.append(t) + except: + self.api.logger.error("Failed to add node %s (%s) to RSpec" % (node['hostname'], node['node_id'])) + return dict(tmp) def get_ifaces(self, api): @@ -528,7 +585,7 @@ class Network: Create a dictionary of node objects keyed by node ID """ tmp = [] - for iface in api.plshell.GetInterfaces(self.user_plauth): + for iface in api.plshell.GetInterfaces(api.plauth): t = iface['interface_id'], Iface(self, iface) tmp.append(t) return dict(tmp) @@ -538,7 +595,7 @@ class Network: Create a dictionary of slicetag objects keyed by slice tag ID """ tmp = [] - for tag in api.plshell.GetSliceTags(self.user_plauth): + for tag in api.plshell.GetSliceTags(api.plauth, {'~tagname':Slicetag.ignore_tags}, Slicetag.filter_fields): t = tag['slice_tag_id'], Slicetag(tag) tmp.append(t) return dict(tmp) @@ -548,7 +605,7 @@ class Network: Create a list of tagtype obects keyed by tag name """ tmp = [] - for tag in api.plshell.GetTagTypes(self.user_plauth): + for tag in api.plshell.GetTagTypes(api.plauth, {'~tagname':TagType.ignore_tags}): t = tag['tagname'], TagType(tag) tmp.append(t) return dict(tmp) @@ -558,7 +615,7 @@ class Network: Return a Slice object for a single slice """ slicename = hrn_to_pl_slicename(hrn) - slice = api.plshell.GetSlices(self.user_plauth, [slicename]) + slice = api.plshell.GetSlices(api.plauth, [slicename]) if len(slice): self.slice = Slice(self, slicename, slice[0]) return self.slice