X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec_elements.py;h=7f79f68a1a42eabc6b085f0d532778d1617e859c;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=2eb0d8cdedb3fcab4724d22516cf4fe9a25c510e;hpb=4f570b79df28d290f60e898dc38bbb7f93373d95;p=sfa.git

diff --git a/sfa/rspecs/rspec_elements.py b/sfa/rspecs/rspec_elements.py
index 2eb0d8cd..7f79f68a 100644
--- a/sfa/rspecs/rspec_elements.py
+++ b/sfa/rspecs/rspec_elements.py
@@ -1,12 +1,35 @@
 from sfa.util.enumeration import Enum
 
 # recognized top level rspec elements
-RSpecElements = Enum('NETWORK', 'NODE', 'SLIVER', 'INTERFACE', 'LINK', 'VLINK')
+RSpecElements = Enum(
+    AVAILABLE='AVAILABLE',
+    BWLIMIT='BWLIMIT',
+    EXECUTE='EXECUTE',
+    NETWORK='NETWORK', 
+    COMPONENT_MANAGER='COMPONENT_MANAGER',
+    HARDWARE_TYPE='HARDWARE_TYPE', 
+    INSTALL='INSTALL', 
+    INTERFACE='INTERFACE', 
+    INTERFACE_REF='INTERFACE_REF',
+    LOCATION='LOCATION', 
+    LOGIN='LOGIN', 
+    LINK='LINK', 
+    LINK_TYPE='LINK_TYPE', 
+    NODE='NODE', 
+    PROPERTY='PROPERTY',
+    SERVICES='SERVICES',
+    SLIVER='SLIVER', 
+    SLIVER_TYPE='SLIVER_TYPE', 
+    LEASE='LEASE',
+    GRANULARITY='GRANULARITY',
+    SPECTRUM='SPECTRUM',
+    CHANNEL='CHANNEL',
+    POSITION_3D ='POSITION_3D', 
+)
 
 class RSpecElement:
-    def __init__(self, element_type, name, path):
+    def __init__(self, element_type, path):
         if not element_type in RSpecElements:
             raise InvalidRSpecElement(element_type)
         self.type = element_type
-        self.name = name
         self.path = path