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

diff --git a/db-config.d/010-slice_tags b/db-config.d/010-slice_tags
index 91ffa33..9a4184f 100644
--- a/db-config.d/010-slice_tags
+++ b/db-config.d/010-slice_tags
@@ -2,14 +2,19 @@
 #################### 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 = \
 [
-    # Slice type (only vserver is supported)
-    {'tagname': "type",
-     'description': "Type of slice (e.g. vserver)",
-     'category' : 'slice/general',
-     'roles': ['admin','pi']},
+
+### this applies on Node, not on Slice
+###    # Slice type (only vserver is supported)
+###    {'tagname': "type",
+###     'description': "Type of slice (e.g. vserver)",
+###     'category' : 'slice/general',
+###     'roles': ['admin','pi']},
     
     # System slice
     {'tagname': "system",
@@ -21,22 +26,13 @@ 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.",
      'category' : 'slice/rspec'},
+    {'tagname': "isolate_loopback",
+     'description': "Create an isolated loopback interface within the vserver rather than sharing with all vservers.",
+     'category' : 'slice/rspec'},
     
     # CPU share
     {'tagname': "cpu_pct",
@@ -45,7 +41,13 @@ slicetag_types = \
     {'tagname': "cpu_share",
      'description': "Number of CPU shares",
      'category' : 'slice/rspec'},
-    
+    {'tagname': "cpu_cores",
+     'description': "Number of CPU cores",
+     'category': 'slice/rspec'},
+    {'tagname': "cpu_freezable",
+     'description': "Slice processes should be frozen if cpu_cores is 0",
+     'category': 'slice/rspec'},     
+
     # Bandwidth limits
     {'tagname': "net_min_rate",
      'description': "Minimum bandwidth (kbps)",
@@ -83,10 +85,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",
@@ -94,9 +97,15 @@ slicetag_types = \
      'category' : 'slice/rspec'},
     
     # Vsys
+    # need to allow this one so that slice can have that set from PLC_VSYS_DEFAULT
     {'tagname': "vsys",
-     'description': "Bind vsys script fd's to a slice's vsys directory.",
-     'category' : 'slice/rspec'},
+     'description': "Bind vsys script fd's to a slice's /vsys directory.",
+     'category' : 'slice/rspec',
+     'roles': AllPersonRoles()},
+    {'tagname': "vsys_vnet",
+     'description': """Specify the IP range that can be used in a given slice
+for virtual devices involved in topologies, e.g. 192.168.100.0/24""",
+     'category': 'slice/rspec'},
     
     # CoDemux
     {'tagname': "codemux",
@@ -109,17 +118,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 +133,13 @@ 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'},
+    {'tagname' : 'interface',
+     'description' : 'The interface tag holds network configuration information until VirtualInterface objects are in PLCAPI',
+     'category' : 'slice/network'},
+
 ]
 
+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: