From d70994463d64d01c5cb6828b981164e81036bb91 Mon Sep 17 00:00:00 2001 From: kwu Date: Mon, 3 Apr 2017 10:08:26 -0700 Subject: [PATCH] Replace unintented key removal behavior using getter Closes-bug: 1678003 Depends-On: I51cc7867a60357d8e1c809d1ea985b0624546ebb Change-Id: Ife81e0c558c4bb640ffc027dabea10992c157c41 (cherry picked from commit 4a5b0880e0b58470ce63ac77b67920695a4b91cf) --- freezer/openstack/osclients.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/freezer/openstack/osclients.py b/freezer/openstack/osclients.py index a68d6460..cf70b0e9 100644 --- a/freezer/openstack/osclients.py +++ b/freezer/openstack/osclients.py @@ -118,16 +118,16 @@ class OSClientManager(object): if 'region_name' in self.swift_args.keys(): os_options['region_name'] = self.swift_args.get('region_name') if 'endpoint_type' in self.swift_args.keys(): - os_options['endpoint_type'] = self.swift_args.pop('endpoint_type') + os_options['endpoint_type'] = self.swift_args.get('endpoint_type') if 'tenant_id' in self.swift_args.keys(): - os_options['tenant_id'] = self.swift_args.pop('tenant_id') + os_options['tenant_id'] = self.swift_args.get('tenant_id') if 'identity_api_version' in self.swift_args.keys(): os_options['identity_api_version'] = \ - self.swift_args.pop('identity_api_version') + self.swift_args.get('identity_api_version') auth_version = os_options['identity_api_version'] if 'token' in self.swift_args.keys(): - os_options['auth_token'] = self.swift_args.pop('token') + os_options['auth_token'] = self.swift_args.get('token') if 'auth_version' in self.swift_args.keys(): auth_version = self.swift_args.get('auth_version') os_options['project_domain_name'] = \