Merge "Fix wrong behavior of parsing plugin service name"

This commit is contained in:
Jenkins 2017-02-08 02:53:38 +00:00 committed by Gerrit Code Review
commit e35c97a4fc
2 changed files with 10 additions and 1 deletions

View File

@ -76,7 +76,9 @@ class OpenStackShell(shell.OpenStackShell):
# Loop through extensions to get API versions # Loop through extensions to get API versions
for mod in clientmanager.PLUGIN_MODULES: for mod in clientmanager.PLUGIN_MODULES:
default_version = getattr(mod, 'DEFAULT_API_VERSION', None) default_version = getattr(mod, 'DEFAULT_API_VERSION', None)
option = mod.API_VERSION_OPTION.replace('os_', '') # Only replace the first instance of "os", some service names will
# have "os" in their name, like: "antiddos"
option = mod.API_VERSION_OPTION.replace('os_', '', 1)
version_opt = str(self.cloud.config.get(option, default_version)) version_opt = str(self.cloud.config.get(option, default_version))
if version_opt: if version_opt:
api = mod.API_NAME api = mod.API_NAME

View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fix wrong behavior of parsing plugin service name when the service name end
with keyword ``os``, like: antiddos. That cause the service api version
specified by users don't work.
[Bug `1658614 <https://bugs.launchpad.net/python-openstackclient/+bug/1658614>`_]