X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=9156cb32a6b991b21e8ccf3e447c187c01daea62;hb=b6de9285a970eccb9658a0078c49f76fb11af7cd;hp=aa8a3482bfc4bff30641278b18954962a6496c0b;hpb=50324e8ba6e8bfccdc9817699a824f0d908dd608;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index aa8a3482..9156cb32 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -18,6 +18,15 @@ Thierry Parmentelat
       <description>Basic system variables.</description>
 
       <variablelist>
+        <variable id="generic_flavour" type="string">
+          <name>Generic Flavour</name>
+          <value>pl</value>
+          <description>This string refers to a class located in sfa.generic that describes 
+          which specific implementation needs to be used for api, manager and driver objects.
+          PlanetLab users do not need to change this setting.
+          </description>
+        </variable>
+
         <variable id="interface_hrn" type="string">
           <name>Human readable name</name>
           <value>plc</value>
@@ -35,6 +44,12 @@ Thierry Parmentelat
           <value>false</value>
           <description>Flag to turn debug on.</description>
         </variable>
+    
+        <variable id="max_slice_renew" type="int">
+          <name>Max Slice Renew</name>
+          <value>60</value>
+          <description>Maximum amout of days a user can extend/renew their slices to</description>
+        </variable>
 
         <variable id="session_key_path" type="string">
             <name>User Session Keys Path </name>
@@ -43,9 +58,10 @@ Thierry Parmentelat
             it look like the user is the one performing the operation. Doing this requires a 
             valid key pair and credential for the user. This option defines the path where 
             key pairs and credentials are generated and stored.
-            This functionality is used by the SFA web gui 
+            This functionality is used by the SFA web GUI. 
             </description> 
         </variable>
+
       </variablelist>
     </category>
 
@@ -63,13 +79,6 @@ Thierry Parmentelat
 	  registry.</description>
 	</variable>
 
-	<variable id="type" type="string">
-	  <name>Registry type</name>
-	  <value>pl</value>
-	  <description>The type of backend server for this
-	  registry. Some registries may not be myplc.</description>
-	</variable>
-
 	<variable id="host" type="hostname">
 	  <name>Hostname</name>
 	  <value>localhost</value>
@@ -94,66 +103,54 @@ Thierry Parmentelat
     </category>
 
     <!-- ======================================== -->
-    <category id="sfa_aggregate">
-      <name>Aggregate</name>
-      <description>The settings that affect the aggregate manager that will run
+    <category id="sfa_sm">
+      <name>Slice Manager</name>
+      <description>The settings that affect the slice manager that will run
       as part of this SFA instance.</description>
 
       <variablelist>
 	<variable id="enabled" type="boolean">
-	  <name>Enable Aggregate</name>
+	  <name>Enable Slice Manager</name>
 	  <value>true</value>
-	  <description>Allows this local SFA instance to run as an
-	  aggregate manager.</description>
-	</variable>
-
-	<variable id="type" type="string">
-	  <name>Aggregate type</name>
-	  <value>pl</value>
-	  <description>The type of backend server for this
-	  aggregate. Some aggregates may not be myplc.</description>
+	  <description>Allows this local SFA instance to run as a
+	  slice manager.</description>
 	</variable>
-    
-    <variable id="rspec_schema" type="string">
-      <name>RSpec Schema</name>
-      <value>/etc/sfa/pl.rng</value>
-      <description>The path to the default schema</description>
-    </variable>
 
 	<variable id="host" type="hostname">
 	  <name>Hostname</name>
 	  <value>localhost</value>
-	  <description>The hostname where the aggregate is expected to
+	  <description>The hostname where the slice manager is expected to
 	  be found.</description>
 	</variable>
 
 	<variable id="port" type="int">
 	  <name>Port number</name>
-	  <value>12346</value>
-	  <description>The port where the aggregate is to be found.</description>
+	  <value>12347</value>
+	  <description>The port where the slice manager is to be found.</description>
 	</variable>
-      </variablelist>
 
+	<variable id="caching" type="boolean">
+	  <name>Cache advertisement rspec</name>
+	  <value>false</value>
+	  <description>Enable caching of the global advertisement, as
+	  returned by ListResources without a slice argument. </description>
+	  </variable>
+
+      </variablelist>
     </category>
+
     <!-- ======================================== -->
-    <category id="sfa_geni_aggregate">
-      <name>GENI Aggregate</name>
-      <description>The settings that affect the geni aggregate manager that will run
+    <category id="sfa_aggregate">
+      <name>Aggregate</name>
+      <description>The settings that affect the aggregate manager that will run
       as part of this SFA instance.</description>
 
       <variablelist>
 	<variable id="enabled" type="boolean">
-	  <name>Enable GENI Aggregate</name>
+	  <name>Enable Aggregate</name>
 	  <value>true</value>
 	  <description>Allows this local SFA instance to run as an
