cpee 2.0.6 → 2.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/config.json +3 -0
  3. data/cockpit/css/track.css +17 -6
  4. data/cockpit/css/ui.css +6 -2
  5. data/cockpit/css/wfadaptor.css +1 -1
  6. data/cockpit/edit.html +1 -0
  7. data/cockpit/index.html +2 -2
  8. data/cockpit/js/instance.js +75 -55
  9. data/cockpit/js/track.js +10 -0
  10. data/cockpit/js/ui.js +47 -16
  11. data/cockpit/templates/Track Test Local.xml +82 -0
  12. data/cockpit/templates/Track Test.xml +82 -0
  13. data/cockpit/templates/instantiate.local/Take_Sub.xml +59 -0
  14. data/cockpit/templates/instantiate/Take_Perf.xml +46 -0
  15. data/cockpit/templates/instantiate/Take_Sub.xml +58 -0
  16. data/cockpit/templates/instantiate/Take_X.xml +48 -0
  17. data/cockpit/themes/compact/rngs/call.rng +5 -0
  18. data/cockpit/themes/compact/rngs/callmanipulate.rng +6 -1
  19. data/cockpit/themes/compact/rngs/loop.rng +1 -1
  20. data/cockpit/themes/compact/rngs/parallel.rng +1 -1
  21. data/cockpit/themes/default/rngs/call.rng +5 -0
  22. data/cockpit/themes/default/rngs/callmanipulate.rng +6 -1
  23. data/cockpit/themes/default/rngs/loop.rng +1 -1
  24. data/cockpit/themes/default/rngs/parallel.rng +1 -1
  25. data/cockpit/themes/extended/rngs/call.rng +5 -0
  26. data/cockpit/themes/extended/rngs/callmanipulate.rng +6 -1
  27. data/cockpit/themes/extended/rngs/loop.rng +1 -1
  28. data/cockpit/themes/extended/rngs/parallel.rng +1 -1
  29. data/cockpit/themes/extended/theme.js +4 -0
  30. data/cockpit/themes/model/theme.js +1 -1
  31. data/cockpit/themes/packed/rngs/call.rng +5 -0
  32. data/cockpit/themes/packed/rngs/callmanipulate.rng +6 -1
  33. data/cockpit/themes/packed/rngs/loop.rng +1 -1
  34. data/cockpit/themes/packed/rngs/parallel.rng +1 -1
  35. data/cockpit/themes/preset/rngs/call.rng +5 -0
  36. data/cockpit/themes/preset/rngs/callmanipulate.rng +6 -1
  37. data/cockpit/themes/preset/rngs/loop.rng +1 -1
  38. data/cockpit/themes/preset/rngs/parallel.rng +1 -1
  39. data/cockpit/track.html +37 -8
  40. data/cpee.gemspec +3 -3
  41. data/lib/cpee/implementation.rb +15 -6
  42. data/lib/cpee/implementation_notifications.rb +80 -51
  43. data/lib/cpee/implementation_properties.rb +5 -2
  44. data/lib/cpee/persistence.rb +3 -0
  45. data/server/handlerwrappers/default.rb +3 -0
  46. data/server/routing/forward-events.rb +2 -1
  47. data/server/routing/forward-votes.rb +1 -1
  48. data/server/server.conf +4 -0
  49. data/tools/cpee +17 -9
  50. metadata +17 -10
  51. data/cockpit/templates/convert_cpee2.rb +0 -15
  52. data/cockpit/themes/convert_cpee2.rb +0 -8
