Skip to content

Commit c18222c

Browse files
rbeker-BMCrbeker-BMC
authored
Merge pull request #66 from controlm/behavior-of-events
Events behavior
2 parents a143543 + 4c39802 commit c18222c

File tree

22 files changed

+1399
-275
lines changed

22 files changed

+1399
-275
lines changed

‎docs/_sources/notebooks/jobproperties.ipynb.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,9 +1015,9 @@
10151015
"metadata": {},
10161016
"outputs": [],
10171017
"source": [
1018-
"waitForEventList = WaitForEvents(\"WaitForEvent\", events=[Condition(event=\"e1\"),Condition(event=\"e2\"), Condition(event=\"e3\", date=Event.Date.AnyDate)])\n",
1018+
"waitForEventList = WaitForEvents([Event(event=\"e1\"), Event(event=\"e2\"), Event(event=\"e3\", date=Event.Date.AnyDate)])\n",
10191019
"job = JobCommand('Job1', command='echo Hello')\n",
1020-
"job.wait_for_events_list.insert(0, waitForEventList)"
1020+
"job.event_list.append(waitForEventList)"
10211021
]
10221022
},
10231023
{
@@ -1035,9 +1035,9 @@
10351035
"metadata": {},
10361036
"outputs": [],
10371037
"source": [
1038-
"addEventListObject = AddEvents('eventsToAdd', events=[ConditionOutAdd(event=\"e4\",date=Event.Date.NoDate)])\n",
1038+
"addEventListObject = AddEvents([EventOutAdd(event=\"e4\",date=Event.Date.NoDate)])\n",
10391039
"job = JobCommand('Job1', command='echo Hello')\n",
1040-
"job.add_events_list.insert(0, waitForEventList)"
1040+
"job.event_list.append(addEventListObject)"
10411041
]
10421042
},
10431043
{
@@ -1055,9 +1055,9 @@
10551055
"metadata": {},
10561056
"outputs": [],
10571057
"source": [
1058-
"deleteEventListObject = DeleteEvents('eventsToDelete', events=[ConditionOutDelete(event=\"e5\",date=Event.Date.NextOrderDate)])\n",
1058+
"deleteEventListObject = DeleteEvents([EventOutDelete(event=\"e5\",date=Event.Date.NextOrderDate)])\n",
10591059
"job = JobCommand('Job1', command='echo Hello')\n",
1060-
"job.delete_events_list.insert(0, deleteEventListObject)"
1060+
"job.event_list.append(deleteEventListObject)"
10611061
]
10621062
}
10631063
],

‎docs/aapi.html‎

Lines changed: 327 additions & 130 deletions
Large diffs are not rendered by default.

‎docs/aapi.integration_factory.html‎

Lines changed: 651 additions & 63 deletions
Large diffs are not rendered by default.

‎docs/genindex.html‎

Lines changed: 264 additions & 28 deletions
Large diffs are not rendered by default.

‎docs/notebooks/jobproperties.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -958,9 +958,9 @@ <h3>WaitForEvents<a class="headerlink" href="#WaitForEvents" title="Permalink to
958958
<div class="prompt highlight-none notranslate"><div class="highlight"><pre><span></span>[32]:
959959
</pre></div>
960960
</div>
961-
<div class="input_area highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="n">waitForEventList</span> <span class="o">=</span> <span class="n">WaitForEvents</span><span class="p">(</span><span class="s2">&quot;WaitForEvent&quot;</span><span class="p">,</span> <span class="n">events</span><span class="o">=</span><span class="p">[</span><span class="n">Condition</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e1&quot;</span><span class="p">),</span><span class="n">Condition</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e2&quot;</span><span class="p">),</span> <span class="n">Condition</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e3&quot;</span><span class="p">,</span> <span class="n">date</span><span class="o">=</span><span class="n">Event</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">AnyDate</span><span class="p">)])</span>
961+
<div class="input_area highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="n">waitForEventList</span> <span class="o">=</span> <span class="n">WaitForEvents</span><span class="p">([</span><span class="n">Event</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e1&quot;</span><span class="p">),</span> <span class="n">Event</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e2&quot;</span><span class="p">),</span> <span class="n">Event</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e3&quot;</span><span class="p">,</span> <span class="n">date</span><span class="o">=</span><span class="n">Event</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">AnyDate</span><span class="p">)])</span>
962962
<span class="n">job</span> <span class="o">=</span> <span class="n">JobCommand</span><span class="p">(</span><span class="s1">&#39;Job1&#39;</span><span class="p">,</span> <span class="n">command</span><span class="o">=</span><span class="s1">&#39;echo Hello&#39;</span><span class="p">)</span>
963-
<span class="n">job</span><span class="o">.</span><span class="n">wait_for_events_list</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">waitForEventList</span><span class="p">)</span>
963+
<span class="n">job</span><span class="o">.</span><span class="n">event_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">waitForEventList</span><span class="p">)</span>
964964
</pre></div>
965965
</div>
966966
</div>
@@ -972,9 +972,9 @@ <h3>AddEvents<a class="headerlink" href="#AddEvents" title="Permalink to this he
972972
<div class="prompt highlight-none notranslate"><div class="highlight"><pre><span></span>[33]:
973973
</pre></div>
974974
</div>
975-
<div class="input_area highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="n">addEventListObject</span> <span class="o">=</span> <span class="n">AddEvents</span><span class="p">(</span><span class="s1">&#39;eventsToAdd&#39;</span><span class="p">,</span> <span class="n">events</span><span class="o">=</span><span class="p">[</span><span class="n">ConditionOutAdd</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e4&quot;</span><span class="p">,</span><span class="n">date</span><span class="o">=</span><span class="n">Event</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">NoDate</span><span class="p">)])</span>
975+
<div class="input_area highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="n">addEventListObject</span> <span class="o">=</span> <span class="n">AddEvents</span><span class="p">([</span><span class="n">EventOutAdd</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e4&quot;</span><span class="p">,</span><span class="n">date</span><span class="o">=</span><span class="n">Event</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">NoDate</span><span class="p">)])</span>
976976
<span class="n">job</span> <span class="o">=</span> <span class="n">JobCommand</span><span class="p">(</span><span class="s1">&#39;Job1&#39;</span><span class="p">,</span> <span class="n">command</span><span class="o">=</span><span class="s1">&#39;echo Hello&#39;</span><span class="p">)</span>
977-
<span class="n">job</span><span class="o">.</span><span class="n">add_events_list</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">waitForEventList</span><span class="p">)</span>
977+
<span class="n">job</span><span class="o">.</span><span class="n">event_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">addEventListObject</span><span class="p">)</span>
978978
</pre></div>
979979
</div>
980980
</div>
@@ -986,9 +986,9 @@ <h3>DeleteEvents<a class="headerlink" href="#DeleteEvents" title="Permalink to t
986986
<div class="prompt highlight-none notranslate"><div class="highlight"><pre><span></span>[34]:
987987
</pre></div>
988988
</div>
989-
<div class="input_area highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="n">deleteEventListObject</span> <span class="o">=</span> <span class="n">DeleteEvents</span><span class="p">(</span><span class="s1">&#39;eventsToDelete&#39;</span><span class="p">,</span> <span class="n">events</span><span class="o">=</span><span class="p">[</span><span class="n">ConditionOutDelete</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e5&quot;</span><span class="p">,</span><span class="n">date</span><span class="o">=</span><span class="n">Event</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">NextOrderDate</span><span class="p">)])</span>
989+
<div class="input_area highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="n">deleteEventListObject</span> <span class="o">=</span> <span class="n">DeleteEvents</span><span class="p">([</span><span class="n">EventOutDelete</span><span class="p">(</span><span class="n">event</span><span class="o">=</span><span class="s2">&quot;e5&quot;</span><span class="p">,</span><span class="n">date</span><span class="o">=</span><span class="n">Event</span><span class="o">.</span><span class="n">Date</span><span class="o">.</span><span class="n">NextOrderDate</span><span class="p">)])</span>
990990
<span class="n">job</span> <span class="o">=</span> <span class="n">JobCommand</span><span class="p">(</span><span class="s1">&#39;Job1&#39;</span><span class="p">,</span> <span class="n">command</span><span class="o">=</span><span class="s1">&#39;echo Hello&#39;</span><span class="p">)</span>
991-
<span class="n">job</span><span class="o">.</span><span class="n">delete_events_list</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">deleteEventListObject</span><span class="p">)</span>
991+
<span class="n">job</span><span class="o">.</span><span class="n">event_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">deleteEventListObject</span><span class="p">)</span>
992992
</pre></div>
993993
</div>
994994
</div>

‎docs/notebooks/jobproperties.ipynb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,9 +1015,9 @@
10151015
"metadata": {},
10161016
"outputs": [],
10171017
"source": [
1018-
"waitForEventList = WaitForEvents(\"WaitForEvent\", events=[Condition(event=\"e1\"),Condition(event=\"e2\"), Condition(event=\"e3\", date=Event.Date.AnyDate)])\n",
1018+
"waitForEventList = WaitForEvents([Event(event=\"e1\"), Event(event=\"e2\"), Event(event=\"e3\", date=Event.Date.AnyDate)])\n",
10191019
"job = JobCommand('Job1', command='echo Hello')\n",
1020-
"job.wait_for_events_list.insert(0, waitForEventList)"
1020+
"job.event_list.append(waitForEventList)"
10211021
]
10221022
},
10231023
{
@@ -1035,9 +1035,9 @@
10351035
"metadata": {},
10361036
"outputs": [],
10371037
"source": [
1038-
"addEventListObject = AddEvents('eventsToAdd', events=[ConditionOutAdd(event=\"e4\",date=Event.Date.NoDate)])\n",
1038+
"addEventListObject = AddEvents([EventOutAdd(event=\"e4\",date=Event.Date.NoDate)])\n",
10391039
"job = JobCommand('Job1', command='echo Hello')\n",
1040-
"job.add_events_list.insert(0, waitForEventList)"
1040+
"job.event_list.append(addEventListObject)"
10411041
]
10421042
},
10431043
{
@@ -1055,9 +1055,9 @@
10551055
"metadata": {},
10561056
"outputs": [],
10571057
"source": [
1058-
"deleteEventListObject = DeleteEvents('eventsToDelete', events=[ConditionOutDelete(event=\"e5\",date=Event.Date.NextOrderDate)])\n",
1058+
"deleteEventListObject = DeleteEvents([EventOutDelete(event=\"e5\",date=Event.Date.NextOrderDate)])\n",
10591059
"job = JobCommand('Job1', command='echo Hello')\n",
1060-
"job.delete_events_list.insert(0, deleteEventListObject)"
1060+
"job.event_list.append(deleteEventListObject)"
10611061
]
10621062
}
10631063
],

