Updated pr.

Author: lu-ohai

ads/common/dsc_file_system.py

@@ -5,6 +5,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 import ads
 import oci
+import os
 import ipaddress
 
 from dataclasses import dataclass
@@ -51,6 +52,10 @@ def update_from_dsc_model(cls, dsc_model) -> dict:
     @staticmethod
     def get_destination_path_and_name(dest: str) -> (str, str):
         """Gets the destination path and destination directory name from dest.
+        Example:
+            dir - "fss" & path - "/opc" : mount happens under "/opc/fss"
+            dir - "fss" & path - "/" : mount happens under "/fss"
+            dir - "fss" & path - omitted : mount happens under "/mnt/fss" (for backward compatibility)
 
         Parameters
         ----------
@@ -62,10 +67,10 @@ def get_destination_path_and_name(dest: str) -> (str, str):
         tuple
             A tuple of destination path and destination directory name.
         """
-        directory_index = dest.rfind("/")
-        directory_name = dest[directory_index+1:]
-        path = "/" if directory_index <= 0 else dest[:directory_index]
-        return (path, directory_name)
+        return (
+            os.path.dirname(dest.rstrip("/")),
+            os.path.basename(dest.rstrip("/"))
+        )
 
 
 @dataclass
@@ -199,14 +204,10 @@ def update_from_dsc_model(cls, dsc_model) -> dict:
             raise ValueError(
                 "Missing parameter `destination_directory_name` from service. Check service log to see the error."
             )
-        if not dsc_model.destination_path:
-            raise ValueError(
-                "Missing parameter `destination_path` from service. Check service log to see the error."
-            )
 
         return {
             "src" : f"{dsc_model.mount_target_id}:{dsc_model.export_id}",
-            "dest" : f"{dsc_model.destination_path.rstrip('/')}/{dsc_model.destination_directory_name}"
+            "dest" : f"{(dsc_model.destination_path or '').rstrip('/')}/{dsc_model.destination_directory_name}"
         }
 
 @dataclass
@@ -247,14 +248,10 @@ def update_from_dsc_model(cls, dsc_model) -> dict:
             raise ValueError(
                 "Missing parameter `destination_directory_name` from service. Check service log to see the error."
             )
-        if not dsc_model.destination_path:
-            raise ValueError(
-                "Missing parameter `destination_path` from service. Check service log to see the error."
-            )
 
         return {
             "src" : f"oci://{dsc_model.bucket}@{dsc_model.namespace}/{dsc_model.prefix or ''}",
-            "dest" : f"{dsc_model.destination_path.rstrip('/')}/{dsc_model.destination_directory_name}"
+            "dest" : f"{(dsc_model.destination_path or '').rstrip('/')}/{dsc_model.destination_directory_name}"
         }
 
 

tests/unitary/default_setup/jobs/test_jobs_mount_file_system.py

@@ -392,7 +392,6 @@ def test_dsc_object_storage_error(self):
             "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.",
-            "destination_path" : "Missing parameter `destination_path` from service. Check service log to see the error."
         }
 
         dsc_model_dict = {
@@ -509,7 +508,6 @@ def test_dsc_file_storage_error(self):
             "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.",
-            "destination_path" : "Missing parameter `destination_path` from service. Check service log to see the error."
         }
 
         dsc_model_dict = {
@@ -529,4 +527,25 @@ def test_dsc_file_storage_error(self):
                 dsc_model_copy.pop(error)
                 OCIFileStorage.update_from_dsc_model(
                     FileStorageMountConfigurationDetails(**dsc_model_copy)
-                )
+                )
+
+    def test_get_destination_path_and_name(self):
+        path, directory = OCIFileStorage.get_destination_path_and_name("abc")
+
+        assert path == ""
+        assert directory == "abc"
+
+        path, directory = OCIFileStorage.get_destination_path_and_name("/abc")
+
+        assert path == "/"
+        assert directory == "abc"
+
+        path, directory = OCIFileStorage.get_destination_path_and_name("/abc/def")
+
+        assert path == "/abc"
+        assert directory == "def"
+
+        path, directory = OCIFileStorage.get_destination_path_and_name("/abc/def/ghi")
+
+        assert path == "/abc/def"
+        assert directory == "ghi"