Prefer dest value when option is depricated0.4.3

Changed logic that re-assigns depricated key names while preserving
their values, to prefer the value stored in the dest key if it
exists, instead of attempting to generate the new key name.

Change-Id: Ibe961688cdb6bd4c9b2dbd27b08c722c3c741586

1 files changed, 7 insertions, 1 deletions

diff --git a/os_client_config/config.py b/os_client_config/config.py
index ae19621..f8adc04 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -249,7 +249,13 @@ class OpenStackConfig(object):
                 config['auth'].pop(opt, None)
 
             if winning_value:
-                config['auth'][p_opt.name.replace('-', '_')] = winning_value
+                # Prefer the plugin configuration dest value if the value's key
+                # is marked as depreciated.
+                if p_opt.dest is None:
+                    config['auth'][p_opt.name.replace('-', '_')] = (
+                        winning_value)
+                else:
+                    config['auth'][p_opt.dest] = winning_value
 
         return config