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

diff --git a/db-config.d/010-slice_tags b/db-config.d/010-slice_tags
index 040fa60..9a4184f 100644
--- a/db-config.d/010-slice_tags
+++ b/db-config.d/010-slice_tags
@@ -8,11 +8,13 @@
 # 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",
@@ -28,6 +30,9 @@ slicetag_types = \
     {'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",
@@ -36,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)",
@@ -86,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'},
+     '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",
@@ -116,8 +133,13 @@ slicetag_types = \
      'description': "Is a default Distributed Rate Limiting slice (1) or not (0 or unset)",
      'category' : 'slice/general'},
 
+    {'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: