[JIRA SONIC-61743] Use usb:/ as help string for dir, ls and delete command

 - Mention usb:/ in the help text but allow the user to enter usb1:/
   as well. In majority of the cases users will be using usb:/ and
   having that in the help text keeps it uniform compared to the
   other available options.

Change-Id: I4576c5f671866e27595b6909ff786467007e4296

Author: rajendra-dendukuri

CLI/actioner/sonic_cli_file_mgmt.py

@@ -103,6 +103,14 @@ def get_user_pass(url):
 
     return False, ""
 
+def fixup_usb_path(input_filepath):
+    res = re.search('usb:/(\d+):/*', input_filepath)
+    if res:
+        usb_dev = res.group(1)
+        new_filepath = "usb{}:/{}".format(usb_dev, input_filepath[len(res.group(0)):])
+        return new_filepath
+    return input_filepath
+
 def process_args(args):
     count = 0
     input_dict = {}
@@ -236,9 +244,11 @@ def handle_del(cmd, args, input_dict):
         print("%Error: Invalid input")
         return -1
 
-    msg = ("Proceed to delete " + args[0] + "?")
+    filename = fixup_usb_path(input_dict.get("filename"))
+    msg = ("Proceed to delete " + filename + "?")
     prpt = prompt(msg)
     if prpt == True:
+        input_dict["filename"] = filename
         keypath, body = get_keypath(cmd,args, input_dict)
         try:
             api_response = api_client.post(keypath, body)
@@ -276,6 +286,8 @@ def handle_dir(args,input_dict):
         print("%Error: Invalid input")
         return -1
 
+    folder_name = fixup_usb_path(input_dict.get("folder-name"))
+    input_dict["folder-name"] = folder_name
     keypath, body = get_keypath('dir', args, input_dict)
     try:
         api_response = api_client.post(keypath, body)

CLI/clitree/cli-xml/sonic_types.xml

@@ -1923,8 +1923,8 @@ limitations under the License.
     <PTYPE
         name="FOLDER_NAME"
         method="regexp_select"
-        ext_pattern="config:/ coredump:/ event-profile:/ home:/ log:/ tech-support:/ usb"
-        ext_help="(Folder containing config files) (Folder containing core dump files) (Folder containing event-profile files) (Home folder of the user) (Folder containing log files) (Folder containing the tech support files) (Folder containing usb media files - usb:/)"
+        ext_pattern="config:/ coredump:/ event-profile:/ home:/ log:/ tech-support:/ usb:/"
+        ext_help="(Folder containing config files) (Folder containing core dump files) (Folder containing event-profile files) (Home folder of the user) (Folder containing log files) (Folder containing the tech support files) (Folder containing usb media files)"
         pattern="^(config|coredump|event-profile|home|log|tech-support|usb[0-7]?):/[ a-zA-Z_0-9\\/.+-]{0,256}"
         help="Folder names"
         />
@@ -1933,7 +1933,7 @@ limitations under the License.
     <PTYPE
         name="DELETE_FOLDER_NAME"
         method="regexp_select"
-        ext_pattern="config:/ coredump:/ event-profile:/ home:/ tech-support:/ usb"
+        ext_pattern="config:/ coredump:/ event-profile:/ home:/ tech-support:/ usb:/"
         ext_help="(Delete from &CONFIG_URL;) (Delete from &CORE_URL;) (Delete from &EVENT_PROF_URL;) (Delete from &HOME_URL;) (Delete from &SUPPORT_URL;) (Delete from &USB_URL;)"
         pattern="^(config|coredump|event-profile|home|tech-support|usb[0-7]?):/[a-zA-Z_0-9\\/.+-]{1,256}"
         help="File to be deleted"