Revision d0c8c01d lib/rapi/connector.py
| b/lib/rapi/connector.py | ||
|---|---|---|
| 70 | 70 |
- args: a dictionary with additional parameters from URL |
| 71 | 71 |
|
| 72 | 72 |
""" |
| 73 |
if '?' in uri:
|
|
| 74 |
(path, query) = uri.split('?', 1)
|
|
| 73 |
if "?" in uri:
|
|
| 74 |
(path, query) = uri.split("?", 1)
|
|
| 75 | 75 |
args = cgi.parse_qs(query) |
| 76 | 76 |
else: |
| 77 | 77 |
path = uri |
| ... | ... | |
| 107 | 107 |
m = cls._ROOT_PATTERN.match(handler.__name__) |
| 108 | 108 |
if m: |
| 109 | 109 |
name = m.group(1) |
| 110 |
if name != 'root':
|
|
| 110 |
if name != "root":
|
|
| 111 | 111 |
rootlist.append(name) |
| 112 | 112 |
|
| 113 | 113 |
return baserlib.BuildUriList(rootlist, "/%s") |
| ... | ... | |
| 121 | 121 |
@return: a list of resources names. |
| 122 | 122 |
|
| 123 | 123 |
""" |
| 124 |
r_pattern = re.compile('^R_%s_([a-zA-Z0-9]+)$' % id_)
|
|
| 124 |
r_pattern = re.compile("^R_%s_([a-zA-Z0-9]+)$" % id_)
|
|
| 125 | 125 |
|
| 126 | 126 |
rlist = [] |
| 127 | 127 |
for handler in CONNECTOR.values(): |
| ... | ... | |
| 167 | 167 |
"/2": R_2, |
| 168 | 168 |
|
| 169 | 169 |
"/2/nodes": rlib2.R_2_nodes, |
| 170 |
re.compile(r'^/2/nodes/(%s)$' % node_name_pattern):
|
|
| 170 |
re.compile(r"^/2/nodes/(%s)$" % node_name_pattern):
|
|
| 171 | 171 |
rlib2.R_2_nodes_name, |
| 172 |
re.compile(r'^/2/nodes/(%s)/tags$' % node_name_pattern):
|
|
| 172 |
re.compile(r"^/2/nodes/(%s)/tags$" % node_name_pattern):
|
|
| 173 | 173 |
rlib2.R_2_nodes_name_tags, |
| 174 |
re.compile(r'^/2/nodes/(%s)/role$' % node_name_pattern):
|
|
| 174 |
re.compile(r"^/2/nodes/(%s)/role$" % node_name_pattern):
|
|
| 175 | 175 |
rlib2.R_2_nodes_name_role, |
| 176 |
re.compile(r'^/2/nodes/(%s)/evacuate$' % node_name_pattern):
|
|
| 176 |
re.compile(r"^/2/nodes/(%s)/evacuate$" % node_name_pattern):
|
|
| 177 | 177 |
rlib2.R_2_nodes_name_evacuate, |
| 178 |
re.compile(r'^/2/nodes/(%s)/migrate$' % node_name_pattern):
|
|
| 178 |
re.compile(r"^/2/nodes/(%s)/migrate$" % node_name_pattern):
|
|
| 179 | 179 |
rlib2.R_2_nodes_name_migrate, |
| 180 |
re.compile(r'^/2/nodes/(%s)/storage$' % node_name_pattern):
|
|
| 180 |
re.compile(r"^/2/nodes/(%s)/storage$" % node_name_pattern):
|
|
| 181 | 181 |
rlib2.R_2_nodes_name_storage, |
| 182 |
re.compile(r'^/2/nodes/(%s)/storage/modify$' % node_name_pattern):
|
|
| 182 |
re.compile(r"^/2/nodes/(%s)/storage/modify$" % node_name_pattern):
|
|
| 183 | 183 |
rlib2.R_2_nodes_name_storage_modify, |
| 184 |
re.compile(r'^/2/nodes/(%s)/storage/repair$' % node_name_pattern):
|
|
| 184 |
re.compile(r"^/2/nodes/(%s)/storage/repair$" % node_name_pattern):
|
|
| 185 | 185 |
rlib2.R_2_nodes_name_storage_repair, |
| 186 | 186 |
|
| 187 | 187 |
"/2/instances": rlib2.R_2_instances, |
| 188 |
re.compile(r'^/2/instances/(%s)$' % instance_name_pattern):
|
|
| 188 |
re.compile(r"^/2/instances/(%s)$" % instance_name_pattern):
|
|
| 189 | 189 |
rlib2.R_2_instances_name, |
| 190 |
re.compile(r'^/2/instances/(%s)/info$' % instance_name_pattern):
|
|
| 190 |
re.compile(r"^/2/instances/(%s)/info$" % instance_name_pattern):
|
|
| 191 | 191 |
rlib2.R_2_instances_name_info, |
| 192 |
re.compile(r'^/2/instances/(%s)/tags$' % instance_name_pattern):
|
|
| 192 |
re.compile(r"^/2/instances/(%s)/tags$" % instance_name_pattern):
|
|
| 193 | 193 |
rlib2.R_2_instances_name_tags, |
| 194 |
re.compile(r'^/2/instances/(%s)/reboot$' % instance_name_pattern):
|
|
| 194 |
re.compile(r"^/2/instances/(%s)/reboot$" % instance_name_pattern):
|
|
| 195 | 195 |
rlib2.R_2_instances_name_reboot, |
| 196 |
re.compile(r'^/2/instances/(%s)/reinstall$' % instance_name_pattern):
|
|
| 196 |
re.compile(r"^/2/instances/(%s)/reinstall$" % instance_name_pattern):
|
|
| 197 | 197 |
rlib2.R_2_instances_name_reinstall, |
| 198 |
re.compile(r'^/2/instances/(%s)/replace-disks$' % instance_name_pattern):
|
|
| 198 |
re.compile(r"^/2/instances/(%s)/replace-disks$" % instance_name_pattern):
|
|
| 199 | 199 |
rlib2.R_2_instances_name_replace_disks, |
| 200 |
re.compile(r'^/2/instances/(%s)/shutdown$' % instance_name_pattern):
|
|
| 200 |
re.compile(r"^/2/instances/(%s)/shutdown$" % instance_name_pattern):
|
|
| 201 | 201 |
rlib2.R_2_instances_name_shutdown, |
| 202 |
re.compile(r'^/2/instances/(%s)/startup$' % instance_name_pattern):
|
|
| 202 |
re.compile(r"^/2/instances/(%s)/startup$" % instance_name_pattern):
|
|
| 203 | 203 |
rlib2.R_2_instances_name_startup, |
| 204 |
re.compile(r'^/2/instances/(%s)/activate-disks$' % instance_name_pattern):
|
|
| 204 |
re.compile(r"^/2/instances/(%s)/activate-disks$" % instance_name_pattern):
|
|
| 205 | 205 |
rlib2.R_2_instances_name_activate_disks, |
| 206 |
re.compile(r'^/2/instances/(%s)/deactivate-disks$' % instance_name_pattern):
|
|
| 206 |
re.compile(r"^/2/instances/(%s)/deactivate-disks$" % instance_name_pattern):
|
|
| 207 | 207 |
rlib2.R_2_instances_name_deactivate_disks, |
| 208 |
re.compile(r'^/2/instances/(%s)/prepare-export$' % instance_name_pattern):
|
|
| 208 |
re.compile(r"^/2/instances/(%s)/prepare-export$" % instance_name_pattern):
|
|
| 209 | 209 |
rlib2.R_2_instances_name_prepare_export, |
| 210 |
re.compile(r'^/2/instances/(%s)/export$' % instance_name_pattern):
|
|
| 210 |
re.compile(r"^/2/instances/(%s)/export$" % instance_name_pattern):
|
|
| 211 | 211 |
rlib2.R_2_instances_name_export, |
| 212 |
re.compile(r'^/2/instances/(%s)/migrate$' % instance_name_pattern):
|
|
| 212 |
re.compile(r"^/2/instances/(%s)/migrate$" % instance_name_pattern):
|
|
| 213 | 213 |
rlib2.R_2_instances_name_migrate, |
| 214 |
re.compile(r'^/2/instances/(%s)/failover$' % instance_name_pattern):
|
|
| 214 |
re.compile(r"^/2/instances/(%s)/failover$" % instance_name_pattern):
|
|
| 215 | 215 |
rlib2.R_2_instances_name_failover, |
| 216 |
re.compile(r'^/2/instances/(%s)/rename$' % instance_name_pattern):
|
|
| 216 |
re.compile(r"^/2/instances/(%s)/rename$" % instance_name_pattern):
|
|
| 217 | 217 |
rlib2.R_2_instances_name_rename, |
| 218 |
re.compile(r'^/2/instances/(%s)/modify$' % instance_name_pattern):
|
|
| 218 |
re.compile(r"^/2/instances/(%s)/modify$" % instance_name_pattern):
|
|
| 219 | 219 |
rlib2.R_2_instances_name_modify, |
| 220 | 220 |
re.compile(r"^/2/instances/(%s)/disk/(%s)/grow$" % |
| 221 | 221 |
(instance_name_pattern, disk_pattern)): |
| 222 | 222 |
rlib2.R_2_instances_name_disk_grow, |
| 223 |
re.compile(r'^/2/instances/(%s)/console$' % instance_name_pattern):
|
|
| 223 |
re.compile(r"^/2/instances/(%s)/console$" % instance_name_pattern):
|
|
| 224 | 224 |
rlib2.R_2_instances_name_console, |
| 225 | 225 |
|
| 226 | 226 |
"/2/groups": rlib2.R_2_groups, |
| 227 |
re.compile(r'^/2/groups/(%s)$' % group_name_pattern):
|
|
| 227 |
re.compile(r"^/2/groups/(%s)$" % group_name_pattern):
|
|
| 228 | 228 |
rlib2.R_2_groups_name, |
| 229 |
re.compile(r'^/2/groups/(%s)/modify$' % group_name_pattern):
|
|
| 229 |
re.compile(r"^/2/groups/(%s)/modify$" % group_name_pattern):
|
|
| 230 | 230 |
rlib2.R_2_groups_name_modify, |
| 231 |
re.compile(r'^/2/groups/(%s)/rename$' % group_name_pattern):
|
|
| 231 |
re.compile(r"^/2/groups/(%s)/rename$" % group_name_pattern):
|
|
| 232 | 232 |
rlib2.R_2_groups_name_rename, |
| 233 |
re.compile(r'^/2/groups/(%s)/assign-nodes$' % group_name_pattern):
|
|
| 233 |
re.compile(r"^/2/groups/(%s)/assign-nodes$" % group_name_pattern):
|
|
| 234 | 234 |
rlib2.R_2_groups_name_assign_nodes, |
| 235 |
re.compile(r'^/2/groups/(%s)/tags$' % group_name_pattern):
|
|
| 235 |
re.compile(r"^/2/groups/(%s)/tags$" % group_name_pattern):
|
|
| 236 | 236 |
rlib2.R_2_groups_name_tags, |
| 237 | 237 |
|
| 238 | 238 |
"/2/jobs": rlib2.R_2_jobs, |
Also available in: Unified diff