openstack/python-neutronclient
Code Issues Proposed changes

Set when deprecated neutron client CLI will be removed

Browse Source 
[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
This commit is contained in:
Slawek Kaplonski 2021-05-27 12:18:50 +02:00
parent 439e290e95
commit 76dd26f9fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/contributor/transition_to_osc.rst
View File

@ -91,17 +91,17 @@ Transition Steps
* **Done** `Security Group Rule CRUD <https://bugs.launchpad.net/python-openstackclient/+bug/1519512>`_ * **Done** `Security Group Rule CRUD <https://bugs.launchpad.net/python-openstackclient/+bug/1519512>`_
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`` At this point and when applicable, enhancements to the ``neutron``
CLI must also be made to the ``openstack`` CLI and possibly the CLI must also be made to the ``openstack`` CLI and possibly the
OpenStack Python SDK. Users of the neutron client's command extensions OpenStack Python SDK. Users of the neutron client's command extensions
should start their transition to the OSC plugin system. See the should start their transition to the OSC plugin system. See the
developer guide section below for more information on this step. 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 <https://review.opendev.org/#/c/393903/>`_ it has been `deprecated <https://review.opendev.org/#/c/393903/>`_
will issue a warning message: 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 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. the CLI will be assessed on a case by case basis.

2
neutronclient/shell.py
View File

@ -637,7 +637,7 @@ class NeutronShell(app.App):
def main(argv=sys.argv[1:]): def main(argv=sys.argv[1:]):
try: try:
print(_("neutron CLI is deprecated and will be removed " 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( return NeutronShell(NEUTRON_API_VERSION).run(
list(map(encodeutils.safe_decode, argv))) list(map(encodeutils.safe_decode, argv)))
except KeyboardInterrupt: except KeyboardInterrupt: