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
rspec.version.add_nodes take an extra arg to handle Request RSpec
[sfa.git]
/
sfa
/
rspecs
/
elements
/
versions
/
pgv2Node.py
diff --git
a/sfa/rspecs/elements/versions/pgv2Node.py
b/sfa/rspecs/elements/versions/pgv2Node.py
index
769a72f
..
0a694ad
100644
(file)
--- a/
sfa/rspecs/elements/versions/pgv2Node.py
+++ b/
sfa/rspecs/elements/versions/pgv2Node.py
@@
-1,4
+1,4
@@
-from sfa.util.xrn import Xrn
+from sfa.util.xrn import Xrn
, get_leaf
from sfa.util.xml import XpathFilter
from sfa.rspecs.elements.node import NodeElement
from sfa.util.xml import XpathFilter
from sfa.rspecs.elements.node import NodeElement
@@
-16,11
+16,10
@@
from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
from sfa.rspecs.elements.granularity import Granularity
from sfa.rspecs.elements.attribute import Attribute
from sfa.rspecs.elements.granularity import Granularity
from sfa.rspecs.elements.attribute import Attribute
-from sfa.planetlab.plxrn import xrn_to_hostname
class PGv2Node:
@staticmethod
class PGv2Node:
@staticmethod
- def add_nodes(xml, nodes):
+ def add_nodes(xml, nodes
, rspec_content_type=None
):
node_elems = []
for node in nodes:
node_fields = ['component_manager_id', 'component_id', 'client_id', 'sliver_id', 'exclusive']
node_elems = []
for node in nodes:
node_fields = ['component_manager_id', 'component_id', 'client_id', 'sliver_id', 'exclusive']
@@
-28,7
+27,7
@@
class PGv2Node:
node_elems.append(node_elem)
# set component name
if node.get('component_id'):
node_elems.append(node_elem)
# set component name
if node.get('component_id'):
- component_name =
xrn_to_hostname(node['component_id']
)
+ component_name =
Xrn.unescape(get_leaf(Xrn(node['component_id']).get_hrn())
)
node_elem.set('component_name', component_name)
# set hardware types
if node.get('hardware_types'):
node_elem.set('component_name', component_name)
# set hardware types
if node.get('hardware_types'):
@@
-39,7
+38,7
@@
class PGv2Node:
node_elem.add_instance('location', node['location'], Location.fields)
# set granularity
node_elem.add_instance('location', node['location'], Location.fields)
# set granularity
- if node
['exclusive']
== "true":
+ if node
.get('exclusive')
== "true":
granularity = node.get('granularity')
node_elem.add_instance('granularity', granularity, granularity.fields)
# set interfaces
granularity = node.get('granularity')
node_elem.add_instance('granularity', granularity, granularity.fields)
# set interfaces
@@
-71,6
+70,10
@@
class PGv2Node:
tag['name'] = tag.pop('tagname')
node_elem.add_instance('{%s}attribute' % xml.namespaces['planetlab'], tag, ['name', 'value'])
tag['name'] = tag.pop('tagname')
node_elem.add_instance('{%s}attribute' % xml.namespaces['planetlab'], tag, ['name', 'value'])
+ # add sliver tag in Request Rspec
+ if rspec_content_type == "request":
+ node_elem.add_instance('sliver', '', [])
+
return node_elems
return node_elems