Merge commit 'origin/master'

[myplc.git] / default_config.xml

diff --git a/default_config.xml b/default_config.xml
index 6befff6..bfaf788 100644 (file)
--- a/default_config.xml
+++ b/default_config.xml
@@ -673,6 +673,8 @@ $URL$
 
     <category id="plc_reservation">
       <name> Reservable Nodes</name>
+      <description> Settings related to reservable nodes </description>
+
       <variablelist>
        <variable id="granularity" type="int">
          <name>Lease granularity</name>
@@ -681,7 +683,7 @@ $URL$
          a node. All leases will be rounded to this granularity, so
          e.g. if you set 3600 all leases will start and stop at round
          hours.</description>
-         <variable>
+       </variable>
       </variablelist>
     </category>
 
@@ -808,6 +810,27 @@ $URL$
         </variable>
       </variablelist>
     </category>
+    <category id="myslice">
+      <name>MySlice</name>
+      <description>MySlice configuration parameters</description>
+      <variablelist>
+       <variable id="comon_url" type="string">
+         <name>comon</name>
+         <value></value>
+         <description>The address of the CoMon url that provides information for this PLC's nodes (if not the default http://comon.cs.princeton.edu/)</description>
+       </variable>
+       <variable id="comon_available" type="boolean">
+         <name>comon</name>
+         <value>false</value>
+         <description>True, if comon data are available for this PLC's nodes</description>
+       </variable>
+       <variable id="tophat_available" type="boolean">
+         <name>tophat</name>
+         <value>false</value>
+         <description>True, if tophat data are available for this PLC's nodes</description>
+       </variable>
+      </variablelist>
+    </category>
   </variables>
 
   <comps>