From c1f96bd3bc880ecf158347cdd973b70684f62ee9 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Jan 11 2019 16:23:32 +0000
Subject: Ticket 49994 - Adjust dsconf backend usage


Description:  Slightly rearrange the backend usage to move create/delete
              to main subcommands instead of being under suffix.

https://pagure.io/389-ds-base/issue/49994

Reviewed by: spichugi & firstyear(Thanks!!)

---

diff --git a/src/lib389/lib389/cli_conf/backend.py b/src/lib389/lib389/cli_conf/backend.py
index 002b811..1be4b6e 100644
--- a/src/lib389/lib389/cli_conf/backend.py
+++ b/src/lib389/lib389/cli_conf/backend.py
@@ -619,20 +619,6 @@ def create_parser(subparsers):
     get_subsuffix_parser.add_argument('--suffix', action='store_true', help='Just display the suffix, and not the backend name')
     get_subsuffix_parser.add_argument('be_name', help='The backend name or suffix to search for sub-suffixes')
 
-    # Create a new backend database
-    create_parser = suffix_subcommands.add_parser('create', help='create')
-    create_parser.set_defaults(func=backend_create)
-    create_parser.add_argument('--parent-suffix', default=False,
-                               help="Sets the parent suffix only if this backend is a sub-suffix")
-    create_parser.add_argument('--suffix', required=True, help='The database suffix DN, for example "dc=example,dc=com"')
-    create_parser.add_argument('--be-name', required=True, help='The database backend name, for example "userroot"')
-    create_parser.add_argument('--create-entries', action='store_true', help='Create sample entries in the database')
-
-    # Delete backend
-    delete_parser = suffix_subcommands.add_parser('delete', help='deletes a backend database')
-    delete_parser.set_defaults(func=backend_delete)
-    delete_parser.add_argument('be_name', help='The backend name or suffix to delete')
-
     # Set the backend/suffix configuration
     set_backend_parser = suffix_subcommands.add_parser('set', help='Set configuration settings for a single backend')
     set_backend_parser.set_defaults(func=backend_set)
@@ -700,7 +686,7 @@ def create_parser(subparsers):
     #############################################
     # VLV parser
     #############################################
-    vlv_parser = subcommands.add_parser('vlv', help="Manage VLV searches and indexes")
+    vlv_parser = subcommands.add_parser('vlv-index', help="Manage VLV searches and indexes")
     vlv_subcommands = vlv_parser.add_subparsers(help="action")
 
     # List VLV Searches
@@ -895,3 +881,21 @@ def create_parser(subparsers):
                                help="Specifies the suffixes or the subtrees to be included.")
     export_parser.add_argument('-x', '--exclude-suffixes', nargs='+',
                                help="Specifies the suffixes to be excluded.")
+
+    #######################################################
+    # Create a new backend database
+    #######################################################
+    create_parser = subcommands.add_parser('create', help='create')
+    create_parser.set_defaults(func=backend_create)
+    create_parser.add_argument('--parent-suffix', default=False,
+                               help="Sets the parent suffix only if this backend is a sub-suffix")
+    create_parser.add_argument('--suffix', required=True, help='The database suffix DN, for example "dc=example,dc=com"')
+    create_parser.add_argument('--be-name', required=True, help='The database backend name, for example "userroot"')
+    create_parser.add_argument('--create-entries', action='store_true', help='Create sample entries in the database')
+
+    #######################################################
+    # Delete backend
+    #######################################################
+    delete_parser = subcommands.add_parser('delete', help='deletes a backend database')
+    delete_parser.set_defaults(func=backend_delete)
+    delete_parser.add_argument('be_name', help='The backend name or suffix to delete')
\ No newline at end of file
diff --git a/src/lib389/lib389/cli_conf/chaining.py b/src/lib389/lib389/cli_conf/chaining.py
index c74a342..e003fe4 100644
--- a/src/lib389/lib389/cli_conf/chaining.py
+++ b/src/lib389/lib389/cli_conf/chaining.py
@@ -252,7 +252,7 @@ def create_parser(subparsers):
     edit_link_parser.add_argument('--bind-dn', help="DN of the administrative entry used to communicate with the remote server")
     edit_link_parser.add_argument('--bind-pw', help="Password for the administrative user.")
 
-    delete_link_parser = subcommands.add_parser('link-delete', help='Create a database link to a remote server')
+    delete_link_parser = subcommands.add_parser('link-delete', help='Delete a database link')
     delete_link_parser.set_defaults(func=delete_link)
     delete_link_parser.add_argument('CHAIN_NAME', nargs=1, help='The name of the database link')