Revision 1c7fd467
b/lib/rapi/connector.py | ||
---|---|---|
150 | 150 |
|
151 | 151 |
|
152 | 152 |
def GetHandlers(node_name_pattern, instance_name_pattern, |
153 |
group_name_pattern, job_id_pattern, disk_pattern): |
|
153 |
group_name_pattern, job_id_pattern, disk_pattern, |
|
154 |
query_res_pattern): |
|
154 | 155 |
"""Returns all supported resources and their handlers. |
155 | 156 |
|
156 | 157 |
""" |
... | ... | |
246 | 247 |
|
247 | 248 |
|
248 | 249 |
CONNECTOR.update(GetHandlers(_NAME_PATTERN, _NAME_PATTERN, _NAME_PATTERN, |
249 |
constants.JOB_ID_TEMPLATE, _DISK_PATTERN)) |
|
250 |
constants.JOB_ID_TEMPLATE, _DISK_PATTERN, |
|
251 |
_NAME_PATTERN)) |
b/test/docs_unittest.py | ||
---|---|---|
95 | 95 |
group_name = re.escape("[group_name]") |
96 | 96 |
job_id = re.escape("[job_id]") |
97 | 97 |
disk_index = re.escape("[disk_index]") |
98 |
query_res = re.escape("[resource]") |
|
98 | 99 |
|
99 | 100 |
resources = connector.GetHandlers(node_name, instance_name, group_name, |
100 |
job_id, disk_index) |
|
101 |
job_id, disk_index, query_res)
|
|
101 | 102 |
|
102 | 103 |
handler_dups = utils.FindDuplicates(resources.values()) |
103 | 104 |
self.assertFalse(handler_dups, |
... | ... | |
110 | 111 |
re.compile(group_name): "group4440", |
111 | 112 |
re.compile(job_id): "9409", |
112 | 113 |
re.compile(disk_index): "123", |
114 |
re.compile(query_res): "lock", |
|
113 | 115 |
} |
114 | 116 |
|
115 | 117 |
assert compat.all(VALID_URI_RE.match(value) |
Also available in: Unified diff