Skip to content

Commit 411582f

Browse files
author
rbeker-BMC
committed
fix Workflow methods chain and connect #70
1 parent 8ceb506 commit 411582f

1 file changed

Lines changed: 4 additions & 23 deletions

File tree

src/ctm_python_client/core/workflow.py

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -185,45 +185,26 @@ def connect(self, srcpath: str, destpath: str, *, inpath: str = None):
185185
# self._connections[key_name] = {'count': 1, 'name': event_name}
186186
self._connections[event_name] = [key_name]
187187

188-
# Write the add, wait and delete events
188+
# Write the add, wait and delete events, support backward compatibility
189189

190-
if not obj_src.events_to_add:
190+
if not obj_src.events_to_add and not obj_src.add_events_list:
191191
obj_src.events_to_add.append(
192192
AddEvents(events=[]))
193193
obj_src.events_to_add[-1].events.append(
194194
EventOutAdd(event=event_name))
195195

196-
if not obj_dest.wait_for_events:
196+
if not obj_dest.wait_for_events and not obj_dest.wait_for_events_list:
197197
obj_dest.wait_for_events.append(
198198
WaitForEvents(events=[]))
199199
obj_dest.wait_for_events[-1].events.append(
200200
EventIn(event=event_name))
201201

202-
if not obj_dest.events_to_delete:
202+
if not obj_dest.events_to_delete and not obj_dest.delete_events_list:
203203
obj_dest.events_to_delete.append(
204204
DeleteEvents(events=[]))
205205
obj_dest.events_to_delete[-1].events.append(
206206
EventOutDelete(event=event_name))
207207

208-
# support backward compatibility
209-
if not obj_src.add_events_list:
210-
obj_src.add_events_list.append(
211-
AddEvents(events=[]))
212-
obj_src.add_events_list[-1].events.append(
213-
ConditionOutAdd(event=event_name))
214-
215-
if not obj_dest.wait_for_events_list:
216-
obj_dest.wait_for_events_list.append(
217-
WaitForEvents(events=[]))
218-
obj_dest.wait_for_events_list[-1].events.append(
219-
ConditionIn(event=event_name))
220-
221-
if not obj_dest.delete_events_list:
222-
obj_dest.delete_events_list.append(
223-
DeleteEvents(events=[]))
224-
obj_dest.delete_events_list[-1].events.append(
225-
ConditionOutDelete(event=event_name))
226-
227208
def chain(self, obj_list: typing.List[AAPIJob], inpath: str):
228209
objpaths = []
229210
objname = [o.object_name for o in obj_list]

0 commit comments

Comments
 (0)