Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / rspecs / elements / node.py

diff --git a/sfa/rspecs/elements/node.py b/sfa/rspecs/elements/node.py
index f90fff1..e0f65e4 100644 (file)
--- a/sfa/rspecs/elements/node.py
+++ b/sfa/rspecs/elements/node.py
@@ -1,26 +1,27 @@
 from sfa.rspecs.elements.element import Element
  
-class Node(Element):
+class NodeElement(Element):
     
-    fields = {
-        'component_id': None,
-        'component_name': None,
-        'component_manager_id': None,
-        'client_id': None,
-        'sliver_id': None,
-        'authority_id': None,    
-        'exclusive': None,
-        'location': None,
-        'bw_unallocated': None,
-        'bw_limit': None,
-        'boot_state': None,    
-        'slivers': [],
-        'hardware_types': [],
-        'disk_images': [],
-        'interfaces': [],
-        'services': [],
-        'tags': [],
-        'pl_initscripts': [],
-    }
+    fields = [
+        'client_id',
+        'component_id',
+        'component_name',
+        'component_manager_id',
+        'client_id',
+        'sliver_id',
+        'authority_id',    
+        'exclusive',
+        'location',
+        'bw_unallocated',
+        'bw_limit',
+        'boot_state',    
+        'slivers',
+        'hardware_types',
+        'disk_images',
+        'interfaces',
+        'services',
+        'tags',
+        'pl_initscripts',
+    ]