Added unit tests.

Author: lu-ohai

ads/common/dsc_file_system.py

@@ -228,6 +228,8 @@ def update_from_dsc_model(cls, dsc_model) -> dict:
 
 class DSCFileSystemManager:
 
+    storage_mount_dest = set()
+
     @classmethod
     def initialize(cls, arguments: dict) -> dict:
         """Initialize and update arguments to dsc model.
@@ -247,6 +249,12 @@ def initialize(cls, arguments: dict) -> dict:
                 "Parameter `dest` is required for mounting file storage system."
             )
 
+        if arguments["dest"] in cls.storage_mount_dest:
+            raise ValueError(
+                "Duplicate `dest` found. Please specify different `dest` for each file system to be mounted."
+            )
+        cls.storage_mount_dest.add(arguments["dest"])
+
         # case oci://bucket@namespace/prefix
         if arguments["src"].startswith("oci://") and "@" in arguments["src"]:
             return OCIObjectStorage(**arguments).update_to_dsc_model()

tests/unitary/default_setup/jobs/test_jobs_mount_file_system.py

@@ -9,13 +9,15 @@
 import unittest
 import pytest
 
-from ads.common.dsc_file_system import OCIFileStorage
+from ads.common.dsc_file_system import DSCFileSystemManager, OCIFileStorage, OCIObjectStorage
 from ads.jobs.ads_job import Job
 from ads.jobs.builders.infrastructure import DataScienceJob
 from ads.jobs.builders.runtimes.python_runtime import PythonRuntime
 
 try:
     from oci.data_science.models import JobStorageMountConfigurationDetails
+    from oci.data_science.models import FileStorageMountConfigurationDetails
+    from oci.data_science.models import ObjectStorageMountConfigurationDetails
 except (ImportError, AttributeError) as e:
     raise unittest.SkipTest(
         "Support for mounting file systems to OCI Job is not available. Skipping the Job tests."
@@ -45,15 +47,15 @@
         },
     ),
     job_storage_mount_configuration_details_list=[
-        oci.data_science.models.FileStorageMountConfigurationDetails(
+        FileStorageMountConfigurationDetails(
             **{
                 "destination_directory_name": "test_destination_directory_name_from_dsc",
                 "export_id": "export_id_from_dsc",
                 "mount_target_id": "mount_target_id_from_dsc",
                 "storage_type": "FILE_STORAGE",
             },
         ),
-        oci.data_science.models.FileStorageMountConfigurationDetails(
+        FileStorageMountConfigurationDetails(
             **{
                 "destination_directory_name": "test_destination_directory_name_from_dsc",
                 "export_id": "export_id_from_dsc",
@@ -295,3 +297,86 @@ def test_update_job_infra(
             "mountTargetId": "test_mount_target_id_one",
             "storageType": "FILE_STORAGE",
         }
+
+    @patch.object(OCIObjectStorage, "update_to_dsc_model")
+    @patch.object(OCIFileStorage, "update_to_dsc_model")
+    def test_file_manager_process_data(self, mock_fss_update_to_dsc_model, mock_oss_update_to_dsc_model):
+        test_mount_file_system = {
+            "src" : "1.1.1.1:/test_export",
+            "dest" : "test_dest_one"
+        }
+
+        DSCFileSystemManager.initialize(test_mount_file_system)
+        mock_fss_update_to_dsc_model.assert_called()   
+
+        test_mount_file_system = {
+            "src" : "ocid1.mounttarget.xxx:ocid1.export.xxx",
+            "dest" : "test_dest_two"
+        }
+
+        DSCFileSystemManager.initialize(test_mount_file_system) 
+        mock_fss_update_to_dsc_model.assert_called() 
+
+        test_mount_file_system = {
+            "src" : "oci://bucket@namespace/prefix",
+            "dest" : "test_dest_three"
+        }
+
+        DSCFileSystemManager.initialize(test_mount_file_system)
+        mock_oss_update_to_dsc_model.assert_called()
+
+    def test_file_manager_process_data_error(self):
+        test_mount_file_system = {}
+        with pytest.raises(
+            ValueError,
+            match="Parameter `src` is required for mounting file storage system."
+        ):
+            DSCFileSystemManager.initialize(test_mount_file_system)
+
+        test_mount_file_system["src"] = "test_src"
+        with pytest.raises(
+            ValueError,
+            match="Parameter `dest` is required for mounting file storage system."
+        ):
+            DSCFileSystemManager.initialize(test_mount_file_system)
+
+        test_mount_file_system["dest"] = "test_dest_four"
+        with pytest.raises(
+            ValueError,
+            match="Invalid dict for mounting file systems. Specify a valid one."
+        ):
+            DSCFileSystemManager.initialize(test_mount_file_system)
+
+        test_mount_file_system_list = [test_mount_file_system] * 2
+        with pytest.raises(
+            ValueError,
+            match="Duplicate `dest` found. Please specify different `dest` for each file system to be mounted."
+        ):
+            for mount_file_system in test_mount_file_system_list:
+                DSCFileSystemManager.initialize(mount_file_system)
+
+    def test_dsc_file_storage(self):
+        object_storage = OCIObjectStorage(
+            src="oci://bucket@namespace/prefix",
+            dest="test_dest",
+        )
+
+        result = object_storage.update_to_dsc_model()
+        assert result["bucket"] == "bucket"
+        assert result["namespace"] == "namespace"
+        assert result["prefix"] == "prefix"
+        assert result["storageType"] == "OBJECT_STORAGE"
+        assert result["destinationDirectoryName"] == "test_dest"
+
+        dsc_model = ObjectStorageMountConfigurationDetails(
+            **{
+                "destination_directory_name": "test_destination_directory_name_from_dsc",
+                "storage_type": "OBJECT_STORAGE",
+                "bucket": "bucket",
+                "namespace": "namespace",
+                "prefix": "prefix"
+            }
+        )
+        result = OCIObjectStorage.update_from_dsc_model(dsc_model)
+        assert result["src"] == "oci://bucket@namespace/prefix"
+        assert result["dest"] == "test_destination_directory_name_from_dsc"