git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced Element.get_elements() with XmlNode.get_instance(). replaced Element.add_ele...
[sfa.git]
/
sfa
/
rspecs
/
versions
/
sfav1.py
diff --git
a/sfa/rspecs/versions/sfav1.py
b/sfa/rspecs/versions/sfav1.py
index
85aa86e
..
39a5348
100644
(file)
--- a/
sfa/rspecs/versions/sfav1.py
+++ b/
sfa/rspecs/versions/sfav1.py
@@
-23,12
+23,16
@@
class SFAv1(BaseVersion):
# Network
def get_networks(self):
# Network
def get_networks(self):
- return Element.get_elements(self.xml, '//network', Element)
+ network_elems = self.xml.xpath('//network')
+ networks = [network_elem.get_instance(fields=['name', 'slice']) for \
+ network_elem in network_elems]
+ return networks
+
def add_network(self, network):
network_tags = self.xml.xpath('//network[@name="%s"]' % network)
if not network_tags:
def add_network(self, network):
network_tags = self.xml.xpath('//network[@name="%s"]' % network)
if not network_tags:
- network_tag =
etree.SubElement(self.xml.root,
'network', name=network)
+ network_tag =
self.xml.add_element(
'network', name=network)
else:
network_tag = network_tags[0]
return network_tag
else:
network_tag = network_tags[0]
return network_tag