‎docs/objects.inv‎

1.98 KB
Binary file not shown.

‎docs/searchindex.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs_source/source/notebooks/jobproperties.ipynb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,9 +1015,9 @@
10151015
"metadata": {},
10161016
"outputs": [],
10171017
"source": [
1018-
"waitForEventList = WaitForEvents(\"WaitForEvent\", events=[Condition(event=\"e1\"),Condition(event=\"e2\"), Condition(event=\"e3\", date=Event.Date.AnyDate)])\n",
1018+
"waitForEventList = WaitForEvents([Event(event=\"e1\"), Event(event=\"e2\"), Event(event=\"e3\", date=Event.Date.AnyDate)])\n",
10191019
"job = JobCommand('Job1', command='echo Hello')\n",
1020-
"job.wait_for_events_list.insert(0, waitForEventList)"
1020+
"job.event_list.append(waitForEventList)"
10211021
]
10221022
},
10231023
{
@@ -1035,9 +1035,9 @@
10351035
"metadata": {},
10361036
"outputs": [],
10371037
"source": [
1038-
"addEventListObject = AddEvents('eventsToAdd', events=[ConditionOutAdd(event=\"e4\",date=Event.Date.NoDate)])\n",
1038+
"addEventListObject = AddEvents([EventOutAdd(event=\"e4\",date=Event.Date.NoDate)])\n",
10391039
"job = JobCommand('Job1', command='echo Hello')\n",
1040-
"job.add_events_list.insert(0, waitForEventList)"
1040+
"job.event_list.append(addEventListObject)"
10411041
]
10421042
},
10431043
{
@@ -1055,9 +1055,9 @@
10551055
"metadata": {},
10561056
"outputs": [],
10571057
"source": [
1058-
"deleteEventListObject = DeleteEvents('eventsToDelete', events=[ConditionOutDelete(event=\"e5\",date=Event.Date.NextOrderDate)])\n",
1058+
"deleteEventListObject = DeleteEvents([EventOutDelete(event=\"e5\",date=Event.Date.NextOrderDate)])\n",
10591059
"job = JobCommand('Job1', command='echo Hello')\n",
1060-
"job.delete_events_list.insert(0, deleteEventListObject)"
1060+
"job.event_list.append(deleteEventListObject)"
10611061
]
10621062
}
10631063
],

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
name="ctm-python-client",
99
packages=find_packages(where="src"),
1010
package_dir={"": "src"},
11-
version="2.1.6",
11+
version="2.2.0",
1212
description="Python Workflows for Control-M",
1313
long_description=long_description,
1414
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)