From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 24 Oct 2011 20:56:58 +0000 (-0400)
Subject: added component manager element type
X-Git-Tag: sfa-1.1-1~54
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=040d2b6fa1220aabbfa57b1cb78d1cc21bbc8e45;p=sfa.git

added component manager element type
---

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