Merged trunk in from 17245:17645

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index 238c710..a63b56b 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -106,6 +106,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>
@@ -121,6 +127,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>
 
     <!-- ======================================== -->
@@ -153,7 +195,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>