Merge "Implement conflict resolution"

Author: Zuul

openstackclient/shell.py

@@ -26,16 +26,25 @@
 import openstackclient
 from openstackclient.common import clientmanager
 
-
 DEFAULT_DOMAIN = 'default'
+# list of modules that were originally out-of-tree and are now in
+# core OSC
+IGNORED_MODULES = (
+    'neutron_taas.taas_client.osc',
+    'neutronclient.osc.v2.taas',
+)
 
 
 class OpenStackShell(shell.OpenStackShell):
     def __init__(self):
+        command_manager = commandmanager.CommandManager(
+            'openstack.cli', ignored_modules=IGNORED_MODULES
+        )
+
         super().__init__(
             description=__doc__.strip(),
             version=openstackclient.__version__,
-            command_manager=commandmanager.CommandManager('openstack.cli'),
+            command_manager=command_manager,
             deferred_help=True,
         )
 

requirements.txt

@@ -5,7 +5,7 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 cryptography>=2.7 # BSD/Apache-2.0
-cliff>=4.8.0 # Apache-2.0
+cliff>=4.13.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
 openstacksdk>=4.6.0 # Apache-2.0
 osc-lib>=2.3.0 # Apache-2.0