For api 35.0+, single encode query filter, and remove filterEncoded param (#710)

vCD zeus will no longer accept double encoded filter value as part of query api.
To accommodate the shift in behavior, pyvcloud will no longer double encode the query filter string and won't send in the filterEncoded param for api v35.0+.

However the values in qfilter param to get_typed_query should still be encoded, the responsibility lies with the caller. The equality_filter's value will continue to be encoded by pyvcloud.

Author: rocknes

pyvcloud/vcd/client.py

@@ -1835,7 +1835,10 @@ def __init__(self,
                 self._filter = ''
             self._filter += equality_filter[0]
             self._filter += '=='
-            self._filter += equality_filter[1]
+            if float(client.get_api_version()) < float(ApiVersion.VERSION_35.value):  # noqa: E501
+                self._filter += equality_filter[1]
+            else:
+                self._filter += urllib.parse.quote(equality_filter[1])
 
         self._sort_desc = sort_desc
         self._sort_asc = sort_asc
@@ -1914,14 +1917,20 @@ def _build_query_uri(self,
             uri += '&pageSize='
             uri += str(page_size)
 
-        if qfilter is not None:
-            # filterEncoded=true directs vCD to decode the individual filter
-            # values, i.e. the value after each ==.
-            uri += '&filterEncoded=true&filter='
-            # Need to encode the value of filter param again to escape special
-            # characters like ',', ';' which have special meaning in context of
-            # query filter.
-            uri += urllib.parse.quote(qfilter)
+        if qfilter:
+            if float(self._client.get_api_version()) < float(ApiVersion.VERSION_35.value):  # noqa: E501
+                # filterEncoded=true directs vCD to decode the individual
+                # filter values, i.e. the value after each ==.
+                uri += '&filterEncoded=true&filter='
+                # Need to encode the value of filter param again to escape
+                # special characters like ',', ';' which have special meaning
+                # in context of query filter.
+                uri += urllib.parse.quote(qfilter)
+            else:
+                # api v35.0 (vCD Zeus) onwards vCD doesn't accept double
+                # encoded filter values, neither the filterEncoded query param
+                # has any effect
+                uri += f"&filter={qfilter}"
 
         if fields is not None:
             uri += '&fields='