X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fsfa_rspec.py;h=8cf1c8b1610c386c812bd08864b684bce7a33b43;hb=3244a98433c769a9c8df52f5a493edc157372dc2;hp=ae8332821031703b7d65b4e7f7ab171306cfbd54;hpb=b07c1ba6f4fd65c52dc24ea1bfcc28715b4ae831;p=sfa.git diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py index ae833282..8cf1c8b1 100755 --- a/sfa/rspecs/sfa_rspec.py +++ b/sfa/rspecs/sfa_rspec.py @@ -4,15 +4,21 @@ from StringIO import StringIO 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(_sfa_rspec_version) + class SfaRSpec(RSpec): xml = None header = '\n' - namespaces = {} - format = 'sfa' - type = 'sfa' + version = sfa_rspec_version + ################### # Parser ################### @@ -193,7 +199,7 @@ class SfaRSpec(RSpec): if 'interfaces' in node: for interface in node['interfaces']: if 'bwlimit' in interface and interface['bwlimit']: - bwlimit = etree.SubElement(node_tag, 'bw_limit', 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