c58320a4ea
In Python 3.3, hash randomization is enabled by default. It causes the iteration order of dicts and sets to be unpredictable and differ across Python runs. In the test case, the fixed expecting string will not match the test result, it is relying on the dict order. This change transforms the input dict to a sequence of two-element list, with fixed order, and update the related expecitng string / fixture in test cases. Partial Implement: blueprint py33-support Change-Id: I6dccde9e584be8335a6375f5fbad5c5cbd7b9b6d
96 lines
3.1 KiB
Python
96 lines
3.1 KiB
Python
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from ceilometerclient.openstack.common.py3kcompat import urlutils
|
|
import re
|
|
|
|
|
|
def build_url(path, q, params=None):
|
|
'''This converts from a list of dicts and a list of params to
|
|
what the rest api needs, so from:
|
|
"[{field=this,op=le,value=34},{field=that,op=eq,value=foo}],
|
|
['foo=bar','sna=fu']"
|
|
to:
|
|
"?q.field=this&q.op=le&q.value=34&
|
|
q.field=that&q.op=eq&q.value=foo&
|
|
foo=bar&sna=fu"
|
|
'''
|
|
if q:
|
|
query_params = {'q.field': [],
|
|
'q.value': [],
|
|
'q.op': []}
|
|
|
|
for query in q:
|
|
for name in ['field', 'op', 'value']:
|
|
query_params['q.%s' % name].append(query.get(name, ''))
|
|
|
|
# Transform the dict to a sequence of two-element tuples in fixed
|
|
# order, then the encoded string will be consistent in Python 2&3.
|
|
new_qparams = sorted(query_params.items(), key=lambda x: x[0])
|
|
path += "?" + urlutils.urlencode(new_qparams, doseq=True)
|
|
|
|
if params:
|
|
for p in params:
|
|
path += '&%s' % p
|
|
elif params:
|
|
path += '?%s' % params[0]
|
|
for p in params[1:]:
|
|
path += '&%s' % p
|
|
return path
|
|
|
|
|
|
def cli_to_array(cli_query):
|
|
'''This converts from the cli list of queries to what is required
|
|
by the python api.
|
|
so from:
|
|
"this<=34;that=foo"
|
|
to
|
|
"[{field=this,op=le,value=34},{field=that,op=eq,value=foo}]"
|
|
'''
|
|
if cli_query is None:
|
|
return None
|
|
|
|
op_lookup = {'!=': 'ne',
|
|
'>=': 'ge',
|
|
'<=': 'le',
|
|
'>': 'gt',
|
|
'<': 'lt',
|
|
'=': 'eq'}
|
|
|
|
def split_by_op(string):
|
|
# two character split (<=,!=)
|
|
frags = re.findall(r'([[a-zA-Z0-9_.]+)([><!]=)([^ -,\t\n\r\f\v]+)',
|
|
string)
|
|
if len(frags) == 0:
|
|
#single char split (<,=)
|
|
frags = re.findall(r'([a-zA-Z0-9_.]+)([><=])([^ -,\t\n\r\f\v]+)',
|
|
string)
|
|
return frags
|
|
|
|
opts = []
|
|
queries = cli_query.split(';')
|
|
for q in queries:
|
|
frag = split_by_op(q)
|
|
if len(frag) > 1:
|
|
raise ValueError('incorrect seperator %s in query "%s"' %
|
|
('(should be ";")', q))
|
|
if len(frag) == 0:
|
|
raise ValueError('invalid query %s' % q)
|
|
query = frag[0]
|
|
opt = {}
|
|
opt['field'] = query[0]
|
|
opt['op'] = op_lookup[query[1]]
|
|
opt['value'] = query[2]
|
|
opts.append(opt)
|
|
return opts
|