-	  GENI aggregate manager.</description>
-	</variable>
-
-	<variable id="type" type="string">
-	  <name>GENI Aggregate type</name>
-	  <value>pl</value>
-	  <description>The type of backend server for this
-	  aggregate. Some aggregates may not be myplc.</description>
+	  aggregate manager.</description>
 	</variable>
 
 	<variable id="host" type="hostname">
@@ -165,46 +162,64 @@ Thierry Parmentelat
 
 	<variable id="port" type="int">
 	  <name>Port number</name>
-	  <value>12348</value>
+	  <value>12346</value>
 	  <description>The port where the aggregate is to be found.</description>
 	</variable>
+
+	<variable id="caching" type="boolean">
+	  <name>Cache advertisement rspec</name>
+	  <value>true</value>
+	  <description>Enable caching of the global advertisement, as
+	  returned by ListResources without a slice argument. </description>
+	  </variable>
+
       </variablelist>
 
     </category>
 
     <!-- ======================================== -->
-    <category id="sfa_sm">
-      <name>Slice Manager</name>
-      <description>The settings that affect the slice manager that will run
-      as part of this SFA instance.</description>
+    <category id="sfa_db">
+      <name></name>
+      <description>The settings that tell this SFA instance where to find its database. You can essentially leave this as-is unless you plan on hosting your data on some other box.</description>
 
       <variablelist>
 	<variable id="enabled" type="boolean">
-	  <name>Enable Slice Manager</name>
+	  <name>Enabled</name>
 	  <value>true</value>
-	  <description>Allows this local SFA instance to run as a
-	  slice manager.</description>
-	</variable>
-
-	<variable id="type" type="string">
-	  <name>Slice Manager type</name>
-	  <value>pl</value>
-	  <description>The type of backend server for this
-	  slice manager. Not all slice managers are myplc.</description>
+	  <description>Enable the database server on this machine.</description>
 	</variable>
 
 	<variable id="host" type="hostname">
-	  <name>Hostname</name>
+	  <name>Database host</name>
 	  <value>localhost</value>
-	  <description>The hostname where the slice manager is expected to
-	  be found.</description>
+	  <description>The host where the SFA database can be reached.</description>
 	</variable>
 
 	<variable id="port" type="int">
-	  <name>Port number</name>
-	  <value>12347</value>
-	  <description>The port where the slice manager is to be found.</description>
+	  <name>Database port</name>
+	  <value>5432</value>
+	  <description>The port where the SFA database can be reached.</description>
 	</variable>
+
+	<variable id="user" type="string">
+	  <name>Database user</name>
+	  <value>sfadbuser</value>
+	  <description>When SFA gets co-hosted with a myplc, this should match the PLC config.</description>
+	</variable>
+
+	<variable id="password" type="string">
+	  <name>Database password</name>
+	  <value></value>
+	  <description>When SFA gets co-hosted with a myplc, this should match the PLC config.</description>
+	</variable>
+
+	<variable id="name" type="string">
+	  <name>Database name</name>
+	  <value>sfa</value>
+	  <description>SFA database name.</description>
+	</variable>
+
+
       </variablelist>
     </category>
 
@@ -232,36 +247,33 @@ Thierry Parmentelat
 	  <description>Full URL of PLC interface.</description>
 	</variable>
 
-	<variable id="db_name" type="string">
-	  <name>Database name</name>
-	  <value>planetlab5</value>
-	  <description>Planetlab database name.</description>
-	</variable>
-
-	<variable id="db_host" type="hostname">
-	  <name>Datbase host</name>
-	  <value>localhost</value>
-	  <description>The host where the PLC database can be reached.</description>
-	</variable>
-
-	<variable id="db_port" type="int">
-	  <name>Database port</name>
-	  <value>5432</value>
-	  <description>The port where the PLC database can be reached.</description>
-	</variable>
+      </variablelist>
+    </category>
 
-	<variable id="db_user" type="string">
-	  <name>Database user</name>
-	  <value>pgsqluser</value>
-	  <description></description>
-	</variable>
 
-	<variable id="db_password" type="string">
-	  <name>Database password</name>
-	  <value></value>
-	  <description>The password for PLC_DB_USER.</description>
-	</variable>
+    <!-- ======================================== -->
+    <category id="sfa_flashpolicy">
+      <name>SFA Flash Policy</name>
+      <description>The settings that affect the flash policy server that will run
+      as part of this SFA instance.</description>
 
+      <variablelist>
+        <variable id="enabled" type="boolean">
+          <name>Enable Flash Policy Server</name>
+          <value>false</value>
+          <description>Allows this local SFA instance to run a
+          flash policy server.</description>
+        </variable>
+        <variable id="config_file" type="string">
+          <name>Flash policy config file</name>
+          <value>/etc/sfa/sfa_flashpolicy_config.xml</value>
+          <description>The path to where the flash policy config file can be reached.</description>
+        </variable>
+        <variable id="port" type="int">
+          <name>Flash policy port</name>
+          <value>843</value>
+          <description>The flash policy server port.</description>
+        </variable>
       </variablelist>
     </category>