trimmed dependencies to plxrn

[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 c37275a..9927683 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2Node.py
+++ b/sfa/rspecs/elements/versions/pgv2Node.py
@@ -1,4 +1,4 @@
-from sfa.util.plxrn import PlXrn, xrn_to_hostname
+from sfa.util.plxrn import xrn_to_hostname
 from sfa.util.xrn import Xrn
 from sfa.util.xml import XpathFilter
 from sfa.rspecs.elements.node import Node
@@ -34,12 +34,13 @@ class PGv2Node:
             # set interfaces
             if node.get('interfaces'):
                 for interface in  node.get('interfaces', []):
-                    node_elem.add_instance('interface', interface, ['component_id', 'client_id', 'ipv4'])
+                    node_elem.add_instance('interface', interface, ['component_id', 'client_id'])
             # set available element
-            if node.get('boot_state') and node.get('boot_state').lower() == 'boot':
-                available_elem = node_elem.add_element('available', now='True')
-            else:
-                available_elem = node_elem.add_element('available', now='False')
+            if node.get('boot_state'):
+                if node.get('boot_state').lower() == 'boot':
+                    available_elem = node_elem.add_element('available', now='true')
+                else:
+                    available_elem = node_elem.add_element('available', now='false')
             # add services
             PGv2Services.add_services(node_elem, node.get('services', [])) 
             # add slivers
@@ -78,8 +79,8 @@ class PGv2Node:
                 node['authority_id'] = Xrn(node_elem.attrib['component_id']).get_authority_urn()
             
             # get hardware types
-            hardware_type_elems = node_elem.xpath('./default:hardwate_type | ./hardware_type')
-            node['hardware_types'] = [hw_type.get_instnace(HardwareType) for hw_type in hardware_type_elems]
+            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]
             
             # get location
             location_elems = node_elem.xpath('./default:location | ./location')