@@ -0,0 +1,82 @@
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <dataelements>
3
+ <i>0</i>
4
+ </dataelements>
5
+ <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
+ <endpoints>
7
+ <start_url>https://cpee.org/flow/start/url/</start_url>
8
+ </endpoints>
9
+ <positions/>
10
+ <description>
11
+ <description xmlns="http://cpee.org/ns/description/1.0">
12
+ <loop mode="pre_test" condition="true">
13
+ <parallel wait="-1">
14
+ <loop mode="pre_test" condition="data.i &lt; 4">
15
+ <_probability>
16
+ <_probability_min/>
17
+ <_probability_max/>
18
+ <_probability_avg/>
19
+ </_probability>
20
+ <parallel_branch pass="" local="">
21
+ <call id="a1" endpoint="start_url">
22
+ <parameters>
23
+ <label>Start</label>
24
+ <method>:post</method>
25
+ <arguments>
26
+ <behavior>wait_running</behavior>
27
+ <url>https://cpee.org/flow/templates/instantiate/Take_Sub.xml</url>
28
+ <init>
29
+ <time>4</time>
30
+ </init>
31
+ <endpoints/>
32
+ <stream/>
33
+ </arguments>
34
+ <stream>
35
+ <sensors/>
36
+ <aggregators/>
37
+ <costs/>
38
+ </stream>
39
+ <report>
40
+ <url/>
41
+ </report>
42
+ </parameters>
43
+ <annotations>
44
+ <_timing>
45
+ <_timing_wait/>
46
+ <_timing_threshold/>
47
+ <_timing_min/>
48
+ <_timing_max/>
49
+ <_timing_avg/>
50
+ </_timing>
51
+ <_notes>
52
+ <_notes_general/>
53
+ </_notes>
54
+ </annotations>
55
+ </call>
56
+ </parallel_branch>
57
+ <manipulate id="a4" label="">data.i += 1</manipulate>
58
+ </loop>
59
+ </parallel>
60
+ <manipulate id="a3" label="">data.i = 0</manipulate>
61
+ <_probability>
62
+ <_probability_min/>
63
+ <_probability_max/>
64
+ <_probability_avg/>
65
+ </_probability>
66
+ <stop id="a2"/>
67
+ </loop>
68
+ </description>
69
+ </description>
70
+ <transformation>
71
+ <description type="copy"/>
72
+ <dataelements type="none"/>
73
+ <endpoints type="none"/>
74
+ </transformation>
75
+ <attributes>
76
+ <info>Track Test</info>
77
+ <modeltype>CPEE</modeltype>
78
+ <theme>default</theme>
79
+ <customer>pilotfabrik</customer>
80
+ <status>development</status>
81
+ </attributes>
82
+ </testset>
@@ -0,0 +1,59 @@
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <dataelements>
3
+ <time>5</time>
4
+ </dataelements>
5
+ <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
+ <endpoints>
7
+ <start_url>http://localhost:9296/url/</start_url>
8
+ </endpoints>
9
+ <positions/>
10
+ <description>
11
+ <description xmlns="http://cpee.org/ns/description/1.0">
12
+ <call id="a1" endpoint="start_url">
13
+ <parameters>
14
+ <label>Start</label>
15
+ <method>:post</method>
16
+ <arguments>
17
+ <behavior>wait_running</behavior>
18
+ <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url
19
+ <init/>
20
+ <endpoints/>
21
+ <stream/>
22
+ </arguments>
23
+ <stream>
24
+ <sensors/>
25
+ <aggregators/>
26
+ <costs/>
27
+ </stream>
28
+ <report>
29
+ <url/>
30
+ </report>
31
+ </parameters>
32
+ <annotations>
33
+ <_timing>
34
+ <_timing_wait/>
35
+ <_timing_threshold/>
36
+ <_timing_min/>
37
+ <_timing_max/>
38
+ <_timing_avg/>
39
+ </_timing>
40
+ <_notes>
41
+ <_notes_general/>
42
+ </_notes>
43
+ </annotations>
44
+ </call>
45
+ </description>
46
+ </description>
47
+ <transformation>
48
+ <description type="copy"/>
49
+ <dataelements type="none"/>
50
+ <endpoints type="none"/>
51
+ </transformation>
52
+ <attributes>
53
+ <info/>
54
+ <modeltype>CPEE</modeltype>
55
+ <theme>default</theme>
56
+ <customer>pilotfabrik</customer>
57
+ <status>development</status>
58
+ </attributes>
59
+ </testset>
@@ -0,0 +1,46 @@
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <dataelements>
3
+ <time>5</time>
4
+ </dataelements>
5
+ <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
+ <endpoints>
7
+ <fetch>https://cpee.org/perf</fetch>
8
+ </endpoints>
9
+ <positions/>
10
+ <description>
11
+ <description xmlns="http://cpee.org/ns/description/1.0">
12
+ <call id="a1" endpoint="fetch">
13
+ <parameters>
14
+ <label/>
15
+ <method>:get</method>
16
+ <arguments/>
17
+ </parameters>
18
+ <_timing>
19
+ <_timing_min/>
20
+ <_timing_max/>
21
+ <_timing_avg/>
22
+ </_timing>
23
+ <_notes>
24
+ <_notes_general/>
25
+ <_attachments/>
26
+ </_notes>
27
+ <code>
28
+ <finalize output="result"/>
29
+ <update output="result"/>
30
+ </code>
31
+ </call>
32
+ </description>
33
+ </description>
34
+ <transformation>
35
+ <description type="copy"/>
36
+ <dataelements type="none"/>
37
+ <endpoints type="none"/>
38
+ </transformation>
39
+ <attributes>
40
+ <info/>
41
+ <modeltype>CPEE</modeltype>
42
+ <theme>default</theme>
43
+ <customer>pilotfabrik</customer>
44
+ <status>development</status>
45
+ </attributes>
46
+ </testset>
@@ -0,0 +1,58 @@
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <dataelements/>
3
+ <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
4
+ <endpoints>
5
+ <start_url>https://cpee.org/flow/start/url/</start_url>
6
+ <timeout>https://cpee.org/services/timeout.php</timeout>
7
+ </endpoints>
8
+ <positions/>
9
+ <description>
10
+ <description xmlns="http://cpee.org/ns/description/1.0">
11
+ <call id="a1" endpoint="start_url">
12
+ <parameters>
13
+ <label>Start</label>
14
+ <method>:post</method>
15
+ <arguments>
16
+ <behavior>wait_running</behavior>
17
+ <url>https://cpee.org/flow/templates/instantiate/Take_X.xml</url>
18
+ <init/>
19
+ <endpoints/>
20
+ <stream/>
21
+ </arguments>
22
+ <stream>
23
+ <sensors/>
24
+ <aggregators/>
25
+ <costs/>
26
+ </stream>
27
+ <report>
28
+ <url/>
29
+ </report>
30
+ </parameters>
31
+ <annotations>
32
+ <_timing>
33
+ <_timing_wait/>
34
+ <_timing_threshold/>
35
+ <_timing_min/>
36
+ <_timing_max/>
37
+ <_timing_avg/>
38
+ </_timing>
39
+ <_notes>
40
+ <_notes_general/>
41
+ </_notes>
42
+ </annotations>
43
+ </call>
44
+ </description>
45
+ </description>
46
+ <transformation>
47
+ <description type="copy"/>
48
+ <dataelements type="none"/>
49
+ <endpoints type="none"/>
50
+ </transformation>
51
+ <attributes>
52
+ <info/>
53
+ <modeltype>CPEE</modeltype>
54
+ <theme>default</theme>
55
+ <customer>pilotfabrik</customer>
56
+ <status>development</status>
57
+ </attributes>
58
+ </testset>
@@ -0,0 +1,48 @@
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <dataelements>
3
+ <time>15</time>
4
+ </dataelements>
5
+ <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
+ <endpoints>
7
+ <timeout>https://cpee.org/services/timeout.php</timeout>
8
+ </endpoints>
9
+ <positions/>
10
+ <description>
11
+ <description xmlns="http://cpee.org/ns/description/1.0">
12
+ <call id="a1" endpoint="timeout">
13
+ <parameters>
14
+ <label/>
15
+ <method>:get</method>
16
+ <arguments>
17
+ <timeout>!data.time</timeout>
18
+ </arguments>
19
+ </parameters>
20
+ <_timing>
21
+ <_timing_min/>
22
+ <_timing_max/>
23
+ <_timing_avg/>
24
+ </_timing>
25
+ <_notes>
26
+ <_notes_general/>
27
+ <_attachments/>
28
+ </_notes>
29
+ <code>
30
+ <finalize output="result">data.duration = data.time</finalize>
31
+ <update output="result"/>
32
+ </code>
33
+ </call>
34
+ </description>
35
+ </description>
36
+ <transformation>
37
+ <description type="copy"/>
38
+ <dataelements type="none"/>
39
+ <endpoints type="none"/>
40
+ </transformation>
41
+ <attributes>
42
+ <info/>
43
+ <modeltype>CPEE</modeltype>
44
+ <theme>default</theme>
45
+ <customer>pilotfabrik</customer>
46
+ <status>development</status>
47
+ </attributes>
48
+ </testset>
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="annotations" rngui:header="Annotations">
94
99
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="code" rngui:header="Implementation">
94
99
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -137,4 +142,4 @@
137
142
  </element>
