X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=db-config.d%2F010-slice_tags;h=de66d037b4e554cf64a035bbb49876e86e5c6643;hb=cc920dc5756e2aa0d01556a90d1921b03a9bec36;hp=91ffa333090f7768fcfa3228df899fcb930b039d;hpb=a7ba28837e8c6f949f29aff64a0297ac48cbe065;p=plcapi.git

diff --git a/db-config.d/010-slice_tags b/db-config.d/010-slice_tags
index 91ffa33..de66d03 100644
--- a/db-config.d/010-slice_tags
+++ b/db-config.d/010-slice_tags
@@ -2,6 +2,9 @@
 #################### slice tag types
 # xxx this should move to PLC/Accessors
 
+# vref is now defined in an accessor
+# initscript is now defined in an accessor
+    
 # Setup default slice tag types
 slicetag_types = \
 [
@@ -21,18 +24,6 @@ slicetag_types = \
      'description': "Slice enabled (1 or unset) or suspended (0)",
      'category' : 'slice/general'},
     
-    # Slice reference image
-    {'tagname': "vref",
-     'description': "Reference image",
-     'category' : 'slice/config',
-     'roles' : ['admin','pi','user']},
-    
-    # Slice initialization script
-    {'tagname': "initscript",
-     'description': "Slice initialization script",
-     'category' : 'slice/usertools',
-     'roles' : ['admin','pi','user']},
-    
     # IP Addresses for a Slice
     {'tagname': "ip_addresses",
      'description': "Add an ip address to a slice/sliver.",
@@ -83,10 +74,11 @@ slicetag_types = \
      'description': "Disk quota (1k disk blocks)",
      'category' : 'slice/rspec'},
     
+    # deprecated in nov. 2010
     # Proper operations
-    {'tagname': "proper_op",
-     'description': "Proper operation (e.g. bind_socket)",
-     'category' : 'slice/rspec'},
+    #{'tagname': "proper_op",
+    # 'description': "Proper operation (e.g. bind_socket)",
+    # 'category' : 'slice/rspec'},
     
     # VServer capabilities 
     {'tagname': "capabilities",
@@ -95,7 +87,7 @@ slicetag_types = \
     
     # Vsys
     {'tagname': "vsys",
-     'description': "Bind vsys script fd's to a slice's vsys directory.",
+     'description': "Bind vsys script fd's to a slice's /vsys directory.",
      'category' : 'slice/rspec'},
     
     # CoDemux
@@ -109,17 +101,6 @@ slicetag_types = \
      'category' : 'slice/rspec',
      'roles' : ['admin','pi','user']},
 
-    # Security capability to empower a slice to make an authenticated API call, set by silverauth NM plugin.
-    {'tagname': "hmac",
-     'description': "Sliver authorization key.",
-     'category' : 'slice/auth',
-     'roles': ['admin','pi']},
-
-    {'tagname': "ssh_key",
-     'description': "Sliver public ssh key.",
-     'category' : 'slice/auth',
-     'roles': ['admin','pi']},
-
     # Capability to give a sliver access to unused raw disk
     {'tagname': "rawdisk",
      'description': "map unused raw disk devices into the slice",
@@ -135,12 +116,9 @@ slicetag_types = \
      'description': "Is a default Distributed Rate Limiting slice (1) or not (0 or unset)",
      'category' : 'slice/general'},
 
-    # OMF controlled slice
-    {'tagname': "omf_control",
-     'description': "Pre-install and configure OMF Resource Controller in slice if set",
-     'category' : 'slice/usertools'},
 ]
 
+import resource
 # add in the platform supported rlimits to the default_attribute_types
 for entry in resource.__dict__.keys() + ["VLIMIT_OPENFD"]:
     if entry.find("LIMIT_")==1: