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
expose PL node tags using attribute in PGv2 and GENIv3 rspecs
[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
a5c4364
..
5db9ba9
100644
(file)
--- a/
sfa/rspecs/elements/versions/pgv2Node.py
+++ b/
sfa/rspecs/elements/versions/pgv2Node.py
@@
-12,6
+12,9
@@
from sfa.rspecs.elements.pltag import PLTag
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType
from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType
from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface
+from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
+from sfa.rspecs.elements.granularity import Granularity
+from sfa.rspecs.elements.attribute import Attribute
from sfa.planetlab.plxrn import xrn_to_hostname
from sfa.planetlab.plxrn import xrn_to_hostname
@@
-34,6
+37,11
@@
class PGv2Node:
# set location
if node.get('location'):
node_elem.add_instance('location', node['location'], Location.fields)
# set location
if node.get('location'):
node_elem.add_instance('location', node['location'], Location.fields)
+
+ # set granularity
+ if node['exclusive'] == "true":
+ granularity = node.get('granularity')
+ node_elem.add_instance('granularity', granularity, granularity.fields)
# set interfaces
PGv2Interface.add_interfaces(node_elem, node.get('interfaces'))
#if node.get('interfaces'):
# set interfaces
PGv2Interface.add_interfaces(node_elem, node.get('interfaces'))
#if node.get('interfaces'):
@@
-55,9
+63,17
@@
class PGv2Node:
for initscript in node.get('pl_initscripts', []):
slivers['tags'].append({'name': 'initscript', 'value': initscript['name']})
PGv2SliverType.add_slivers(node_elem, slivers)
for initscript in node.get('pl_initscripts', []):
slivers['tags'].append({'name': 'initscript', 'value': initscript['name']})
PGv2SliverType.add_slivers(node_elem, slivers)
-
+
+ # advertise the node tags
+ tags = node.get('tags', [])
+ if tags:
+ for tag in tags:
+ tag['name'] = tag.pop('tagname')
+ node_elem.add_instance('attribute', tag, ['name', 'value'])
+
return node_elems
return node_elems
+
@staticmethod
def get_nodes(xml, filter={}):
xpath = '//node%s | //default:node%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter))
@staticmethod
def get_nodes(xml, filter={}):
xpath = '//node%s | //default:node%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter))
@@
-89,6
+105,11
@@
class PGv2Node:
if len(locations) > 0:
node['location'] = locations[0]
if len(locations) > 0:
node['location'] = locations[0]
+ # get granularity
+ granularity_elems = node_elem.xpath('./default:granularity | ./granularity')
+ if len(granularity_elems) > 0:
+ node['granularity'] = granularity_elems[0].get_instance(Granularity)
+
# get interfaces
iface_elems = node_elem.xpath('./default:interface | ./interface')
node['interfaces'] = [iface_elem.get_instance(Interface) for iface_elem in iface_elems]
# get interfaces
iface_elems = node_elem.xpath('./default:interface | ./interface')
node['interfaces'] = [iface_elem.get_instance(Interface) for iface_elem in iface_elems]
@@
-104,6
+125,15
@@
class PGv2Node:
node['boot_state'] = 'boot'
else:
node['boot_state'] = 'disabled'
node['boot_state'] = 'boot'
else:
node['boot_state'] = 'disabled'
+
+ # get node tags
+ tag_elems = node_elem.xpath('./default:attribute | ./attribute')
+ node['tags'] = []
+ if len(tag_elems) > 0:
+ for tag_elem in tag_elems:
+ tag = tag_elem.get_instance(Attribute)
+ tag['tagname'] = tag.pop('name')
+ node['tags'].append(tag)
return nodes
return nodes