138
143
  </element>
139
144
  </element>
140
- </element>
145
+ </element>
@@ -19,4 +19,4 @@
19
19
  <data type="nonNegativeInteger" rngui:label="Times"/>
20
20
  </element>
21
21
  </element>
22
- </element>
22
+ </element>
@@ -18,4 +18,4 @@
18
18
  <data type="string"/>
19
19
  </attribute>
20
20
  </element>
21
- </element>
21
+ </element>
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="annotations" rngui:header="Annotations">
94
99
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="code" rngui:header="Implementation">
94
99
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -137,4 +142,4 @@
137
142
  </element>
138
143
  </element>
139
144
  </element>
140
- </element>
145
+ </element>
@@ -19,4 +19,4 @@
19
19
  <data type="nonNegativeInteger" rngui:label="Times"/>
20
20
  </element>
21
21
  </element>
22
- </element>
22
+ </element>
@@ -18,4 +18,4 @@
18
18
  <data type="string"/>
19
19
  </attribute>
20
20
  </element>
21
- </element>
21
+ </element>
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="annotations" rngui:header="Annotations">
94
99
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="code" rngui:header="Implementation">
94
99
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -137,4 +142,4 @@
137
142
  </element>
138
143
  </element>
139
144
  </element>
140
- </element>
145
+ </element>
@@ -19,4 +19,4 @@
19
19
  <data type="nonNegativeInteger" rngui:label="Times"/>
20
20
  </element>
21
21
  </element>
22
- </element>
22
+ </element>
@@ -18,4 +18,4 @@
18
18
  <data type="string"/>
19
19
  </attribute>
20
20
  </element>
21
- </element>
21
+ </element>
@@ -267,6 +267,7 @@ function WFAdaptorManifestation(adaptor) {
267
267
  var ep = self.endpoints[$(node).attr('endpoint')];
268
268
  var wait = $('_timing_wait',$(node).children('annotations')).text();
269
269
  var threshold = $('_timing_threshold',$(node).children('annotations')).text();
270
+ var adur = $('_timing_avg',$(node).children('annotations')).text();
270
271
  var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
271
272
  var ret = [ { column: 'ID', value: $(node).attr('id') } ];
272
273
  if (lab != '') {
@@ -278,6 +279,9 @@ function WFAdaptorManifestation(adaptor) {
278
279
  if (threshold != '') {
279
280
  ret.push({ column: 'Threshold', value: 'κ = ' + threshold });
280
281
  }
282
+ if (adur != '') {
283
+ ret.push({ column: 'Duration', value: '~T = ' + adur + 'm' });
284
+ }
281
285
  return ret;
282
286
  },
283
287
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },