From 76dd26f9fdd35bf922509e587e25a30927517808 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Thu, 27 May 2021 12:18:50 +0200 Subject: [PATCH] Set when deprecated neutron client CLI will be removed [1] was the last missing bit in OSC to have feature parity between OpenStack client and Neutronclient CLI tools. So now as [1] is merged we can really deprecate and specify that in Z cycle we will remove neutronclient CLI. This patch changes deprecation message to reflect that. [1] https://review.opendev.org/c/openstack/python-openstackclient/+/768210 Change-Id: Ia68af29ea15bda7330fda1b18416798a0f4cb7a4 --- doc/source/contributor/transition_to_osc.rst | 6 +++--- neutronclient/shell.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/contributor/transition_to_osc.rst b/doc/source/contributor/transition_to_osc.rst index b745d2f0c..334f2e57e 100644 --- a/doc/source/contributor/transition_to_osc.rst +++ b/doc/source/contributor/transition_to_osc.rst @@ -91,17 +91,17 @@ Transition Steps * **Done** `Security Group Rule CRUD `_ -6. **In Progress:** OSC continues enhancing its networking support. +6. **Done** OSC continues enhancing its networking support. At this point and when applicable, enhancements to the ``neutron`` CLI must also be made to the ``openstack`` CLI and possibly the OpenStack Python SDK. Users of the neutron client's command extensions should start their transition to the OSC plugin system. See the developer guide section below for more information on this step. -7. **In Progress:** Deprecate the ``neutron`` CLI. Running the CLI after +7. **Done** Deprecate the ``neutron`` CLI. Running the CLI after it has been `deprecated `_ will issue a warning message: - ``neutron CLI is deprecated and will be removed in the future. Use openstack CLI instead.`` + ``neutron CLI is deprecated and will be removed in the Z cycle. Use openstack CLI instead.`` In addition, no new features will be added to the CLI, though fixes to the CLI will be assessed on a case by case basis. diff --git a/neutronclient/shell.py b/neutronclient/shell.py index aed4c8fde..13cd0fa4e 100644 --- a/neutronclient/shell.py +++ b/neutronclient/shell.py @@ -637,7 +637,7 @@ class NeutronShell(app.App): def main(argv=sys.argv[1:]): try: print(_("neutron CLI is deprecated and will be removed " - "in the future. Use openstack CLI instead."), file=sys.stderr) + "in the Z cycle. Use openstack CLI instead."), file=sys.stderr) return NeutronShell(NEUTRON_API_VERSION).run( list(map(encodeutils.safe_decode, argv))) except KeyboardInterrupt: