Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / rspecs / rspec_elements.py

diff --git a/sfa/rspecs/rspec_elements.py b/sfa/rspecs/rspec_elements.py
index 3226f58..7f79f68 100644 (file)
--- a/sfa/rspecs/rspec_elements.py
+++ b/sfa/rspecs/rspec_elements.py
@@ -1,18 +1,31 @@
 from sfa.util.enumeration import Enum
 
 # recognized top level rspec elements
-RSpecElements = Enum(NETWORK='NETWORK', 
-                     COMPONENT_MANAGER='COMPONENT_MANAGER', 
-                     SLIVER='SLIVER', 
-                     SLIVER_TYPE='SLIVER_TYPE', 
-                     NODE='NODE', 
-                     INTERFACE='INTERFACE', 
-                     INTERFACE_REF='INTERFACE_REF', 
-                     LINK='LINK', 
-                     LINK_TYPE='LINK_TYPE', 
-                     SERVICE='SERVICE',
-                     PROPERTY='PROPERTY'
-                )
+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, path):