X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec_elements.py;h=aae4055468ce8351898fb6826e771372d916305a;hb=040d2b6fa1220aabbfa57b1cb78d1cc21bbc8e45;hp=2eb0d8cdedb3fcab4724d22516cf4fe9a25c510e;hpb=08033889ad4e46d14ff56d36896200b162c5dffc;p=sfa.git

diff --git a/sfa/rspecs/rspec_elements.py b/sfa/rspecs/rspec_elements.py
index 2eb0d8cd..aae40554 100644
--- a/sfa/rspecs/rspec_elements.py
+++ b/sfa/rspecs/rspec_elements.py
@@ -1,10 +1,17 @@
 from sfa.util.enumeration import Enum
 
 # recognized top level rspec elements
-RSpecElements = Enum('NETWORK', 'NODE', 'SLIVER', 'INTERFACE', 'LINK', 'VLINK')
+RSpecElements = Enum(NETWORK='NETWORK', 
+                     COMPONENT_MANAGER='COMPONENT_MANAGER', 
+                     SLIVER='SLIVER', 
+                     NODE='NODE', 
+                     INTERFACE='INTERFACE', 
+                     LINK='LINK', 
+                     SERVICE='SERVICE'
+                )
 
 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