exasol · ckunki · Mar 4, 2024 · Mar 4, 2024 · Mar 4, 2024 · Mar 4, 2024
diff --git a/test/aws_local_stack_access.py → test/aws/local_stack_access.py b/test/aws_local_stack_access.py → test/aws/local_stack_access.py
diff --git a/test/aws_mock_data.py → test/aws/mock_data.py b/test/aws_mock_data.py → test/aws/mock_data.py
diff --git a/test/conftest.py b/test/conftest.py
@@ -10,7 +10,7 @@
 from importlib.metadata import version
 from exasol.ds.sandbox.lib.tags import DEFAULT_TAG_KEY
 from exasol.ds.sandbox.lib.asset_id import AssetId
-from test.aws_local_stack_access import AwsLocalStackAccess
+from test.aws.local_stack_access import AwsLocalStackAccess
 
 DEFAULT_ASSET_ID = AssetId("test", stack_prefix="test-stack", ami_prefix="test-ami")
 

diff --git a/test/integration/localstack_test.py → test/integration/aws/localstack_test.py b/test/integration/localstack_test.py → test/integration/aws/localstack_test.py
diff --git a/.../integration/test_aws_codebuild_waiter.py → .../integration/aws/test_codebuild_waiter.py b/.../integration/test_aws_codebuild_waiter.py → .../integration/aws/test_codebuild_waiter.py
diff --git a/test/integration/test_serialization.py → test/integration/aws/test_serialization.py b/test/integration/test_serialization.py → test/integration/aws/test_serialization.py
@@ -7,7 +7,7 @@
 from exasol.ds.sandbox.lib.asset_id import AssetId
 from exasol.ds.sandbox.lib.setup_ec2.cf_stack import CloudformationStack
 from exasol.ds.sandbox.lib.setup_ec2.key_file_manager import KeyFileManager
-from test.aws_local_stack_access import AwsLocalStackAccess
+from test.aws.local_stack_access import AwsLocalStackAccess
 import multiprocessing as mp
 
 

diff --git a/.../integration/aws/test_deploy_codebuild.py → test/unit/aws/test_deploy_codebuild.py b/.../integration/aws/test_deploy_codebuild.py → test/unit/aws/test_deploy_codebuild.py
diff --git a/test/integration/aws/test_deploy_ec2.py → test/unit/aws/test_deploy_ec2.py b/test/integration/aws/test_deploy_ec2.py → test/unit/aws/test_deploy_ec2.py
diff --git a/.../integration/aws/test_deploy_vm_bucket.py → test/unit/aws/test_deploy_vm_bucket.py b/.../integration/aws/test_deploy_vm_bucket.py → test/unit/aws/test_deploy_vm_bucket.py
@@ -6,7 +6,7 @@
 from exasol.ds.sandbox.lib.aws_access.aws_access import AwsAccess
 from exasol.ds.sandbox.lib.vm_bucket.vm_dss_bucket import run_setup_vm_bucket, find_vm_bucket, \
     create_vm_bucket_cf_template
-from test.aws_mock_data import TEST_BUCKET_ID, get_waf_cloudformation_mock_data, TEST_ACL_ARN, \
+from test.aws.mock_data import TEST_BUCKET_ID, get_waf_cloudformation_mock_data, TEST_ACL_ARN, \
     get_s3_cloudformation_mock_data
 from test.integration.aws.cloudformation_validation import validate_using_cfn_lint
 from test.mock_cast import mock_cast

diff --git a/...egration/aws/test_deploy_vm_bucket_waf.py → test/unit/aws/test_deploy_vm_bucket_waf.py b/...egration/aws/test_deploy_vm_bucket_waf.py → test/unit/aws/test_deploy_vm_bucket_waf.py
@@ -6,7 +6,7 @@
 from exasol.ds.sandbox.lib.aws_access.aws_access import AwsAccess
 from exasol.ds.sandbox.lib.vm_bucket.vm_dss_bucket_waf import run_setup_vm_bucket_waf, \
     find_acl_arn, get_cloudformation_template
-from test.aws_mock_data import get_waf_cloudformation_mock_data, TEST_ACL_ARN
+from test.aws.mock_data import get_waf_cloudformation_mock_data, TEST_ACL_ARN
 from test.integration.aws.cloudformation_validation import validate_using_cfn_lint
 from test.mock_cast import mock_cast
 

diff --git a/test/integration/aws/test_export_vm.py → test/unit/aws/test_export_vm.py b/test/integration/aws/test_export_vm.py → test/unit/aws/test_export_vm.py
@@ -10,7 +10,7 @@
     build_image_destination
 from exasol.ds.sandbox.lib.export_vm.run_export_vm import export_vm
 from exasol.ds.sandbox.lib.export_vm.vm_disk_image_format import VmDiskImageFormat
-from test.aws_mock_data import get_ami_image_mock_data, TEST_AMI_ID, TEST_ROLE_ID, TEST_BUCKET_ID, INSTANCE_ID, \
+from test.aws.mock_data import get_ami_image_mock_data, TEST_AMI_ID, TEST_ROLE_ID, TEST_BUCKET_ID, INSTANCE_ID, \
     get_export_image_task_mock_data, get_s3_cloudformation_mock_data, get_waf_cloudformation_mock_data
 from test.mock_cast import mock_cast
 

diff --git a/test/unit/test_key_file_manager.py → test/unit/aws/test_key_file_manager.py b/test/unit/test_key_file_manager.py → test/unit/aws/test_key_file_manager.py
diff --git a/test/unit/test_make_ami_public.py → test/unit/aws/test_make_ami_public.py b/test/unit/test_make_ami_public.py → test/unit/aws/test_make_ami_public.py
@@ -7,7 +7,7 @@
 from exasol.ds.sandbox.lib.aws_access.ami import Ami
 from exasol.ds.sandbox.lib.aws_access.aws_access import AwsAccess
 from exasol.ds.sandbox.lib.export_vm.run_make_ami_public import run_make_ami_public
-from test.aws_mock_data import get_ami_image_mock_data
+from test.aws.mock_data import get_ami_image_mock_data
 
 from test.mock_cast import mock_cast
 

diff --git a/test/unit/test_run_lifecycle_for_ec2.py → test/unit/aws/test_run_lifecycle_for_ec2.py b/test/unit/test_run_lifecycle_for_ec2.py → test/unit/aws/test_run_lifecycle_for_ec2.py
diff --git a/test/unit/test_source_ami.py → test/unit/aws/test_source_ami.py b/test/unit/test_source_ami.py → test/unit/aws/test_source_ami.py
diff --git a/test/unit/test_printing.py b/test/unit/test_printing.py
@@ -12,7 +12,7 @@
     print_assets,
 )
 from exasol.ds.sandbox.lib.aws_access.aws_access import AwsAccess
-from test.aws_mock_data import get_ami_image_mock_data, TEST_AMI_ID, get_snapshot_mock_data, \
+from test.aws.mock_data import get_ami_image_mock_data, TEST_AMI_ID, get_snapshot_mock_data, \
     get_export_image_task_mock_data, get_s3_object_mock_data, TEST_BUCKET_ID, \
     get_ec2_cloudformation_mock_data, get_ec2_cloudformation_stack_resources_mock_data, get_ec2_key_pair_mock_data, \
     get_s3_cloudformation_mock_data, TEST_CLOUDFRONT_DOMAIN_NAME