git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2bd6bca
)
minor updates
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 25 Apr 2011 19:03:57 +0000
(15:03 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 25 Apr 2011 19:03:57 +0000
(15:03 -0400)
sfa/rspecs/rspec.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/rspec.py
b/sfa/rspecs/rspec.py
index
92be729
..
6896bbc
100755
(executable)
--- a/
sfa/rspecs/rspec.py
+++ b/
sfa/rspecs/rspec.py
@@
-5,7
+5,7
@@
from datetime import datetime, timedelta
from sfa.util.xrn import *
from sfa.util.plxrn import hostname_to_urn
from sfa.util.config import Config
from sfa.util.xrn import *
from sfa.util.plxrn import hostname_to_urn
from sfa.util.config import Config
-from sfa.util.faults import SfaNotImplemented
+from sfa.util.faults import SfaNotImplemented
, InvalidRSpec
class RSpec:
xml = None
class RSpec:
xml = None
@@
-30,18
+30,19
@@
class RSpec:
generated=generated_ts)
def parse_rspec(self, rspec, namespaces={}):
generated=generated_ts)
def parse_rspec(self, rspec, namespaces={}):
+ parser = etree.XMLParser(remove_blank_text=True)
try:
try:
- tree = etree.parse(rspec)
- self.xml = tree.getroot()
- if namespaces:
- self.namespaces = namespaces
+ tree = etree.parse(rspec, parser)
except IOError:
# 'rspec' file doesnt exist. 'rspec' is proably an xml string
try:
except IOError:
# 'rspec' file doesnt exist. 'rspec' is proably an xml string
try:
- tree = etree.parse(StringIO(rspec))
- self.xml = tree.getroot()
+ tree = etree.parse(StringIO(rspec), parser)
except:
except:
- raise IOError('Must specify a xml file or xml string. Received: ' + rspec )
+ raise InvalidRSpec('Must specify a xml file or xml string. Received: ' + rspec )
+
+ self.xml = tree.getroot()
+ if namespaces:
+ self.namespaces = namespaces
def get_network(self):
raise SfaNotImplemented()
def get_network(self):
raise SfaNotImplemented()
@@
-58,13
+59,29
@@
class RSpec:
def add_links(self, links, check_for_dupes=False):
raise SfaNotImplemented()
def add_links(self, links, check_for_dupes=False):
raise SfaNotImplemented()
+ def add_attribute(self, elem, name, value):
+ opt = etree.SubElement(elem, name)
+ opt.text = value
+
+ def remove_attribute(self, elem, name, value):
+ if elem is not None:
+ opts = elem.iterfind(name)
+ if opts is not None:
+ for opt in opts:
+ if opt.text == value:
+ elem.remove(opt)
+
def __str__(self):
return self.toxml()
def toxml(self):
return self.header + etree.tostring(self.xml, pretty_print=True)
def __str__(self):
return self.toxml()
def toxml(self):
return self.header + etree.tostring(self.xml, pretty_print=True)
-
+ def save(self, filename):
+ f = open(filename, 'w')
+ f.write(self.toxml())
+ f.close()
+
if __name__ == '__main__':
rspec = RSpec()
print rspec
if __name__ == '__main__':
rspec = RSpec()
print rspec