Merge branch 'master' of ssh://git.onelab.eu/git/sfa
[sfa.git] / sfa / rspecs / rspec_elements.py
index aae4055..3226f58 100644 (file)
@@ -4,10 +4,14 @@ from sfa.util.enumeration import Enum
 RSpecElements = Enum(NETWORK='NETWORK', 
                      COMPONENT_MANAGER='COMPONENT_MANAGER', 
                      SLIVER='SLIVER', 
+                     SLIVER_TYPE='SLIVER_TYPE', 
                      NODE='NODE', 
                      INTERFACE='INTERFACE', 
+                     INTERFACE_REF='INTERFACE_REF', 
                      LINK='LINK', 
-                     SERVICE='SERVICE'
+                     LINK_TYPE='LINK_TYPE', 
+                     SERVICE='SERVICE',
+                     PROPERTY='PROPERTY'
                 )
 
 class RSpecElement:
@@ -15,5 +19,4 @@ class RSpecElement:
         if not element_type in RSpecElements:
             raise InvalidRSpecElement(element_type)
         self.type = element_type
-        self.name = name
         self.path = path