Revision 2e5c33db lib/cli.py
| b/lib/cli.py | ||
|---|---|---|
| 2694 | 2694 |
if not names: |
| 2695 | 2695 |
names = None |
| 2696 | 2696 |
|
| 2697 |
filter_ = qlang.MakeFilter(names, force_filter)
|
|
| 2697 |
qfilter = qlang.MakeFilter(names, force_filter)
|
|
| 2698 | 2698 |
|
| 2699 |
response = cl.Query(resource, fields, filter_)
|
|
| 2699 |
response = cl.Query(resource, fields, qfilter)
|
|
| 2700 | 2700 |
|
| 2701 | 2701 |
found_unknown = _WarnUnknownFields(response.fields) |
| 2702 | 2702 |
|
| ... | ... | |
| 2925 | 2925 |
if cl is None: |
| 2926 | 2926 |
cl = GetClient() |
| 2927 | 2927 |
|
| 2928 |
filter_ = []
|
|
| 2928 |
qfilter = []
|
|
| 2929 | 2929 |
|
| 2930 | 2930 |
if nodes: |
| 2931 |
filter_.append(qlang.MakeSimpleFilter("name", nodes))
|
|
| 2931 |
qfilter.append(qlang.MakeSimpleFilter("name", nodes))
|
|
| 2932 | 2932 |
|
| 2933 | 2933 |
if nodegroup is not None: |
| 2934 |
filter_.append([qlang.OP_OR, [qlang.OP_EQUAL, "group", nodegroup],
|
|
| 2934 |
qfilter.append([qlang.OP_OR, [qlang.OP_EQUAL, "group", nodegroup],
|
|
| 2935 | 2935 |
[qlang.OP_EQUAL, "group.uuid", nodegroup]]) |
| 2936 | 2936 |
|
| 2937 | 2937 |
if filter_master: |
| 2938 |
filter_.append([qlang.OP_NOT, [qlang.OP_TRUE, "master"]])
|
|
| 2938 |
qfilter.append([qlang.OP_NOT, [qlang.OP_TRUE, "master"]])
|
|
| 2939 | 2939 |
|
| 2940 |
if filter_:
|
|
| 2941 |
if len(filter_) > 1:
|
|
| 2942 |
final_filter = [qlang.OP_AND] + filter_
|
|
| 2940 |
if qfilter:
|
|
| 2941 |
if len(qfilter) > 1:
|
|
| 2942 |
final_filter = [qlang.OP_AND] + qfilter
|
|
| 2943 | 2943 |
else: |
| 2944 |
assert len(filter_) == 1
|
|
| 2945 |
final_filter = filter_[0]
|
|
| 2944 |
assert len(qfilter) == 1
|
|
| 2945 |
final_filter = qfilter[0]
|
|
| 2946 | 2946 |
else: |
| 2947 | 2947 |
final_filter = None |
| 2948 | 2948 |
|
Also available in: Unified diff