ctm-python-client 2.2.1__py3-none-any.whl → 2.2.3__py3-none-any.whl

aapi/bases.py

@@ -11,11 +11,9 @@ class AAPIObject:
         res = {}
 
         if '_type' in attrs.fields_dict(self.__class__):
-            if not self._type.startswith('Condition'):
+            if not self._type.startswith('Condition') and not self._type.startswith('Event'):
                 res['Type'] = self._type
-            if not self._type.startswith('Event'):
-                res['Type'] = self._type
-
+            
         if attrs.has(self):
             for field in attrs.fields(self.__class__):
                 value = self.__getattribute__(field.name)

ctm_python_client/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '2.2.1'
+__version__ = '2.2.3'
 __author__ = 'BMC Software'

ctm_python_client/core/workflow.py

@@ -185,45 +185,26 @@ class BaseWorkflow(AbstractWorkflow):
             # self._connections[key_name] = {'count': 1, 'name': event_name}
             self._connections[event_name] = [key_name]
 
-        # Write the add, wait and delete events
+        # Write the add, wait and delete events, support backward compatibility
 
-        if not obj_src.events_to_add:
+        if not obj_src.events_to_add and not obj_src.add_events_list:
             obj_src.events_to_add.append(
                 AddEvents(events=[]))
         obj_src.events_to_add[-1].events.append(
             EventOutAdd(event=event_name))
 
-        if not obj_dest.wait_for_events:
+        if not obj_dest.wait_for_events and not obj_dest.wait_for_events_list:
             obj_dest.wait_for_events.append(
                 WaitForEvents(events=[]))
         obj_dest.wait_for_events[-1].events.append(
             EventIn(event=event_name))
 
-        if not obj_dest.events_to_delete:
+        if not obj_dest.events_to_delete and not obj_dest.delete_events_list:
             obj_dest.events_to_delete.append(
                 DeleteEvents(events=[]))
         obj_dest.events_to_delete[-1].events.append(
             EventOutDelete(event=event_name))
 
-        # support backward compatibility
-        if not obj_src.add_events_list:
-            obj_src.add_events_list.append(
-                AddEvents(events=[]))
-        obj_src.add_events_list[-1].events.append(
-            ConditionOutAdd(event=event_name))
-
-        if not obj_dest.wait_for_events_list:
-            obj_dest.wait_for_events_list.append(
-                WaitForEvents(events=[]))
-        obj_dest.wait_for_events_list[-1].events.append(
-            ConditionIn(event=event_name))
-
-        if not obj_dest.delete_events_list:
-            obj_dest.delete_events_list.append(
-                DeleteEvents(events=[]))
-        obj_dest.delete_events_list[-1].events.append(
-            ConditionOutDelete(event=event_name))
-
     def chain(self, obj_list: typing.List[AAPIJob], inpath: str):
         objpaths = []
         objname = [o.object_name for o in obj_list]

{ctm_python_client-2.2.1.dist-info → ctm_python_client-2.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ctm-python-client
-Version: 2.2.1
+Version: 2.2.3
 Summary: Python Workflows for Control-M
 Author: BMC Software
 License: BSD 3-Clause

{ctm_python_client-2.2.1.dist-info → ctm_python_client-2.2.3.dist-info}/RECORD

@@ -3,7 +3,7 @@ aapi/action.py,sha256=te1lr64tU7854Oy4lUjQgh1EIlZzO82ulA-NnfiK9ko,1622
 aapi/addevents.py,sha256=maZH3TpP1C1usvM2qee4DNl1PUA6IpnAWUKki1WGUlg,793
 aapi/ai.py,sha256=3mZu6I8PSbnr0v6AKxZ3-OA8RbdHlI55qCeaqlF3iXA,2094
 aapi/basefolder.py,sha256=l_ysM4Us2t9s0fupza3i0mWt0YuEY715voh9xSUw_iI,14059
-aapi/bases.py,sha256=PP88i6GNNGxXDXogGnWCinS6QCx0gWzpG4O29kRVnB4,1993
+aapi/bases.py,sha256=isZW33dtSWJ2A7fdUQNumUB0_lXk8VtDYLHZb1cA_jw,1952
 aapi/businessfield.py,sha256=T11iWMIp8BtQCCrkR3glp0E7dKOLI00qO3lKT6_Ngdw,373
 aapi/businessparameter.py,sha256=Ee8NBDM4TDA2wx7T2lsj1yaNRJ-Pt5FADPCwx8qa4JU,3372
 aapi/calendar.py,sha256=C6mAQhypnSs2IG1CKRbjTekLdo87AHJ5GM_a3HofF3c,9322
@@ -728,18 +728,18 @@ clients/ctm_saas_client/models/workspace_folder.py,sha256=Uxn61e8LzGzceVV6TBofuy
 clients/ctm_saas_client/models/workspace_folders.py,sha256=rpVIXVw8Fh_9W-mfuDEDClC0vYTStKQo_8zgGcGaZu8,3455
 clients/ctm_saas_client/models/zoo_keeper.py,sha256=qYqn4P4CaKqLAKSxBoJvwxm1OGUcS8cmy9BW8Ul7maI,8790
 clients/ctm_saas_client/models/zos_template_data.py,sha256=RF7S-oR4rmbwc_WJDebk2SLvkAku4uxd_a59Cq_DzVM,18096
-ctm_python_client/__init__.py,sha256=SzjmWwMQCewJO07iQ1PRUK87bikR1stLmeJ4T_GJSHI,49
+ctm_python_client/__init__.py,sha256=t9D8ScpqjgHeC_6i9pYYTIh-0GIGylBSqmZNSMV9q3E,49
 ctm_python_client/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctm_python_client/core/comm.py,sha256=LnsIvLQdXkl75eSBl6nDml9JlCobj36YQFNNYG-530I,6709
 ctm_python_client/core/credential.py,sha256=UDN1Q8IYf-ufiXUr-aHm1MDu9bVX8J0Hk8BhvlmYfKk,1009
 ctm_python_client/core/monitoring.py,sha256=62fbSTEGFpHcBrXK8R8cWejq6DlrmdaNumXbOaDa3HY,12043
-ctm_python_client/core/workflow.py,sha256=3nqvG5SFfg4iWm_SkQ19tbdr057N5xVmvZWbTmBoGfE,15282
+ctm_python_client/core/workflow.py,sha256=6YMFo3eNBdzLMotBou9ZobDuo2B3sMY0ACHiFa7NSjo,14680
 ctm_python_client/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctm_python_client/ext/autogen.py,sha256=LJltuXXmE1GlbzaV3i16HtkhnPpk9gynwB2W93XoTx4,6540
 ctm_python_client/ext/credential.py,sha256=2AdNAPtquq9ApH41pWi8Zt8mhlh9VNWVFXeLCNrxOfA,469
 ctm_python_client/ext/viz.py,sha256=oVY7DYP0H-nCGRQIb1nZgspc8DQdsS8yWUCAl5x_dwg,1672
-ctm_python_client-2.2.1.dist-info/LICENSE,sha256=L9eFhIgJK0TNYFm9I7tDUR1CDI8muWkBJvzpbkGCVh8,1525
-ctm_python_client-2.2.1.dist-info/METADATA,sha256=LceSC6pP3QsP9ICbIIpi26H_C6Wsyg3O1fZebpHmd0o,2921
-ctm_python_client-2.2.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ctm_python_client-2.2.1.dist-info/top_level.txt,sha256=Dz3aBWbGmLA3lZcNMUAWX_Yhdw0FdplhI52YBid8Oe0,31
-ctm_python_client-2.2.1.dist-info/RECORD,,
+ctm_python_client-2.2.3.dist-info/LICENSE,sha256=L9eFhIgJK0TNYFm9I7tDUR1CDI8muWkBJvzpbkGCVh8,1525
+ctm_python_client-2.2.3.dist-info/METADATA,sha256=UQ0QGkPw_zjFA-44BJguxh0d75ldr6q9dmmSgZfwQC0,2921
+ctm_python_client-2.2.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ctm_python_client-2.2.3.dist-info/top_level.txt,sha256=Dz3aBWbGmLA3lZcNMUAWX_Yhdw0FdplhI52YBid8Oe0,31
+ctm_python_client-2.2.3.dist-info/RECORD,,