X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Node.py;h=88787b5277e7ab6e2cf1d9e4a17f0f5df131cd17;hb=1db1a879ffde8991aa95dd80142d555551655e88;hp=cae644dc39d4c70506f42b02694e5b84c65931e3;hpb=013d9db0fd63345c1d24b2b15b59d3dc5036bc18;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index cae644dc..88787b52 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -1,6 +1,6 @@ -from sfa.util.plxrn import PlXrn, xrn_to_hostname from sfa.util.xrn import Xrn from sfa.util.xml import XpathFilter + from sfa.rspecs.elements.node import Node from sfa.rspecs.elements.sliver import Sliver from sfa.rspecs.elements.location import Location @@ -11,6 +11,9 @@ from sfa.rspecs.elements.bwlimit import BWlimit 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.planetlab.plxrn import xrn_to_hostname class PGv2Node: @staticmethod @@ -32,9 +35,10 @@ class PGv2Node: if node.get('location'): node_elem.add_instance('location', node['location'], Location.fields) # set interfaces - if node.get('interfaces'): - for interface in node.get('interfaces', []): - node_elem.add_instance('interface', interface, ['component_id', 'client_id']) + PGv2Interface.add_interfaces(node_elem, node.get('interfaces')) + #if node.get('interfaces'): + # for interface in node.get('interfaces', []): + # node_elem.add_instance('interface', interface, ['component_id', 'client_id']) # set available element if node.get('boot_state'): if node.get('boot_state').lower() == 'boot':