self.ipv4 = iface['ip']
self.bwlimit = iface['bwlimit']
self.hostname = iface['hostname']
+ self.primary = iface['is_primary']
"""
Just print out bwlimit right now
class Node:
- def __init__(self, network, node, bps = 1000 * 1000000):
+ def __init__(self, network, node):
self.network = network
self.id = node['node_id']
self.idtag = "n%s" % self.id
self.sliver = None
self.whitelist = node['slice_ids_whitelist']
- def get_ifaces(self):
- i = []
+ def get_primary_iface(self):
for id in self.iface_ids:
- i.append(self.network.lookupIface(id))
- # Only return the first interface
- break
- return i
+ iface = self.network.lookupIface(id)
+ if iface.primary:
+ return iface
+ return None
def get_site(self):
return self.network.lookupSite(self.site_id)
with xml.node(id = self.idtag):
with xml.hostname:
xml << self.hostname
- if self.network.type == "VINI":
- with xml.kbps:
- xml << str(int(self.bps/1000))
- for iface in self.get_ifaces():
+ iface = self.get_primary_iface()
+ if iface:
iface.toxml(xml)
if self.sliver:
self.sliver.toxml(xml)
def get_nodes(self):
n = []
for id in self.node_ids:
- n.append(self.network.nodes[id])
+ if id in self.network.nodes:
+ n.append(self.network.nodes[id])
return n
-
+
# Add a new slice tag
- def add_tag(self, tagname, value, node = None):
- record = {'slice_tag_id':None, 'slice_id':self.id, 'tagname':tagname, 'value':value}
- if node:
- record['node_id'] = node.id
- else:
- record['node_id'] = None
- tag = Slicetag(record)
+ def add_tag(self, tagname, value, node = None, role_id = 40):
+ tt = self.network.lookupTagType(tagname)
+ if not tt.permit_update(role_id):
+ raise InvalidRSpec("permission denied to modify '%s' tag" % tagname)
+ tag = Slicetag()
+ tag.initialize(tagname, value, node, self.network)
self.network.tags[tag.id] = tag
self.slice_tag_ids.append(tag.id)
- tag.changed = True
- tag.updated = True
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_id = 40):
tag = self.get_tag(tagname, node)
- if tag and tag.value == value:
- value = "no change"
- elif tag:
- tag.value = value
- tag.changed = True
+ if tag:
+ if not tag.permit_update(role_id, value):
+ raise InvalidRSpec("permission denied to modify '%s' tag" % tagname)
+ tag.change(value)
else:
- tag = self.add_tag(tagname, value, node)
- tag.updated = True
+ tag = self.add_tag(tagname, value, node, role_id)
+ return tag
- def update_multi_tag(self, tagname, value, node = None):
+ def update_multi_tag(self, tagname, value, node = None, role_id = 40):
tags = self.get_multi_tag(tagname, node)
for tag in tags:
if tag and tag.value == value:
- value = "no change"
break
else:
- tag = self.add_tag(tagname, value, node)
- tag.updated = True
+ tag = self.add_tag(tagname, value, node, role_id)
+ return tag
def tags_to_xml(self, xml, node = None):
tagtypes = self.network.getTagTypes()
for tt in tagtypes:
- if tt.multi:
- tags = self.get_multi_tag(tt.tagname, node)
- for tag in tags:
- if not tag.deleted: ### Debugging
- xml << (tag.tagname, tag.value)
- else:
- tag = self.get_tag(tt.tagname, node)
- if tag:
- if not tag.deleted: ### Debugging
- xml << (tag.tagname, tag.value)
+ if tt.in_rspec:
+ if tt.multi:
+ tags = self.get_multi_tag(tt.tagname, node)
+ for tag in tags:
+ if not tag.was_deleted(): ### Debugging
+ xml << (tag.tagname, tag.value)
+ else:
+ tag = self.get_tag(tt.tagname, node)
+ if tag:
+ if not tag.was_deleted(): ### Debugging
+ xml << (tag.tagname, tag.value)
def toxml(self, xml):
with xml.sliver_defaults:
class Slicetag:
newid = -1
- def __init__(self, tag):
+ def __init__(self, tag = None):
+ if not tag:
+ return
self.id = tag['slice_tag_id']
- if not self.id:
- # Make one up for the time being...
- self.id = Slicetag.newid
- Slicetag.newid -= 1
self.slice_id = tag['slice_id']
self.tagname = tag['tagname']
self.value = tag['value']
self.node_id = tag['node_id']
- self.updated = False
- self.changed = False
- self.deleted = False
-
+ self.category = tag['category']
+ self.min_role_id = tag['min_role_id']
+ self.status = None
+
+ # Create a new slicetag that will be written to the DB later
+ def initialize(self, tagname, value, node, network):
+ tt = network.lookupTagType(tagname)
+ self.id = Slicetag.newid
+ Slicetag.newid -=1
+ self.slice_id = network.slice.id
+ self.tagname = tagname
+ self.value = value
+ if node:
+ self.node_id = node.id
+ else:
+ self.node_id = None
+ self.category = tt.category
+ self.min_role_id = tt.min_role_id
+ self.status = "new"
+
+ def permit_update(self, role_id, value = None):
+ if value and self.value == value:
+ return True
+ if role_id > self.min_role_id:
+ return False
+ return True
+
+ def change(self, value):
+ if self.value != value:
+ self.value = value
+ self.status = "change"
+ else:
+ self.status = "updated"
+
# Mark a tag as deleted
def delete(self):
- self.deleted = True
- self.updated = True
+ self.status = "delete"
+
+ def was_added(self):
+ return (self.id < 0)
+
+ def was_changed(self):
+ return (self.status == "change")
+
+ def was_deleted(self):
+ return (self.status == "delete")
+
+ def was_updated(self):
+ return (self.status != None)
def write(self, api):
- if self.changed:
- if int(self.id) > 0:
- api.plshell.UpdateSliceTag(api.plauth, self.id, self.value)
- else:
- api.plshell.AddSliceTag(api.plauth, self.slice_id,
- self.tagname, self.value, self.node_id)
- elif self.deleted and int(self.id) > 0:
+ 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:
def __init__(self, tagtype):
self.id = tagtype['tag_type_id']
+ self.category = tagtype['category']
self.tagname = tagtype['tagname']
+ self.min_role_id = tagtype['min_role_id']
+ self.multi = False
+ self.in_rspec = False
+ if self.category == 'slice/rspec':
+ self.in_rspec = True
if self.tagname in ['codemux', 'ip_addresses', 'vsys']:
self.multi = True
- else:
- self.multi = False
+ def permit_update(self, role_id):
+ if role_id > self.min_role_id:
+ return False
+ return True
+
"""
A Network is a compound object consisting of:
def lookupTagType(self, name):
val = None
try:
- val = self.tagstypes[name]
+ val = self.tagtypes[name]
except:
raise InvalidRSpec("tag %s not found" % name)
return val
tags.append(self.tagtypes[t])
return tags
+ """
+ Process the elements under <sliver_defaults> or <sliver>
+ """
def __process_attributes(self, element, node=None):
- # Do we need to check caller's role before update???
+ if element is None:
+ return
+
tagtypes = self.getTagTypes()
for tt in tagtypes:
- if tt.multi:
- for e in element.iterfind("./" + tt.tagname):
- self.slice.update_multi_tag(tt.tagname, e.text, node)
- else:
- e = element.find("./" + tt.tagname)
- if e is not None:
- self.slice.update_tag(tt.tagname, e.text, node)
+ if tt.in_rspec:
+ if tt.multi:
+ for e in element.iterfind("./" + tt.tagname):
+ self.slice.update_multi_tag(tt.tagname, e.text, node)
+ else:
+ e = element.find("./" + tt.tagname)
+ if e is not None:
+ self.slice.update_tag(tt.tagname, e.text, node)
"""
Annotate the objects in the Network with information from the RSpec
"""
def addRSpec(self, xml, schema=None):
- nodedict = {}
- for node in self.getNodes():
- nodedict[node.idtag] = node
-
try:
tree = etree.parse(StringIO(xml))
except etree.XMLSyntaxError:
raise InvalidRSpec(message)
rspec = tree.getroot()
+ self.rspec = rspec
defaults = rspec.find("./network/sliver_defaults")
self.__process_attributes(defaults)
Write any slice tags that have been added or modified back to the DB
"""
def updateSliceTags(self):
+ for tag in self.getSliceTags():
+ if tag.category == 'slice/rspec' and not tag.was_updated() and tag.permit_update(None, 40):
+ # The user wants to delete this tag
+ tag.delete()
+
# Update slice tags in database
for tag in self.getSliceTags():
if tag.slice_id == self.slice.id:
- if not tag.updated:
- tag.delete()
tag.write(self.api)
"""
def get_tag_types(self, api):
tmp = []
for tag in api.plshell.GetTagTypes(api.plauth):
- if tag['category'] == 'slice/rspec':
- t = tag['tagname'], TagType(tag)
- tmp.append(t)
+ t = tag['tagname'], TagType(tag)
+ tmp.append(t)
return dict(tmp)
"""
def get_slice(self, api, hrn):
slicename = hrn_to_pl_slicename(hrn)
slice = api.plshell.GetSlices(api.plauth, [slicename])
- if slice:
+ if len(slice):
self.slice = Slice(self, slicename, slice[0])
return self.slice
else: