From e28aa9761751d7fa12dba1c35076c3c975b7cd3f Mon Sep 17 00:00:00 2001 From: Bob Melander Date: Sat, 27 Jun 2015 19:14:19 +0200 Subject: [PATCH] Make '_create_router' function handle Boolean kwargs correctly The function allows arbitrary kw arguments to be specificed. Those kw arguments whose key is specified in the function parameter 'arg_list' are then passed in the create router REST API call. The code line that checks if a kw argument key is included in 'arg_list' does not work with Boolean kw arguments. Nor does it work with None kw argument values. This is a limitation as tests in inheriting classes may need such kw arguments. This patch fixes the faulty 'if' clause so that it simply checks that the kw argument key is in 'arg_list'. This makes it support Boolean kw arguments and kw arguments with value None. Closes-Bug: #1482108 Change-Id: I5618dc4d5c803c7614dd1f579db3c79928007fb6 --- neutron/tests/unit/extensions/test_l3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron/tests/unit/extensions/test_l3.py b/neutron/tests/unit/extensions/test_l3.py index 143c34869..2583b47d2 100644 --- a/neutron/tests/unit/extensions/test_l3.py +++ b/neutron/tests/unit/extensions/test_l3.py @@ -326,7 +326,7 @@ class L3NatTestCaseMixin(object): data['router']['admin_state_up'] = admin_state_up for arg in (('admin_state_up', 'tenant_id') + (arg_list or ())): # Arg must be present and not empty - if kwargs.get(arg): + if arg in kwargs: data['router'][arg] = kwargs[arg] router_req = self.new_create_request('routers', data, fmt) if set_context and tenant_id: -- 2.45.2