X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=de707b792e705b815a6e335c8b4d16ee17715a59;hb=4a2337e7f70cef81a8de37829aa63fc941c4b96e;hp=10471bc354cb142e3b400f43053443e47d36416f;hpb=f1557734f6d31e40711943e5cae8372b899dbc6f;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index 10471bc3..de707b79 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -33,22 +33,16 @@ Thierry Parmentelat
           <description>The human readable name for this interface.</description>
         </variable>
 
-        <variable id="aggregate_api_version" type="string">
-          <name>Aggregate Manager API Version</name>
-          <value>1</value>
-          <description>The Aggregate API version</description>
-        </variable>
-
         <variable id="credential_schema" type="string">
           <name>Credential Schema</name>
           <value>/etc/sfa/credential.xsd</value>
           <description>The path to the default credential schema</description>
         </variable>
 
-        <variable id="api_debug" type="boolean">
+        <variable id="api_loglevel" type="int">
           <name>Debug</name>
-          <value>false</value>
-          <description>Flag to turn debug on.</description>
+          <value>0</value>
+          <description>Logging level; 0=minimum, 1=info, 2=debug</description>
         </variable>
     
         <variable id="max_slice_renew" type="int">
@@ -68,6 +62,13 @@ Thierry Parmentelat
             </description> 
         </variable>
 
+         <variable id="data_dir" type="string">
+            <name>Data Directory </name>
+            <value>/var/lib/sfa/</value>
+            <description>Directory where cached certficiates and other data is stored.
+            </description>
+        </variable>
+
       </variablelist>
     </category>
 
@@ -85,13 +86,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>
@@ -124,16 +118,10 @@ Thierry Parmentelat
       <variablelist>
 	<variable id="enabled" type="boolean">
 	  <name>Enable Slice Manager</name>
-	  <value>true</value>
+	  <value>false</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>
+	  slice manager. Warning, this feature is not really supported
+	  any longer.</description>
 	</variable>
 
 	<variable id="host" type="hostname">
@@ -148,6 +136,14 @@ Thierry Parmentelat
 	  <value>12347</value>
 	  <description>The port where the slice manager is to be found.</description>
 	</variable>
+
+	<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>
 
@@ -165,19 +161,6 @@ Thierry Parmentelat
 	  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>
-	</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>
@@ -190,6 +173,14 @@ Thierry Parmentelat
 	  <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>
@@ -240,6 +231,32 @@ Thierry Parmentelat
       </variablelist>
     </category>
 
+    <!-- ======================================== -->
+    <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>
+
     <!-- ======================================== -->
     <category id="sfa_plc">
       <name></name>
@@ -267,33 +284,80 @@ Thierry Parmentelat
       </variablelist>
     </category>
 
+    <!-- ======================================== -->
+    <category id="sfa_federica">
+      <name></name>
+      <description>The settings that tell this SFA instance how to interact with the FEDERICA testbed.</description>
+
+      <variablelist>
+	<variable id="url" type="string">
+	  <name>XMLRPC URL</name>
+	  <value>https://root:password@federica.sfa.wrapper.com:8443/fedewrapper/xmlrpc/</value>
+	  <description>URL for the federica xmlrpc API; login and password need to be set like in http://login:password@hostname:port/the/path </description>
+	</variable>
+      </variablelist>
+    </category>
 
     <!-- ======================================== -->
-    <category id="sfa_flashpolicy">
+    <category id="sfa_nova">
       <name>SFA Flash Policy</name>
-      <description>The settings that affect the flash policy server that will run
-      as part of this SFA instance.</description>
-
+      <description>The settings that affect how SFA connects to 
+                   the Nova/EC2 API</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 id="user" type="string">
+          <name>Sfa nova user</name>
+          <value>novaadmin</value>
+          <description>Account/context to use when performing 
+                       administrative nova operations</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 id="api_url" type="string">
+          <name>Nova API url</name>
+          <value>127.0.0.1</value>
+          <description>The Nova/EC2 API url </description>
         </variable>
-        <variable id="port" type="int">
-          <name>Flash policy port</name>
-          <value>843</value>
-          <description>The flash policy server port.</description>
+        <variable id="api_port" type="int">
+          <name>Nova API Port</name>
+          <value>8773</value>
+          <description>The Nova/EC2 API port.</description>
+        </variable>
+        <variable id="novarc" type="string">
+          <name>novarc</name>
+          <value>/root/novarc</value>
+          <description>Path to novarc client config file</description>
+        </variable>
+      </variablelist>
+    </category>
+
+    <!-- ======================================== -->
+    <category id="sfa_nitos">
+      <name></name>
+      <description>The settings that tell this SFA instance how to interact with the NITOS testbed.</description>
+
+      <variablelist>
+        <variable id="url" type="string">
+          <name>XMLRPC URL</name>
+          <value>http://195.251.17.239:8080/RPC2</value>
+          <description>URL for the NITOS Scheduler xmlrpc API</description>
         </variable>
       </variablelist>
     </category>
 
+    <!-- ======================================== -->
+    <category id="sfa_dummy">
+      <name></name>
+      <description>The settings for using SFA with a demmy testbed.</description>
+
+      <variablelist>
+        <variable id="url" type="string">
+          <name>XMLRPC URL</name>
+          <value>http://127.0.0.1:8080</value>
+          <description>URL for the Dummy Testbed xmlrpc API</description>
+        </variable>
+      </variablelist>
+    </category>
+
+    <!-- ======================================== -->
+
   </variables>
 
   <comps>