Merge branch 'master' into senslab2

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index c515a57..6158905 100644 (file)
--- 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">
@@ -85,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>
@@ -129,13 +116,6 @@ Thierry Parmentelat
          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>
-       </variable>
-
        <variable id="host" type="hostname">
          <name>Hostname</name>
          <value>localhost</value>
@@ -148,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>
 
@@ -165,19 +153,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 +165,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>
@@ -220,7 +203,7 @@ Thierry Parmentelat
 
        <variable id="user" type="string">
          <name>Database user</name>
-         <value>pgsqluser</value>
+         <value>sfadbuser</value>
          <description>When SFA gets co-hosted with a myplc, this should match the PLC config.</description>
        </variable>