from sfa.rspecs.rspec import RSpec
from sfa.util.xrn import *
from sfa.util.plxrn import hostname_to_urn
-from sfa.util.config import Config
+from sfa.util.config import Config
+from sfa.rspecs.rspec_version import RSpecVersion
+_version = { 'type': 'sfa',
+ 'version': '1'
+}
+
+sfa_rspec_version = RSpecVersion(_version)
+
class SfaRSpec(RSpec):
xml = None
header = '<?xml version="1.0"?>\n'
- namespaces = {}
- format = 'sfa'
+ version = sfa_rspec_version
+
###################
# Parser
###################
return name.getparent()
return None
- def get_node_elements(self):
- return self.xml.xpath('//node')
+ def get_node_elements(self, network=None):
+ if network:
+ return self.xml.xpath('//network[@name="%s"]//node' % network)
+ else:
+ return self.xml.xpath('//node')
def get_nodes(self, network=None):
if network == None:
if 'interfaces' in node:
for interface in node['interfaces']:
if 'bwlimit' in interface and interface['bwlimit']:
- bwlimit = etree.SubElement(node_tag, 'bwlimit', units='kbps').tet = str(interface['bwlimit']/1000)
+ bwlimit = etree.SubElement(node_tag, 'bw_limit', units='kbps').text = str(interface['bwlimit']/1000)
if 'tags' in node:
for tag in node['tags']:
# expose this hard wired list of tags, plus the ones that are marked 'sfa' in their category
if tag['tagname'] in ['fcdistro', 'arch'] or 'sfa' in tag['category'].split('/'):
- tag_element = etree.SubElement(node_tag, tag['tagname'], value=tag['value'])
+ tag_element = etree.SubElement(node_tag, tag['tagname'], value=tag['value'])
+
+ if 'site' in node:
+ longitude = str(node['site']['longitude'])
+ latitude = str(node['site']['latitude'])
+ location = etree.SubElement(node_tag, 'location', country='unknown', \
+ longitude=longitude, latitude=latitude)
def add_interfaces(self, interfaces):
pass
def add_links(self, links):
pass
- def add_slivers(self, hostnames, network=None, no_dupes=False):
- if not isinstance(hostnames, list):
- hostnames = [hostnames]
+ def add_slivers(self, slivers, network=None, no_dupes=False):
+ if not isinstance(slivers, list):
+ slivers = [slivers]
nodes_with_slivers = self.get_nodes_with_slivers(network)
- for hostname in hostnames:
- if hostname in nodes_with_slivers:
+ for sliver in slivers:
+ if sliver['hostname'] in nodes_with_slivers:
continue
- node = self.get_node_element(hostname, network)
- etree.SubElement(node, 'sliver')
-
- def remove_slivers(self, hostnames, network=None, no_dupes=False):
- if not isinstance(hostnames, list):
- hostnames = [hostnames]
- for hostname in hostnames:
- node = self.get_node_element(hostname, network)
- sliver = node.find('sliver')
- if sliver != None:
- node.remove(sliver)
+ node_elem = self.get_node_element(sliver['hostname'], network)
+ sliver_elem = etree.SubElement(node_elem, 'sliver')
+ if 'tags' in sliver:
+ for tag in sliver['tags']:
+ etree.SubElement(sliver_elem, tag['tagname'], value=tag['value'])
+
+ def remove_slivers(self, slivers, network=None, no_dupes=False):
+ if not isinstance(slivers, list):
+ slivers = [slivers]
+ for sliver in slivers:
+ node_elem = self.get_node_element(sliver['hostname'], network)
+ sliver_elem = node.find('sliver')
+ if sliver_elem != None:
+ node_elem.remove(sliver)
def add_default_sliver_attribute(self, name, value, network=None):
if network: