Split and barrel cloud module for merge.

tests/domain/cloud/test_azure_csp.py

@@ -1,11 +1,17 @@
+from uuid import uuid4
 from unittest.mock import Mock
 
-from uuid import uuid4
+from tests.factories import ApplicationFactory, EnvironmentFactory
+from tests.mock_azure import AUTH_CREDENTIALS, mock_azure
 
-from atst.domain.csp.cloud import (
-    AzureCloudProvider,
-    BillingProfileCreationCSPResult,
+from atst.domain.csp.cloud import AzureCloudProvider
+from atst.domain.csp.cloud.models import (
+    ApplicationCSPPayload,
+    ApplicationCSPResult,
+    BillingInstructionCSPPayload,
+    BillingInstructionCSPResult,
     BillingProfileCreationCSPPayload,
+    BillingProfileCreationCSPResult,
     BillingProfileTenantAccessCSPPayload,
     BillingProfileTenantAccessCSPResult,
     BillingProfileVerificationCSPPayload,
@@ -18,12 +24,8 @@ from atst.domain.csp.cloud import (
     TaskOrderBillingVerificationCSPResult,
     TenantCSPPayload,
     TenantCSPResult,
-    ApplicationCSPPayload,
 )
 
-from tests.mock_azure import mock_azure, AUTH_CREDENTIALS
-from tests.factories import EnvironmentFactory, ApplicationFactory
-
 
 creds = {
     "home_tenant_id": "tenant_id",

tests/domain/cloud/test_payloads.py

@@ -2,7 +2,7 @@ import pytest
 
 from pydantic import ValidationError
 
-from atst.domain.csp.cloud import (
+from atst.domain.csp.cloud.models import (
     AZURE_MGMNT_PATH,
     ManagementGroupCSPPayload,
     ManagementGroupCSPResponse,

tests/domain/cloud/test_policy.py

@@ -1,4 +1,4 @@
-from atst.domain.csp.policy import AzurePolicyManager, AzurePolicy
+from atst.domain.csp.cloud.policy import AzurePolicyManager, AzurePolicy
 
 
 def test_portfolio_definitions():

tests/routes/applications/test_settings.py

@@ -12,7 +12,7 @@ from atst.domain.application_roles import ApplicationRoles
 from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.invitations import ApplicationInvitations
 from atst.domain.common import Paginator
-from atst.domain.csp.cloud import GeneralCSPException
+from atst.domain.csp.cloud.exceptions import GeneralCSPException
 from atst.domain.permission_sets import PermissionSets
 from atst.models.application_role import Status as ApplicationRoleStatus
 from atst.models.environment_role import CSPRole, EnvironmentRole