Reverting github action steps and moving cohesity sdk to try catch block

.github/workflows/ansible-test.yml

@@ -8,8 +8,9 @@ jobs:
     # this Action should follow steps to set up Python build environment
     - name: Install dependencies
       run: |
-        sudo python -m pip install --upgrade pip
-        if [ -f requirements.txt ]; then sudo pip install -r requirements.txt; fi
+        python -m pip install --upgrade pip
+        python -m pip install cohesity-management-sdk
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Perform sanity testing with ansible-test
       uses: ansible-community/ansible-test-gh-action@release/v1
       with:

plugins/modules/cohesity_clone_vm.py

@@ -172,11 +172,6 @@
 import time
 
 from ansible.module_utils.basic import AnsibleModule
-from cohesity_management_sdk.controllers.base_controller import BaseController
-from cohesity_management_sdk.models.clone_task_request import CloneTaskRequest
-from cohesity_management_sdk.models.vmware_clone_parameters import VmwareCloneParameters
-from cohesity_management_sdk.models.restore_object_details import RestoreObjectDetails
-from cohesity_management_sdk.exceptions.api_exception import APIException
 from datetime import datetime
 
 
@@ -188,6 +183,11 @@
     from ansible_collections.cohesity.dataprotect.plugins.module_utils.cohesity_hints import (
         get_cohesity_client,
     )
+    from cohesity_management_sdk.controllers.base_controller import BaseController
+    from cohesity_management_sdk.models.clone_task_request import CloneTaskRequest
+    from cohesity_management_sdk.models.vmware_clone_parameters import VmwareCloneParameters
+    from cohesity_management_sdk.models.restore_object_details import RestoreObjectDetails
+    from cohesity_management_sdk.exceptions.api_exception import APIException
 except Exception:
     pass
 

plugins/modules/cohesity_oracle_job.py

@@ -155,29 +155,6 @@
 import copy
 import time
 from ansible.module_utils.basic import AnsibleModule
-from cohesity_management_sdk.exceptions.api_exception import APIException
-from cohesity_management_sdk.models.delete_protection_job_param import (
-    DeleteProtectionJobParam,
-)
-from cohesity_management_sdk.models.cancel_protection_job_run_param import (
-    CancelProtectionJobRunParam,
-)
-from cohesity_management_sdk.models.protection_job_request_body import (
-    ProtectionJobRequestBody,
-)
-from cohesity_management_sdk.models.run_protection_job_param import (
-    RunProtectionJobParam,
-)
-from cohesity_management_sdk.models.source_special_parameter import (
-    SourceSpecialParameter,
-)
-from cohesity_management_sdk.models.oracle_special_parameters import (
-    OracleSpecialParameters,
-)
-from cohesity_management_sdk.models.oracle_database_node_channel import (
-    OracleDatabaseNodeChannel,
-)
-from cohesity_management_sdk.models.oracle_app_params import OracleAppParams
 
 try:
     # => When unit testing, we need to look in the correct location however, when run via ansible,
@@ -190,6 +167,29 @@
         cohesity_common_argument_spec,
         raise__cohesity_exception__handler,
     )
+    from cohesity_management_sdk.exceptions.api_exception import APIException
+    from cohesity_management_sdk.models.delete_protection_job_param import (
+        DeleteProtectionJobParam,
+    )
+    from cohesity_management_sdk.models.cancel_protection_job_run_param import (
+        CancelProtectionJobRunParam,
+    )
+    from cohesity_management_sdk.models.protection_job_request_body import (
+        ProtectionJobRequestBody,
+    )
+    from cohesity_management_sdk.models.run_protection_job_param import (
+        RunProtectionJobParam,
+    )
+    from cohesity_management_sdk.models.source_special_parameter import (
+        SourceSpecialParameter,
+    )
+    from cohesity_management_sdk.models.oracle_special_parameters import (
+        OracleSpecialParameters,
+    )
+    from cohesity_management_sdk.models.oracle_database_node_channel import (
+        OracleDatabaseNodeChannel,
+    )
+    from cohesity_management_sdk.models.oracle_app_params import OracleAppParams
 except Exception:
     pass
 

plugins/modules/cohesity_oracle_source.py

@@ -111,9 +111,6 @@
 import time
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.urls import open_url, urllib_error
-from cohesity_management_sdk.models.register_protection_source_parameters import (
-    RegisterProtectionSourceParameters,
-)
 
 try:
     # => When unit testing, we need to look in the correct location however, when run via ansible,
@@ -131,6 +128,10 @@
         refresh_protection_source,
         check_source_reachability,
     )
+    from cohesity_management_sdk.models.register_protection_source_parameters import (
+        RegisterProtectionSourceParameters,
+    )   
+
 except Exception:
     pass
 

plugins/modules/cohesity_policy.py

@@ -130,32 +130,6 @@
 import json
 
 from ansible.module_utils.basic import AnsibleModule
-from cohesity_management_sdk.controllers.base_controller import BaseController
-from cohesity_management_sdk.exceptions.api_exception import APIException
-from cohesity_management_sdk.models.archival_external_target import (
-    ArchivalExternalTarget,
-)
-from cohesity_management_sdk.models.blackout_period import BlackoutPeriod
-from cohesity_management_sdk.models.continuous_schedule import ContinuousSchedule
-from cohesity_management_sdk.models.daily_schedule import DailySchedule
-from cohesity_management_sdk.models.extended_retention_policy import (
-    ExtendedRetentionPolicy,
-)
-from cohesity_management_sdk.models.monthly_schedule import MonthlySchedule
-from cohesity_management_sdk.models.protection_policy_request import (
-    ProtectionPolicyRequest,
-)
-from cohesity_management_sdk.models.replication_target_settings import (
-    ReplicationTargetSettings,
-)
-from cohesity_management_sdk.models.scheduling_policy import SchedulingPolicy
-from cohesity_management_sdk.models.snapshot_replication_copy_policy import (
-    SnapshotReplicationCopyPolicy,
-)
-from cohesity_management_sdk.models.snapshot_archival_copy_policy import (
-    SnapshotArchivalCopyPolicy,
-)
-from cohesity_management_sdk.models.time_of_day import TimeOfDay
 
 try:
     from ansible_collections.cohesity.dataprotect.plugins.module_utils.cohesity_utilities import (
@@ -165,6 +139,32 @@
     from ansible_collections.cohesity.dataprotect.plugins.module_utils.cohesity_hints import (
         get_cohesity_client,
     )
+    from cohesity_management_sdk.controllers.base_controller import BaseController
+    from cohesity_management_sdk.exceptions.api_exception import APIException
+    from cohesity_management_sdk.models.archival_external_target import (
+        ArchivalExternalTarget,
+    )
+    from cohesity_management_sdk.models.blackout_period import BlackoutPeriod
+    from cohesity_management_sdk.models.continuous_schedule import ContinuousSchedule
+    from cohesity_management_sdk.models.daily_schedule import DailySchedule
+    from cohesity_management_sdk.models.extended_retention_policy import (
+        ExtendedRetentionPolicy,
+    )
+    from cohesity_management_sdk.models.monthly_schedule import MonthlySchedule
+    from cohesity_management_sdk.models.protection_policy_request import (
+        ProtectionPolicyRequest,
+    )
+    from cohesity_management_sdk.models.replication_target_settings import (
+        ReplicationTargetSettings,
+    )
+    from cohesity_management_sdk.models.scheduling_policy import SchedulingPolicy
+    from cohesity_management_sdk.models.snapshot_replication_copy_policy import (
+        SnapshotReplicationCopyPolicy,
+    )
+    from cohesity_management_sdk.models.snapshot_archival_copy_policy import (
+        SnapshotArchivalCopyPolicy,
+    )
+    from cohesity_management_sdk.models.time_of_day import TimeOfDay
 
 except Exception:
     pass

plugins/modules/cohesity_storage_domain.py

@@ -124,12 +124,16 @@
 )
 from ansible.module_utils.urls import open_url
 
-from cohesity_management_sdk.controllers.base_controller import BaseController
-from cohesity_management_sdk.exceptions.api_exception import APIException
-from cohesity_management_sdk.models.quota_policy import QuotaPolicy
-from cohesity_management_sdk.models.storage_policy import StoragePolicy
-from cohesity_management_sdk.models.erasure_coding_info import ErasureCodingInfo
-from cohesity_management_sdk.models.create_view_box_params import CreateViewBoxParams
+try:
+    from cohesity_management_sdk.controllers.base_controller import BaseController
+    from cohesity_management_sdk.exceptions.api_exception import APIException
+    from cohesity_management_sdk.models.quota_policy import QuotaPolicy
+    from cohesity_management_sdk.models.storage_policy import StoragePolicy
+    from cohesity_management_sdk.models.erasure_coding_info import ErasureCodingInfo
+    from cohesity_management_sdk.models.create_view_box_params import CreateViewBoxParams
+
+except Exception:
+    pass
 
 
 cohesity_client = None

plugins/modules/cohesity_uda_protection_group.py

@@ -232,19 +232,6 @@
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.urls import open_url, urllib_error
 
-
-from cohesity_management_sdk.exceptions.api_exception import APIException
-from cohesity_management_sdk.models.delete_protection_job_param import (
-    DeleteProtectionJobParam,
-)
-from cohesity_management_sdk.models.cancel_protection_job_run_param import (
-    CancelProtectionJobRunParam,
-)
-from cohesity_management_sdk.models.run_protection_job_param import (
-    RunProtectionJobParam,
-)
-
-
 try:
     # => When unit testing, we need to look in the correct location however, when run via ansible,
     # => the expectation is that the modules will live under ansible.
@@ -268,6 +255,16 @@
         get__prot_policy_id__by_name,
         get__storage_domain_id__by_name,
     )
+    from cohesity_management_sdk.exceptions.api_exception import APIException
+    from cohesity_management_sdk.models.delete_protection_job_param import (
+        DeleteProtectionJobParam,
+    )
+    from cohesity_management_sdk.models.cancel_protection_job_run_param import (
+        CancelProtectionJobRunParam,
+    )
+    from cohesity_management_sdk.models.run_protection_job_param import (
+        RunProtectionJobParam,
+    )
 except Exception:
     pass
 

plugins/modules/cohesity_view.py

@@ -132,15 +132,6 @@
 import json
 
 from ansible.module_utils.basic import AnsibleModule
-from cohesity_management_sdk.controllers.base_controller import BaseController
-from cohesity_management_sdk.exceptions.api_exception import APIException
-from cohesity_management_sdk.models.create_view_request import CreateViewRequest
-from cohesity_management_sdk.models.nfs_root_permissions import NfsRootPermissions
-from cohesity_management_sdk.models.qo_s import QoS
-from cohesity_management_sdk.models.quota_policy import QuotaPolicy
-from cohesity_management_sdk.models.storage_policy_override import StoragePolicyOverride
-from cohesity_management_sdk.models.subnet import Subnet
-from cohesity_management_sdk.models.update_view_param import UpdateViewParam
 
 try:
     from ansible_collections.cohesity.dataprotect.plugins.module_utils.cohesity_utilities import (
@@ -150,6 +141,16 @@
     from ansible_collections.cohesity.dataprotect.plugins.module_utils.cohesity_hints import (
         get_cohesity_client,
     )
+    from cohesity_management_sdk.controllers.base_controller import BaseController
+    from cohesity_management_sdk.exceptions.api_exception import APIException
+    from cohesity_management_sdk.models.create_view_request import CreateViewRequest
+    from cohesity_management_sdk.models.nfs_root_permissions import NfsRootPermissions
+    from cohesity_management_sdk.models.qo_s import QoS
+    from cohesity_management_sdk.models.quota_policy import QuotaPolicy
+    from cohesity_management_sdk.models.storage_policy_override import StoragePolicyOverride
+    from cohesity_management_sdk.models.subnet import Subnet
+    from cohesity_management_sdk.models.update_view_param import UpdateViewParam
+
 except Exception:
     pass