X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=b08f738e5fb6fa8ad8174276c064209054ba888b;hb=a692f60f6cfe4e24727f01042b1e1019846c7846;hp=e074865ef7d2a57f73d9c3265fc1854a4b9ab777;hpb=0d8c502d5ede80349764103f580c4000a8fce97a;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index e074865e..b08f738e 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -39,10 +39,10 @@ Thierry Parmentelat
           <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">
@@ -128,6 +128,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>
 
@@ -145,12 +153,6 @@ Thierry Parmentelat
 	  aggregate 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>
@@ -164,6 +166,13 @@ Thierry Parmentelat
 	  <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>
@@ -214,6 +223,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>
@@ -241,29 +276,41 @@ 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>
       </variablelist>
     </category>