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 (parent:
de35aed
)
add support for hardware_type element to sfa rspec
author
smbaker
<smbaker@fc8clean.lan>
Tue, 3 Jan 2012 00:53:58 +0000
(16:53 -0800)
committer
smbaker
<smbaker@fc8clean.lan>
Tue, 3 Jan 2012 00:53:58 +0000
(16:53 -0800)
sfa/rspecs/elements/versions/sfav1Node.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/elements/versions/sfav1Node.py
b/sfa/rspecs/elements/versions/sfav1Node.py
index
753192d
..
fdf1eb2
100644
(file)
--- a/
sfa/rspecs/elements/versions/sfav1Node.py
+++ b/
sfa/rspecs/elements/versions/sfav1Node.py
@@
-24,7
+24,7
@@
class SFAv1Node:
network_elem = network_elems[0]
elif len(nodes) > 0 and nodes[0].get('component_manager_id'):
network_urn = nodes[0]['component_manager_id']
network_elem = network_elems[0]
elif len(nodes) > 0 and nodes[0].get('component_manager_id'):
network_urn = nodes[0]['component_manager_id']
- network_elem = xml.add_element('network', name = Xrn(network_urn).get_hrn())
+ network_elem = xml.add_element('network', name = Xrn(network_urn).get_hrn())
else:
network_elem = xml
else:
network_elem = xml
@@
-135,7
+135,10
@@
class SFAv1Node:
# get slivers
node['slivers'] = SFAv1Sliver.get_slivers(node_elem)
# get tags
# get slivers
node['slivers'] = SFAv1Sliver.get_slivers(node_elem)
# get tags
- node['tags'] = SFAv1PLTag.get_pl_tags(node_elem, ignore=Node.fields)
+ node['tags'] = SFAv1PLTag.get_pl_tags(node_elem, ignore=Node.fields+["hardware_type"])
+ # get hardware types
+ hardware_type_elems = node_elem.xpath('./default:hardware_type | ./hardware_type')
+ node['hardware_types'] = [hw_type.get_instance(HardwareType) for hw_type in hardware_type_elems]
# temporary... play nice with old slice manager rspec
if not node['component_name']:
# temporary... play nice with old slice manager rspec
if not node['component_name']: