X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=37cd6cce4849c8d2c84f61d4f82d9dd5df3556d8;hb=2bd91aa4194b262be0a924f93f9c035952013247;hp=728fa8845f548ca740bcdb6d7b63de26bf356546;hpb=c94df70fb55a913225baf84ec3a0639b48a665ec;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index 728fa884..37cd6cce 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -14,6 +14,27 @@ $URL$
 <configuration>
   <variables>
 
+    <!-- ======================================== -->
+    <category id="sfa">
+      <name>General</name>
+      <description>Basic system variables.</description>
+
+      <variablelist>
+	<variable id="interface_hrn" type="string">
+	  <name>Human readable name</name>
+	  <value>plc</value>
+	  <description>The human readable name for this interface.</description>
+	</variable>
+
+	<variable id="api_debug" type="boolean">
+	  <name>Debug</name>
+	  <value>false</value>
+	  <description>Flag to turn debug on.</description>
+	</variable>
+
+      </variablelist>
+    </category>
+
     <!-- ======================================== -->
     <category id="sfa_registry">
       <name>Registry</name>
@@ -55,14 +76,7 @@ $URL$
 	  <description>The hrn of the registry's root auth.</description>
 	</variable>
 
-	<variable id="level1_auth" type="string">
-	  <name>Level1 Authority</name>
-	  <value></value>
-	  <description>The hrn of the registry's level1 auth (sub
-	  authority). The full name of this interface (only secify if
-	  this interface is a sub authority).</description>
-	</variable>
-      </variablelist>
+    </variablelist>
     </category>
 
     <!-- ======================================== -->
@@ -85,6 +99,12 @@ $URL$
 	  <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>
@@ -100,6 +120,42 @@ $URL$
 	</variable>
       </variablelist>
 
+    </category>
+    <!-- ======================================== -->
+    <category id="sfa_geni_aggregate">
+      <name>GENI Aggregate</name>
+      <description>The settings that affect the geni aggregate manager that will run
+      as part of this SFA instance.</description>
+
+      <variablelist>
+	<variable id="enabled" type="boolean">
+	  <name>Enable GENI 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>
+	</variable>
+
+	<variable id="host" type="hostname">
+	  <name>Hostname</name>
+	  <value>localhost</value>
+	  <description>The hostname where the aggregate is expected to
+	  be found.</description>
+	</variable>
+
+	<variable id="port" type="int">
+	  <name>Port number</name>
+	  <value>12348</value>
+	  <description>The port where the aggregate is to be found.</description>
+	</variable>
+      </variablelist>
+
     </category>
 
     <!-- ======================================== -->
@@ -132,7 +188,7 @@ $URL$
 
 	<variable id="port" type="int">
 	  <name>Port number</name>
-	  <value>12346</value>
+	  <value>12347</value>
 	  <description>The port where the slice manager is to be found.</description>
 	</variable>
       </variablelist>
@@ -174,7 +230,7 @@ $URL$
 	  <description>The host where the PLC database can be reached.</description>
 	</variable>
 
-	<variable id="db_port" type="string">
+	<variable id="db_port" type="int">
 	  <name>Database port</name>
 	  <value>5432</value>
 	  <description>The port where the PLC database can be reached.</description>