Added unit test.

Author: lu-ohai

tests/unitary/default_setup/jobs/test_jobs_mount_file_system.py

@@ -355,7 +355,7 @@ def test_file_manager_process_data_error(self):
             for mount_file_system in test_mount_file_system_list:
                 DSCFileSystemManager.initialize(mount_file_system)
 
-    def test_dsc_file_storage(self):
+    def test_dsc_object_storage(self):
         object_storage = OCIObjectStorage(
             src="oci://bucket@namespace/prefix",
             dest="test_dest",
@@ -377,6 +377,144 @@ def test_dsc_file_storage(self):
                 "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"
+
+    def test_dsc_object_storage_error(self):
+        error_messages = {
+            "namespace" : "Missing parameter `namespace` from service. Check service log to see the error.",
+            "bucket" : "Missing parameter `bucket` from service. Check service log to see the error.",
+            "destination_directory_name" : "Missing parameter `destination_directory_name` from service. Check service log to see the error."
+        }
+
+        dsc_model_dict = {
+            "destination_directory_name": "test_destination_directory_name_from_dsc",
+            "storage_type": "OBJECT_STORAGE",
+            "bucket": "bucket",
+            "namespace": "namespace",
+            "prefix": "prefix"
+        }
+
+        for error in error_messages:
+            with pytest.raises(
+                ValueError,
+                match=error_messages[error]
+            ):
+                dsc_model_copy = copy.deepcopy(dsc_model_dict)
+                dsc_model_copy.pop(error)
+                OCIObjectStorage.update_from_dsc_model(
+                    ObjectStorageMountConfigurationDetails(**dsc_model_copy)
+                )
+
+    @patch.object(oci.resource_search.ResourceSearchClient, "search_resources")
+    def test_dsc_file_storage(self, mock_search_resources):
+        file_storage = OCIFileStorage(
+            src="ocid1.mounttarget.oc1.iad.xxxx:ocid1.export.oc1.iad.xxxx",
+            dest="test_dest",
+        )
+        file_storage = file_storage.update_to_dsc_model()
+        assert file_storage == {
+            "destinationDirectoryName" : "test_dest",
+            "exportId" : "ocid1.export.oc1.iad.xxxx",
+            "mountTargetId" : "ocid1.mounttarget.oc1.iad.xxxx",
+            "storageType" : "FILE_STORAGE"
+        }
+
+        file_storage = OCIFileStorage(
+            src="1.1.1.1:/test_export",
+            dest="test_dest",
+        )
+
+        items = [
+            oci.resource_search.models.resource_summary.ResourceSummary(
+                **{
+                    "additional_details": {},
+                    "availability_domain": "null",
+                    "compartment_id": "ocid1.compartment.oc1..aaaaaaaapvb3hearqum6wjvlcpzm5ptfxqa7xfftpth4h72xx46ygavkqteq",
+                    "defined_tags": {},
+                    "display_name": "test_name",
+                    "freeform_tags": {
+                        "oci:compute:instanceconfiguration": "ocid1.instanceconfiguration.oc1.iad.xxxx"
+                    },
+                    "identifier": "ocid1.mounttarget.oc1.iad.xxxx",
+                    "identity_context": {},
+                    "lifecycle_state": "AVAILABLE",
+                    "resource_type": "MountTarget",
+                    "search_context": "null",
+                    "system_tags": {},
+                    "time_created": "2020-09-25T22:43:48.301000+00:00"
+                }
+            ),
+            oci.resource_search.models.resource_summary.ResourceSummary(
+                **{
+                    "additional_details": {},
+                    "availability_domain": "null",
+                    "compartment_id": "ocid1.compartment.oc1..aaaaaaaapvb3hearqum6wjvlcpzm5ptfxqa7xfftpth4h72xx46ygavkqteq",
+                    "defined_tags": {},
+                    "display_name": "test_name",
+                    "freeform_tags": {
+                        "oci:compute:instanceconfiguration": "ocid1.instanceconfiguration.oc1.iad.xxxx"
+                    },
+                    "identifier": "ocid1.export.oc1.iad.xxxx",
+                    "identity_context": {},
+                    "lifecycle_state": "AVAILABLE",
+                    "resource_type": "Export",
+                    "search_context": "null",
+                    "system_tags": {},
+                    "time_created": "2020-09-25T22:43:48.301000+00:00"
+                }
+            )
+        ]
+
+        data = MagicMock()
+        data.items = items
+        return_value = MagicMock()
+        return_value.data = data
+        mock_search_resources.return_value = return_value
+
+        file_storage = file_storage.update_to_dsc_model()
+        assert file_storage == {
+            "destinationDirectoryName" : "test_dest",
+            "exportId" : "ocid1.export.oc1.iad.xxxx",
+            "mountTargetId" : "ocid1.mounttarget.oc1.iad.xxxx",
+            "storageType" : "FILE_STORAGE"
+        }
+
+        dsc_model = FileStorageMountConfigurationDetails(
+            **{
+                "destination_directory_name": "test_dest",
+                "storage_type": "FILE_STORAGE",
+                "export_id": "ocid1.export.oc1.iad.xxxx",
+                "mount_target_id": "ocid1.mounttarget.oc1.iad.xxxx"
+            }
+        )
+        result = OCIFileStorage.update_from_dsc_model(dsc_model)
+        assert result["src"] == "ocid1.mounttarget.oc1.iad.xxxx:ocid1.export.oc1.iad.xxxx"
+        assert result["dest"] == "test_dest"
+
+    def test_dsc_file_storage_error(self):
+        error_messages = {
+            "mount_target_id" : "Missing parameter `mount_target_id` from service. Check service log to see the error.",
+            "export_id" : "Missing parameter `export_id` from service. Check service log to see the error.",
+            "destination_directory_name" : "Missing parameter `destination_directory_name` from service. Check service log to see the error."
+        }
+
+        dsc_model_dict = {
+            "destination_directory_name": "test_destination_directory_name_from_dsc",
+            "storage_type": "FILE_STORAGE",
+            "mount_target_id": "ocid1.mounttarget.oc1.iad.xxxx",
+            "export_id": "ocid1.export.oc1.iad.xxxx",
+        }
+
+        for error in error_messages:
+            with pytest.raises(
+                ValueError,
+                match=error_messages[error]
+            ):
+                dsc_model_copy = copy.deepcopy(dsc_model_dict)
+                dsc_model_copy.pop(error)
+                OCIFileStorage.update_from_dsc_model(
+                    FileStorageMountConfigurationDetails(**dsc_model_copy)
+                )