Browse code

Fix whitespace issue in filter (backport 2.7)

This fixes reported issue #60276

This is a backport of #62768

Dag Wieers authored on 2019/09/26 01:21:58
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,2 @@
0
+bugfixes:
1
+- "ACI modules - Fix a whitespace issue in filters for ACI 4.2 strict validation"
... ...
@@ -400,9 +400,9 @@ class ACIModule(object):
400 400
         ''' Build an APIC filter based on obj_class and key-value pairs '''
401 401
         accepted_params = dict((k, v) for (k, v) in params.items() if v is not None)
402 402
         if len(accepted_params) == 1:
403
-            return ','.join('eq({0}.{1}, "{2}")'.format(obj_class, k, v) for (k, v) in accepted_params.items())
403
+            return ','.join('eq({0}.{1},"{2}")'.format(obj_class, k, v) for (k, v) in accepted_params.items())
404 404
         elif len(accepted_params) > 1:
405
-            return 'and(' + ','.join(['eq({0}.{1}, "{2}")'.format(obj_class, k, v) for (k, v) in accepted_params.items()]) + ')'
405
+            return 'and(' + ','.join(['eq({0}.{1},"{2}")'.format(obj_class, k, v) for (k, v) in accepted_params.items()]) + ')'
406 406
 
407 407
     def construct_url(self, root_class, subclass_1=None, subclass_2=None, subclass_3=None, child_classes=None):
408 408
         """