[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30560 - in eclectic/gplmt/contrib: . tasklists
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30560 - in eclectic/gplmt/contrib: . tasklists |
|
Date: |
Wed, 6 Nov 2013 11:41:36 +0100 |
Author: wachs
Date: 2013-11-06 11:41:36 +0100 (Wed, 06 Nov 2013)
New Revision: 30560
Added:
eclectic/gplmt/contrib/tasklists/example_node.xml
eclectic/gplmt/contrib/tasklists/example_start_absolute.xml
eclectic/gplmt/contrib/tasklists/example_start_relative.xml
Removed:
eclectic/gplmt/contrib/simpletasks.xml
Modified:
eclectic/gplmt/contrib/tasklist_schema.xsd
eclectic/gplmt/contrib/tasklists/check_fedora_version.xml
Log:
schema extension and examples
Deleted: eclectic/gplmt/contrib/simpletasks.xml
===================================================================
--- eclectic/gplmt/contrib/simpletasks.xml 2013-11-06 10:26:19 UTC (rev
30559)
+++ eclectic/gplmt/contrib/simpletasks.xml 2013-11-06 10:41:36 UTC (rev
30560)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tasklist name="Simple task list"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
- <run id="0" name="get date">
- <command>sudo date</command>
- <arguments></arguments>
- <timeout>10</timeout>
- <expected_return_code>0</expected_return_code>
- <expected_output></expected_output>
- <stop_on_fail>true</stop_on_fail>
- </run>
-</tasklist>
Modified: eclectic/gplmt/contrib/tasklist_schema.xsd
===================================================================
--- eclectic/gplmt/contrib/tasklist_schema.xsd 2013-11-06 10:26:19 UTC (rev
30559)
+++ eclectic/gplmt/contrib/tasklist_schema.xsd 2013-11-06 10:41:36 UTC (rev
30560)
@@ -10,7 +10,6 @@
<xs:element name="link" type="link" />
<xs:element name="run" type="run" />
<xs:element name="run_per_host" type="run_per_host" />
- <xs:element name="monitor" type="monitor" />
<xs:element name="put" type="put" />
<xs:element name="get" type="get" />
</xs:choice>
@@ -40,15 +39,28 @@
<xs:complexType name="sequence">
<xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="sequence" type="sequence" />
- <xs:element name="parallel" type="parallel" />
- <xs:element name="link" type="link" />
- <xs:element name="run" type="run" />
- <xs:element name="run_per_host" type="run_per_host" />
- <xs:element name="monitor" type="monitor" />
- <xs:element name="put" type="put" />
- <xs:element name="get" type="get" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <!-- experiment start/stop control -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="start_absolute" type="xs:dateTime"/>
+ <xs:element name="start_relative" type="xs:duration"/>
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="stop_absolute" type="xs:dateTime"/>
+ <xs:element name="stop_relative" type="xs:duration"/>
+ </xs:choice>
+ <!-- experiment start/stop control -->
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="node" type="xs:string"/>
+ </xs:choice>
+
+ <xs:element name="sequence" type="sequence" />
+ <xs:element name="parallel" type="parallel" />
+ <xs:element name="link" type="link" />
+ <xs:element name="run" type="run" />
+ <xs:element name="run_per_host" type="run_per_host" />
+ <xs:element name="put" type="put" />
+ <xs:element name="get" type="get" />
</xs:choice>
</xs:sequence>
<xs:attribute name="name" type="xs:string"/>
@@ -57,15 +69,27 @@
<xs:complexType name="parallel">
<xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="sequence" type="sequence" />
- <xs:element name="parallel" type="parallel" />
- <xs:element name="link" type="link" />
- <xs:element name="run" type="run" />
- <xs:element name="run_per_host" type="run_per_host" />
- <xs:element name="monitor" type="monitor" />
- <xs:element name="put" type="put" />
- <xs:element name="get" type="get" />
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <!-- experiment start/stop control -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="start_absolute" type="xs:dateTime"/>
+ <xs:element name="start_relative" type="xs:duration"/>
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="stop_absolute" type="xs:dateTime"/>
+ <xs:element name="stop_relative" type="xs:duration"/>
+ </xs:choice>
+ <!-- experiment start/stop control -->
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="node" type="xs:string"/>
+ </xs:choice>
+ <xs:element name="sequence" type="sequence" />
+ <xs:element name="parallel" type="parallel" />
+ <xs:element name="link" type="link" />
+ <xs:element name="run" type="run" />
+ <xs:element name="run_per_host" type="run_per_host" />
+ <xs:element name="put" type="put" />
+ <xs:element name="get" type="get" />
</xs:choice>
</xs:sequence>
<xs:attribute name="name" type="xs:string"/>
@@ -73,8 +97,23 @@
</xs:complexType>
<xs:complexType name="run">
- <xs:sequence>
- <xs:element name="command" type="xs:string"/>
+ <xs:sequence>
+ <!-- experiment start/stop control -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="start_absolute" type="xs:dateTime"/>
+ <xs:element name="start_relative" type="xs:duration"/>
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="stop_absolute" type="xs:dateTime"/>
+ <xs:element name="stop_relative" type="xs:duration"/>
+ </xs:choice>
+ <!-- experiment start/stop control -->
+
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="node" type="xs:string"/>
+ </xs:choice>
+
+ <xs:element name="command" type="xs:string"/>
<xs:element name="arguments" type="xs:string"/>
<xs:element name="timeout" type="xs:integer"/>
<xs:element name="expected_return_code" type="xs:integer"/>
@@ -88,6 +127,17 @@
<xs:complexType name="run_per_host">
<xs:sequence>
+ <!-- experiment start/stop control -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="start_absolute" type="xs:dateTime"/>
+ <xs:element name="start_relative" type="xs:duration"/>
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="stop_absolute" type="xs:dateTime"/>
+ <xs:element name="stop_relative" type="xs:duration"/>
+ </xs:choice>
+ <!-- experiment start/stop control -->
+
<xs:element name="command_file" type="xs:string"/>
<xs:element name="output_prefix" type="xs:string"/>
<xs:element name="timeout" type="xs:integer"/>
@@ -98,20 +148,6 @@
<xs:attribute name="id" type="xs:integer"/>
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="enabled" type="xs:boolean"/>
-</xs:complexType>
-
-<xs:complexType name="monitor">
- <xs:sequence>
- <xs:element name="command" type="xs:string"/>
- <xs:element name="arguments" type="xs:string"/>
- <xs:element name="timeout" type="xs:integer"/>
- <xs:element name="expected_return_code" type="xs:integer"/>
- <xs:element name="expected_output" type="xs:string"/>
- <xs:element name="stop_on_fail" type="xs:boolean"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:integer"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="enabled" type="xs:boolean"/>
</xs:complexType>
<xs:complexType name="put">
@@ -126,7 +162,7 @@
</xs:complexType>
<xs:complexType name="get">
- <xs:sequence>
+ <xs:sequence>
<xs:element name="source" type="xs:string"/>
<xs:element name="destination" type="xs:string"/>
<xs:element name="stop_on_fail" type="xs:boolean"/>
Modified: eclectic/gplmt/contrib/tasklists/check_fedora_version.xml
===================================================================
--- eclectic/gplmt/contrib/tasklists/check_fedora_version.xml 2013-11-06
10:26:19 UTC (rev 30559)
+++ eclectic/gplmt/contrib/tasklists/check_fedora_version.xml 2013-11-06
10:41:36 UTC (rev 30560)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tasklist name="Check for fedora 12 on node"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
+<tasklist name="Check for fedora 12 on node"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="tasklist_schema.xsd">
<run id="0" name="check peer">
<!-- Check if peer is working -->
Added: eclectic/gplmt/contrib/tasklists/example_node.xml
===================================================================
--- eclectic/gplmt/contrib/tasklists/example_node.xml
(rev 0)
+++ eclectic/gplmt/contrib/tasklists/example_node.xml 2013-11-06 10:41:36 UTC
(rev 30560)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tasklist name="Example task list with a task starting 3 minutes after
experiment was started and is running for 5 minutes"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
+ <run id="0" name="get date">
+ <node>localhost</node>
+ <command>date</command>
+ <arguments></arguments>
+ <timeout>10</timeout>
+ <expected_return_code>0</expected_return_code>
+ <expected_output></expected_output>
+ <stop_on_fail>true</stop_on_fail>
+ </run>
+</tasklist>
Copied: eclectic/gplmt/contrib/tasklists/example_start_absolute.xml (from rev
30251, eclectic/gplmt/contrib/simpletasks.xml)
===================================================================
--- eclectic/gplmt/contrib/tasklists/example_start_absolute.xml
(rev 0)
+++ eclectic/gplmt/contrib/tasklists/example_start_absolute.xml 2013-11-06
10:41:36 UTC (rev 30560)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tasklist name="Example task list with a task starting at 30/12/13 9:00 ending
30/12/13 12:00" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
+ <run id="0" name="get date">
+ <start_absolute>2013-12-30T09:00:00</start_absolute>
+ <stop_absolute>2013-12-30T12:00:00</stop_absolute>
+ <command>sudo date</command>
+ <arguments></arguments>
+ <timeout>10</timeout>
+ <expected_return_code>0</expected_return_code>
+ <expected_output></expected_output>
+ <stop_on_fail>true</stop_on_fail>
+ </run>
+</tasklist>
Added: eclectic/gplmt/contrib/tasklists/example_start_relative.xml
===================================================================
--- eclectic/gplmt/contrib/tasklists/example_start_relative.xml
(rev 0)
+++ eclectic/gplmt/contrib/tasklists/example_start_relative.xml 2013-11-06
10:41:36 UTC (rev 30560)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tasklist name="Example task list with a task starting 3 minutes after
experiment was started and is running for 5 minutes"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="../tasklist_schema.xsd">
+ <run id="0" name="get date">
+ <start_relative>P3M</start_relative>
+ <stop_relative>P5M</stop_relative>
+ <command></command>
+ <arguments></arguments>
+ <timeout>10</timeout>
+ <expected_return_code>0</expected_return_code>
+ <expected_output></expected_output>
+ <stop_on_fail>true</stop_on_fail>
+ </run>
+</tasklist>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30560 - in eclectic/gplmt/contrib: . tasklists,
gnunet <=